MS/H2201_Audio_Mixer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed to avrcp

Browse Source
This commit is contained in:
Martijn Scheepers
2022-04-25 15:29:00 +02:00
parent 4ede660f06
commit 34e0c4f680
4 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ESP32/main/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
idf_component_register(SRCS "H2201_a2dp.c" "H2201_i2s.c" "bt_app_av.c"
idf_component_register(SRCS "H2201_avrcp.c" "H2201_a2dp.c" "H2201_i2s.c"
"bt_app_core.c"
"main.c"
INCLUDE_DIRS ".")

44
ESP32/main/bt_app_av.c → ESP32/main/H2201_avrcp.c
View File

@@ -4,8 +4,6 @@
#include <string.h>
#include "esp_log.h"
#include "bt_app_core.h"
#include "bt_app_av.h"
#include "esp_bt_main.h"
#include "esp_bt_device.h"
#include "esp_gap_bt_api.h"
@@ -18,6 +16,8 @@
#include "sys/lock.h"
#include "bt_app_core.h"
#include "H2201_avrcp.h"
#include "H2201_i2s.h"
// AVRCP used transaction label
@@ -62,7 +62,7 @@ void h2201_avrcp_controller_callback(esp_avrc_ct_cb_event_t event, esp_avrc_ct_c
break;
}
default:
ESP_LOGE(BT_RC_CT_TAG, "Invalid AVRC event: %d", event);
ESP_LOGE(H2201_AVRCP_CT_TAG, "Invalid AVRC event: %d", event);
break;
}
}
@@ -80,7 +80,7 @@ void h2201_avrcp_target_callback(esp_avrc_tg_cb_event_t event, esp_avrc_tg_cb_pa
bt_app_work_dispatch(h2201_avrcp_target_eventhandler, event, param, sizeof(esp_avrc_tg_cb_param_t), NULL);
break;
default:
ESP_LOGE(BT_RC_TG_TAG, "Invalid AVRC event: %d", event);
ESP_LOGE(H2201_AVRCP_TG_TAG, "Invalid AVRC event: %d", event);
break;
}
}
@@ -122,11 +122,11 @@ void h2201_avrcp_notify_eventhandler(uint8_t event_id, esp_avrc_rn_param_t *even
h2201_avrcp_new_track();
break;
case ESP_AVRC_RN_PLAY_STATUS_CHANGE:
ESP_LOGI(BT_AV_TAG, "Playback status changed: 0x%x", event_parameter->playback);
ESP_LOGI(H2201_AVRCP_TAG, "Playback status changed: 0x%x", event_parameter->playback);
h2201_avrcp_playback_changed();
break;
case ESP_AVRC_RN_PLAY_POS_CHANGED:
ESP_LOGI(BT_AV_TAG, "Play position changed: %d-ms", event_parameter->play_pos);
ESP_LOGI(H2201_AVRCP_TAG, "Play position changed: %d-ms", event_parameter->play_pos);
h2201_avrcp_play_position_changed();
break;
}
@@ -134,14 +134,14 @@ void h2201_avrcp_notify_eventhandler(uint8_t event_id, esp_avrc_rn_param_t *even
static void h2201_avrcp_controller_eventhandler(uint16_t event, void *p_param)
{
ESP_LOGD(BT_RC_CT_TAG, "%s evt %d", __func__, event);
ESP_LOGD(H2201_AVRCP_CT_TAG, "%s evt %d", __func__, event);
esp_avrc_ct_cb_param_t *rc = (esp_avrc_ct_cb_param_t *)(p_param);
switch (event)
{
case ESP_AVRC_CT_CONNECTION_STATE_EVT:
{
uint8_t *bda = rc->conn_stat.remote_bda;
ESP_LOGI(BT_RC_CT_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
ESP_LOGI(H2201_AVRCP_CT_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
rc->conn_stat.connected, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
if (rc->conn_stat.connected)
@@ -158,29 +158,29 @@ static void h2201_avrcp_controller_eventhandler(uint16_t event, void *p_param)
}
case ESP_AVRC_CT_PASSTHROUGH_RSP_EVT:
{
ESP_LOGI(BT_RC_CT_TAG, "AVRC passthrough rsp: key_code 0x%x, key_state %d", rc->psth_rsp.key_code, rc->psth_rsp.key_state);
ESP_LOGI(H2201_AVRCP_CT_TAG, "AVRC passthrough rsp: key_code 0x%x, key_state %d", rc->psth_rsp.key_code, rc->psth_rsp.key_state);
break;
}
case ESP_AVRC_CT_METADATA_RSP_EVT:
{
ESP_LOGI(BT_RC_CT_TAG, "AVRC metadata rsp: attribute id 0x%x, %s", rc->meta_rsp.attr_id, rc->meta_rsp.attr_text);
ESP_LOGI(H2201_AVRCP_CT_TAG, "AVRC metadata rsp: attribute id 0x%x, %s", rc->meta_rsp.attr_id, rc->meta_rsp.attr_text);
free(rc->meta_rsp.attr_text);
break;
}
case ESP_AVRC_CT_CHANGE_NOTIFY_EVT:
{
ESP_LOGI(BT_RC_CT_TAG, "AVRC event notification: %d", rc->change_ntf.event_id);
ESP_LOGI(H2201_AVRCP_CT_TAG, "AVRC event notification: %d", rc->change_ntf.event_id);
h2201_avrcp_notify_eventhandler(rc->change_ntf.event_id, &rc->change_ntf.event_parameter);
break;
}
case ESP_AVRC_CT_REMOTE_FEATURES_EVT:
{
ESP_LOGI(BT_RC_CT_TAG, "AVRC remote features %x, TG features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.tg_feat_flag);
ESP_LOGI(H2201_AVRCP_CT_TAG, "AVRC remote features %x, TG features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.tg_feat_flag);
break;
}
case ESP_AVRC_CT_GET_RN_CAPABILITIES_RSP_EVT:
{
ESP_LOGI(BT_RC_CT_TAG, "remote rn_cap: count %d, bitmask 0x%x", rc->get_rn_caps_rsp.cap_count,
ESP_LOGI(H2201_AVRCP_CT_TAG, "remote rn_cap: count %d, bitmask 0x%x", rc->get_rn_caps_rsp.cap_count,
rc->get_rn_caps_rsp.evt_set.bits);
s_avrc_peer_rn_cap.bits = rc->get_rn_caps_rsp.evt_set.bits;
h2201_avrcp_new_track();
@@ -189,14 +189,14 @@ static void h2201_avrcp_controller_eventhandler(uint16_t event, void *p_param)
break;
}
default:
ESP_LOGE(BT_RC_CT_TAG, "%s unhandled evt %d", __func__, event);
ESP_LOGE(H2201_AVRCP_CT_TAG, "%s unhandled evt %d", __func__, event);
break;
}
}
static void volume_set_by_controller(uint8_t volume)
{
ESP_LOGI(BT_RC_TG_TAG, "Volume is set by remote controller %d%%\n", (uint32_t)volume * 100 / 0x7f);
ESP_LOGI(H2201_AVRCP_TG_TAG, "Volume is set by remote controller %d%%\n", (uint32_t)volume * 100 / 0x7f);
_lock_acquire(&s_volume_lock);
s_volume = volume;
_lock_release(&s_volume_lock);
@@ -204,14 +204,14 @@ static void volume_set_by_controller(uint8_t volume)
static void h2201_avrcp_target_eventhandler(uint16_t event, void *p_param)
{
ESP_LOGD(BT_RC_TG_TAG, "%s evt %d", __func__, event);
ESP_LOGD(H2201_AVRCP_TG_TAG, "%s evt %d", __func__, event);
esp_avrc_tg_cb_param_t *rc = (esp_avrc_tg_cb_param_t *)(p_param);
switch (event)
{
case ESP_AVRC_TG_CONNECTION_STATE_EVT:
{
uint8_t *bda = rc->conn_stat.remote_bda;
ESP_LOGI(BT_RC_TG_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
ESP_LOGI(H2201_AVRCP_TG_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
rc->conn_stat.connected, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
if (rc->conn_stat.connected)
{
@@ -227,18 +227,18 @@ static void h2201_avrcp_target_eventhandler(uint16_t event, void *p_param)
}
case ESP_AVRC_TG_PASSTHROUGH_CMD_EVT:
{
ESP_LOGI(BT_RC_TG_TAG, "AVRC passthrough cmd: key_code 0x%x, key_state %d", rc->psth_cmd.key_code, rc->psth_cmd.key_state);
ESP_LOGI(H2201_AVRCP_TG_TAG, "AVRC passthrough cmd: key_code 0x%x, key_state %d", rc->psth_cmd.key_code, rc->psth_cmd.key_state);
break;
}
case ESP_AVRC_TG_SET_ABSOLUTE_VOLUME_CMD_EVT:
{
ESP_LOGI(BT_RC_TG_TAG, "AVRC set absolute volume: %d%%", (int)rc->set_abs_vol.volume * 100 / 0x7f);
ESP_LOGI(H2201_AVRCP_TG_TAG, "AVRC set absolute volume: %d%%", (int)rc->set_abs_vol.volume * 100 / 0x7f);
volume_set_by_controller(rc->set_abs_vol.volume);
break;
}
case ESP_AVRC_TG_REGISTER_NOTIFICATION_EVT:
{
ESP_LOGI(BT_RC_TG_TAG, "AVRC register event notification: %d, param: 0x%x", rc->reg_ntf.event_id, rc->reg_ntf.event_parameter);
ESP_LOGI(H2201_AVRCP_TG_TAG, "AVRC register event notification: %d, param: 0x%x", rc->reg_ntf.event_id, rc->reg_ntf.event_parameter);
if (rc->reg_ntf.event_id == ESP_AVRC_RN_VOLUME_CHANGE)
{
s_volume_notify = true;
@@ -250,11 +250,11 @@ static void h2201_avrcp_target_eventhandler(uint16_t event, void *p_param)
}
case ESP_AVRC_TG_REMOTE_FEATURES_EVT:
{
ESP_LOGI(BT_RC_TG_TAG, "AVRC remote features %x, CT features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.ct_feat_flag);
ESP_LOGI(H2201_AVRCP_TG_TAG, "AVRC remote features %x, CT features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.ct_feat_flag);
break;
}
default:
ESP_LOGE(BT_RC_TG_TAG, "%s unhandled evt %d", __func__, event);
ESP_LOGE(H2201_AVRCP_TG_TAG, "%s unhandled evt %d", __func__, event);
break;
}
}

12
ESP32/main/bt_app_av.h → ESP32/main/H2201_avrcp.h
View File

@@ -1,13 +1,13 @@
#ifndef __BT_APP_AV_H__
#define __BT_APP_AV_H__
#ifndef __H2201_AVRCP_H__
#define __H2201_AVRCP_H__
#include <stdint.h>
#include "esp_a2dp_api.h"
#include "esp_avrc_api.h"
#define BT_AV_TAG "BT_AV"
#define BT_RC_TG_TAG "RCTG"
#define BT_RC_CT_TAG "RCCT"
#define H2201_AVRCP_TAG "AVRCP"
#define H2201_AVRCP_TG_TAG "TARGET"
#define H2201_AVRCP_CT_TAG "CONTROLLER"
/**
* @brief callback function for AVRCP controller
@@ -19,4 +19,4 @@ void h2201_avrcp_controller_callback(esp_avrc_ct_cb_event_t event, esp_avrc_ct_c
*/
void h2201_avrcp_target_callback(esp_avrc_tg_cb_event_t event, esp_avrc_tg_cb_param_t *param);
#endif /* __BT_APP_AV_H__*/
#endif /* __H2201_AVRCP_H__*/

34
ESP32/main/main.c
View File

@@ -24,10 +24,6 @@
#include "esp_log.h"
#include "esp_bt.h"
#include "bt_app_core.h"
#include "bt_app_av.h"
#include "esp_bt_main.h"
#include "esp_bt_device.h"
#include "esp_gap_bt_api.h"
@@ -35,6 +31,8 @@
#include "esp_avrc_api.h"
#include "driver/i2s.h"
#include "bt_app_core.h"
#include "H2201_avrcp.h"
#include "H2201_a2dp.h"
@@ -89,25 +87,25 @@ void app_main(void)
if ((err = esp_bt_controller_init(&bt_cfg)) != ESP_OK)
{
ESP_LOGE(BT_AV_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(err));
ESP_LOGE(H2201_AVRCP_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(err));
return;
}
if ((err = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK)
{
ESP_LOGE(BT_AV_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(err));
ESP_LOGE(H2201_AVRCP_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(err));
return;
}
if ((err = esp_bluedroid_init()) != ESP_OK)
{
ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(err));
ESP_LOGE(H2201_AVRCP_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(err));
return;
}
if ((err = esp_bluedroid_enable()) != ESP_OK)
{
ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(err));
ESP_LOGE(H2201_AVRCP_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(err));
return;
}
@@ -145,36 +143,36 @@ void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param)
{
if (param->auth_cmpl.stat == ESP_BT_STATUS_SUCCESS)
{
ESP_LOGI(BT_AV_TAG, "authentication success: %s", param->auth_cmpl.device_name);
esp_log_buffer_hex(BT_AV_TAG, param->auth_cmpl.bda, ESP_BD_ADDR_LEN);
ESP_LOGI(H2201_AVRCP_TAG, "authentication success: %s", param->auth_cmpl.device_name);
esp_log_buffer_hex(H2201_AVRCP_TAG, param->auth_cmpl.bda, ESP_BD_ADDR_LEN);
}
else
{
ESP_LOGE(BT_AV_TAG, "authentication failed, status:%d", param->auth_cmpl.stat);
ESP_LOGE(H2201_AVRCP_TAG, "authentication failed, status:%d", param->auth_cmpl.stat);
}
break;
}
#if (CONFIG_BT_SSP_ENABLED == true)
case ESP_BT_GAP_CFM_REQ_EVT:
ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_CFM_REQ_EVT Please compare the numeric value: %d", param->cfm_req.num_val);
ESP_LOGI(H2201_AVRCP_TAG, "ESP_BT_GAP_CFM_REQ_EVT Please compare the numeric value: %d", param->cfm_req.num_val);
esp_bt_gap_ssp_confirm_reply(param->cfm_req.bda, true);
break;
case ESP_BT_GAP_KEY_NOTIF_EVT:
ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_KEY_NOTIF_EVT passkey:%d", param->key_notif.passkey);
ESP_LOGI(H2201_AVRCP_TAG, "ESP_BT_GAP_KEY_NOTIF_EVT passkey:%d", param->key_notif.passkey);
break;
case ESP_BT_GAP_KEY_REQ_EVT:
ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_KEY_REQ_EVT Please enter passkey!");
ESP_LOGI(H2201_AVRCP_TAG, "ESP_BT_GAP_KEY_REQ_EVT Please enter passkey!");
break;
#endif
case ESP_BT_GAP_MODE_CHG_EVT:
ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_MODE_CHG_EVT mode:%d", param->mode_chg.mode);
ESP_LOGI(H2201_AVRCP_TAG, "ESP_BT_GAP_MODE_CHG_EVT mode:%d", param->mode_chg.mode);
break;
default:
{
ESP_LOGI(BT_AV_TAG, "event: %d", event);
ESP_LOGI(H2201_AVRCP_TAG, "event: %d", event);
break;
}
}
@@ -183,7 +181,7 @@ void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param)
static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
{
ESP_LOGD(BT_AV_TAG, "%s evt %d", __func__, event);
ESP_LOGD(H2201_AVRCP_TAG, "%s evt %d", __func__, event);
switch (event)
{
case BT_APP_EVT_STACK_UP:
@@ -215,7 +213,7 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
break;
}
default:
ESP_LOGE(BT_AV_TAG, "%s unhandled evt %d", __func__, event);
ESP_LOGE(H2201_AVRCP_TAG, "%s unhandled evt %d", __func__, event);
break;
}
}