Merge branch 'bugfix/no_auto_codec_play_http_fail' into 'master'

Fix: play no auto codec http stream fail. See merge request adf/esp-adf-internal!315
espressif · Jun 26, 2019 · adc6ac1 · adc6ac1
2 parents 49d7330 + a8bf4d8
commit adc6ac1
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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/...ents/audio_board/lyratd_mini_v1_1/board.c → ...nents/audio_board/lyrat_mini_v1_1/board.c b/...ents/audio_board/lyratd_mini_v1_1/board.c → ...nents/audio_board/lyrat_mini_v1_1/board.c
diff --git a/...ents/audio_board/lyratd_mini_v1_1/board.h → ...nents/audio_board/lyrat_mini_v1_1/board.h b/...ents/audio_board/lyratd_mini_v1_1/board.h → ...nents/audio_board/lyrat_mini_v1_1/board.h
diff --git a/.../audio_board/lyratd_mini_v1_1/board_def.h → ...s/audio_board/lyrat_mini_v1_1/board_def.h b/.../audio_board/lyratd_mini_v1_1/board_def.h → ...s/audio_board/lyrat_mini_v1_1/board_def.h
diff --git a/...oard/lyratd_mini_v1_1/board_pins_config.c → ...board/lyrat_mini_v1_1/board_pins_config.c b/...oard/lyratd_mini_v1_1/board_pins_config.c → ...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/components/esp-adf-libs b/components/esp-adf-libs
diff --git 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;