From 79eda66a05d475081b7a248ce1fc07468e3a8883 Mon Sep 17 00:00:00 2001 From: Martijn Scheepers Date: Mon, 25 Apr 2022 11:38:48 +0200 Subject: [PATCH] Remove volume simulator --- ESP32/.vscode/settings.json | 2 +- ESP32/main/bt_app_av.c | 58 ++++++++++++++++++------------------- ESP32/main/main.c | 31 ++++++++------------ 3 files changed, 42 insertions(+), 49 deletions(-) diff --git a/ESP32/.vscode/settings.json b/ESP32/.vscode/settings.json index 851c946..c80d910 100644 --- a/ESP32/.vscode/settings.json +++ b/ESP32/.vscode/settings.json @@ -9,7 +9,7 @@ "interface/ftdi/esp32_devkitj_v1.cfg", "target/esp32.cfg" ], - "idf.portWin": "COM3", + "idf.portWin": "COM5", "idf.pythonBinPathWin": "C:\\Users\\ms\\.espressif\\python_env\\idf4.4_py3.8_env\\Scripts\\python.exe", "idf.toolsPathWin": "C:\\Users\\ms\\.espressif", "idf.flashType": "UART" diff --git a/ESP32/main/bt_app_av.c b/ESP32/main/bt_app_av.c index 35bcff1..f2ea80b 100644 --- a/ESP32/main/bt_app_av.c +++ b/ESP32/main/bt_app_av.c @@ -47,7 +47,7 @@ static const char *s_a2d_conn_state_str[] = {"Disconnected", "Connecting", "Conn static const char *s_a2d_audio_state_str[] = {"Suspended", "Stopped", "Started"}; static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap; static _lock_t s_volume_lock; -static xTaskHandle s_vcs_task_hdl = NULL; +//static xTaskHandle s_vcs_task_hdl = NULL; static uint8_t s_volume = 0; static bool s_volume_notify; @@ -71,9 +71,9 @@ void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param) void bt_app_a2d_data_cb(const uint8_t *data, uint32_t len) { write_ringbuf(data, len); - if (++s_pkt_cnt % 100 == 0) { - ESP_LOGI(BT_AV_TAG, "Audio packet count %u", s_pkt_cnt); - } + // if (++s_pkt_cnt % 100 == 0) { + // ESP_LOGI(BT_AV_TAG, "Audio packet count %u", s_pkt_cnt); + // } } void bt_app_alloc_meta_buffer(esp_avrc_ct_cb_param_t *param) @@ -297,32 +297,32 @@ static void volume_set_by_controller(uint8_t volume) _lock_release(&s_volume_lock); } -static void volume_set_by_local_host(uint8_t volume) -{ - ESP_LOGI(BT_RC_TG_TAG, "Volume is set locally to: %d%%", (uint32_t)volume * 100 / 0x7f); - _lock_acquire(&s_volume_lock); - s_volume = volume; - _lock_release(&s_volume_lock); +// static void volume_set_by_local_host(uint8_t volume) +// { +// ESP_LOGI(BT_RC_TG_TAG, "Volume is set locally to: %d%%", (uint32_t)volume * 100 / 0x7f); +// _lock_acquire(&s_volume_lock); +// s_volume = volume; +// _lock_release(&s_volume_lock); - if (s_volume_notify) { - esp_avrc_rn_param_t rn_param; - rn_param.volume = s_volume; - esp_avrc_tg_send_rn_rsp(ESP_AVRC_RN_VOLUME_CHANGE, ESP_AVRC_RN_RSP_CHANGED, &rn_param); - s_volume_notify = false; - } -} +// if (s_volume_notify) { +// esp_avrc_rn_param_t rn_param; +// rn_param.volume = s_volume; +// esp_avrc_tg_send_rn_rsp(ESP_AVRC_RN_VOLUME_CHANGE, ESP_AVRC_RN_RSP_CHANGED, &rn_param); +// s_volume_notify = false; +// } +// } -static void volume_change_simulation(void *arg) -{ - ESP_LOGI(BT_RC_TG_TAG, "start volume change simulation"); +// static void volume_change_simulation(void *arg) +// { +// ESP_LOGI(BT_RC_TG_TAG, "start volume change simulation"); - for (;;) { - vTaskDelay(10000 / portTICK_RATE_MS); +// for (;;) { +// vTaskDelay(10000 / portTICK_RATE_MS); - uint8_t volume = (s_volume + 5) & 0x7f; - volume_set_by_local_host(volume); - } -} +// uint8_t volume = (s_volume + 5) & 0x7f; +// volume_set_by_local_host(volume); +// } +// } static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param) { @@ -335,10 +335,10 @@ static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param) rc->conn_stat.connected, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]); if (rc->conn_stat.connected) { // create task to simulate volume change - xTaskCreate(volume_change_simulation, "vcsT", 2048, NULL, 5, &s_vcs_task_hdl); + //xTaskCreate(volume_change_simulation, "vcsT", 2048, NULL, 5, &s_vcs_task_hdl); } else { - vTaskDelete(s_vcs_task_hdl); - ESP_LOGI(BT_RC_TG_TAG, "Stop volume change simulation"); + //vTaskDelete(s_vcs_task_hdl); + //ESP_LOGI(BT_RC_TG_TAG, "Stop volume change simulation"); } break; } diff --git a/ESP32/main/main.c b/ESP32/main/main.c index 5ede4c0..a6c4bd9 100644 --- a/ESP32/main/main.c +++ b/ESP32/main/main.c @@ -33,9 +33,6 @@ #include "esp_avrc_api.h" #include "driver/i2s.h" -//#define CONFIG_CLASSIC_BT_ENABLED 1 -//#define CONFIG_BT_SPP_ENABLED 1 - /* event for handler "bt_av_hdl_stack_up */ enum { @@ -64,9 +61,6 @@ void app_main(void) .bits_per_sample = 16, .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT, // 2-channels .communication_format = I2S_COMM_FORMAT_STAND_I2S, - //.communication_format = I2S_COMM_FORMAT_I2S, - //.dma_buf_count = 6, - //.dma_buf_len = 60, .dma_buf_count = 8, .dma_buf_len = 64, .intr_alloc_flags = 0, // Default interrupt priority @@ -76,14 +70,12 @@ void app_main(void) i2s_driver_install(i2s_num, &i2s_config, 0, NULL); i2s_pin_config_t pin_config = { - .bck_io_num = 25, //CONFIG_EXAMPLE_I2S_BCK_PIN, - .ws_io_num = 26, //CONFIG_EXAMPLE_I2S_LRCK_PIN, - .data_out_num = 33, //CONFIG_EXAMPLE_I2S_DATA_PIN, - .data_in_num = I2S_PIN_NO_CHANGE - }; + .bck_io_num = 25, + .ws_io_num = 26, + .data_out_num = 33, + .data_in_num = I2S_PIN_NO_CHANGE}; i2s_set_pin(i2s_num, &pin_config); - ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_BLE)); esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); @@ -129,13 +121,13 @@ void app_main(void) * Set default parameters for Legacy Pairing * Use fixed pin code */ - esp_bt_pin_type_t pin_type = ESP_BT_PIN_TYPE_FIXED; - esp_bt_pin_code_t pin_code; - pin_code[0] = '1'; - pin_code[1] = '2'; - pin_code[2] = '3'; - pin_code[3] = '4'; - esp_bt_gap_set_pin(pin_type, 4, pin_code); + // esp_bt_pin_type_t pin_type = ESP_BT_PIN_TYPE_FIXED; + // esp_bt_pin_code_t pin_code; + // pin_code[0] = '1'; + // pin_code[1] = '2'; + // pin_code[2] = '3'; + // pin_code[3] = '4'; + // esp_bt_gap_set_pin(pin_type, 4, pin_code); } void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param) @@ -181,6 +173,7 @@ void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param) } return; } + static void bt_av_hdl_stack_evt(uint16_t event, void *p_param) { ESP_LOGD(BT_AV_TAG, "%s evt %d", __func__, event);