From 60fbc9b534075efbf23f336e4028c782080af461 Mon Sep 17 00:00:00 2001 From: maojianxin Date: Wed, 26 Jun 2019 09:30:16 +0800 Subject: [PATCH 1/2] Fix: play no auto codec http stream fail. Closes https://github.com/espressif/esp-adf/issues/193 --- components/esp-adf-libs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp-adf-libs b/components/esp-adf-libs index abf8128ab..91a8975cd 160000 --- a/components/esp-adf-libs +++ b/components/esp-adf-libs @@ -1 +1 @@ -Subproject commit abf8128abe6ab764994eede8ba58bbde8d9841cb +Subproject commit 91a8975cd5364c87678ebcdeb175aff3fa60559b From a8bf4d88ea16701631f303e17396166690032388 Mon Sep 17 00:00:00 2001 From: maojianxin Date: Wed, 26 Jun 2019 09:45:19 +0800 Subject: [PATCH 2/2] Fix: Correct Lyrat-mini board name --- components/audio_board/Kconfig.projbuild | 2 +- components/audio_board/component.mk | 6 +++--- .../{lyratd_mini_v1_1 => lyrat_mini_v1_1}/board.c | 0 .../{lyratd_mini_v1_1 => lyrat_mini_v1_1}/board.h | 0 .../{lyratd_mini_v1_1 => lyrat_mini_v1_1}/board_def.h | 0 .../board_pins_config.c | 2 +- examples/dueros/main/dueros_app.c | 5 +++-- 7 files changed, 8 insertions(+), 7 deletions(-) rename components/audio_board/{lyratd_mini_v1_1 => lyrat_mini_v1_1}/board.c (100%) rename components/audio_board/{lyratd_mini_v1_1 => lyrat_mini_v1_1}/board.h (100%) rename components/audio_board/{lyratd_mini_v1_1 => lyrat_mini_v1_1}/board_def.h (100%) rename components/audio_board/{lyratd_mini_v1_1 => lyrat_mini_v1_1}/board_pins_config.c (99%) diff --git a/components/audio_board/Kconfig.projbuild b/components/audio_board/Kconfig.projbuild index 686f405f9..98d57767c 100644 --- a/components/audio_board/Kconfig.projbuild +++ b/components/audio_board/Kconfig.projbuild @@ -14,7 +14,7 @@ config ESP_LYRATD_MSC_V2_1_BOARD bool "ESP32-LyraTD-MSC V2.1" config ESP_LYRATD_MSC_V2_2_BOARD bool "ESP32-LyraTD-MSC V2.2" -config ESP_LYRATD_MINI_V1_1_BOARD +config ESP_LYRAT_MINI_V1_1_BOARD bool "ESP32-Lyrat-Mini V1.1" endchoice diff --git a/components/audio_board/component.mk b/components/audio_board/component.mk index 1871356d9..83ef8ff76 100644 --- a/components/audio_board/component.mk +++ b/components/audio_board/component.mk @@ -27,7 +27,7 @@ COMPONENT_SRCDIRS += ./lyratd_msc_v2_2 COMPONENT_ADD_LDFLAGS += -L$(COMPONENT_PATH)/../audio_hal/driver/zl38063/firmware -lfirmware endif -ifdef CONFIG_ESP_LYRATD_MINI_V1_1_BOARD -COMPONENT_ADD_INCLUDEDIRS += ./lyratd_mini_v1_1 -COMPONENT_SRCDIRS += ./lyratd_mini_v1_1 +ifdef CONFIG_ESP_LYRAT_MINI_V1_1_BOARD +COMPONENT_ADD_INCLUDEDIRS += ./lyrat_mini_v1_1 +COMPONENT_SRCDIRS += ./lyrat_mini_v1_1 endif diff --git a/components/audio_board/lyratd_mini_v1_1/board.c b/components/audio_board/lyrat_mini_v1_1/board.c similarity index 100% rename from components/audio_board/lyratd_mini_v1_1/board.c rename to components/audio_board/lyrat_mini_v1_1/board.c diff --git a/components/audio_board/lyratd_mini_v1_1/board.h b/components/audio_board/lyrat_mini_v1_1/board.h similarity index 100% rename from components/audio_board/lyratd_mini_v1_1/board.h rename to components/audio_board/lyrat_mini_v1_1/board.h diff --git a/components/audio_board/lyratd_mini_v1_1/board_def.h b/components/audio_board/lyrat_mini_v1_1/board_def.h similarity index 100% rename from components/audio_board/lyratd_mini_v1_1/board_def.h rename to components/audio_board/lyrat_mini_v1_1/board_def.h diff --git a/components/audio_board/lyratd_mini_v1_1/board_pins_config.c b/components/audio_board/lyrat_mini_v1_1/board_pins_config.c similarity index 99% rename from components/audio_board/lyratd_mini_v1_1/board_pins_config.c rename to components/audio_board/lyrat_mini_v1_1/board_pins_config.c index 0e06888f1..989d413d2 100644 --- a/components/audio_board/lyratd_mini_v1_1/board_pins_config.c +++ b/components/audio_board/lyrat_mini_v1_1/board_pins_config.c @@ -29,7 +29,7 @@ #include "audio_error.h" #include "audio_mem.h" -static const char *TAG = "LYRATD_MINI_V1_1"; +static const char *TAG = "LYRAT_MINI_V1_1"; esp_err_t get_i2c_pins(i2c_port_t port, i2c_config_t *i2c_config) { diff --git a/examples/dueros/main/dueros_app.c b/examples/dueros/main/dueros_app.c index c5d21c224..a16b8f86a 100644 --- a/examples/dueros/main/dueros_app.c +++ b/examples/dueros/main/dueros_app.c @@ -98,7 +98,7 @@ void rec_engine_cb(rec_event_type_t type, void *user_data) static audio_element_handle_t raw_read; -#ifdef CONFIG_ESP_LYRATD_MINI_V1_1_BOARD +#ifdef CONFIG_ESP_LYRAT_MINI_V1_1_BOARD static esp_err_t recorder_pipeline_open_for_mini(void **handle) { audio_element_handle_t i2s_stream_reader; @@ -348,6 +348,7 @@ esp_err_t periph_callback(audio_event_iface_msg_t *event, void *context) void duer_app_init(void) { esp_log_level_set("*", ESP_LOG_INFO); + ESP_LOGI(TAG, "ADF version is %s", ADF_VER); esp_periph_config_t periph_cfg = DEFAULT_ESP_PERIPH_SET_CONFIG(); @@ -391,7 +392,7 @@ void duer_app_init(void) eng.vad_off_delay_ms = 800; eng.wakeup_time_ms = 10 * 1000; eng.evt_cb = rec_engine_cb; -#ifdef CONFIG_ESP_LYRATD_MINI_V1_1_BOARD +#ifdef CONFIG_ESP_LYRAT_MINI_V1_1_BOARD eng.open = recorder_pipeline_open_for_mini; #else eng.open = recorder_pipeline_open;