From ba7ab10eedc435a9ba29703193d187ab6417d50f Mon Sep 17 00:00:00 2001 From: Karl Osterseher Date: Sun, 4 Feb 2024 20:04:00 +0100 Subject: [PATCH] add support for Lyrat v4.2 (fix #61) Signed-off-by: Karl Osterseher --- components/audio_board/CMakeLists.txt | 2 -- components/audio_board/Kconfig.projbuild | 4 +-- components/audio_board/lyrat_v4_2/board.c | 10 +++--- components/audio_board/lyrat_v4_2/board.h | 14 ++++---- sdkconfig | 1 + sdkconfig.old | 40 ++--------------------- 6 files changed, 17 insertions(+), 54 deletions(-) diff --git a/components/audio_board/CMakeLists.txt b/components/audio_board/CMakeLists.txt index bc07288..4d70ab4 100644 --- a/components/audio_board/CMakeLists.txt +++ b/components/audio_board/CMakeLists.txt @@ -4,7 +4,6 @@ set(COMPONENT_ADD_INCLUDEDIRS ./include) set(COMPONENT_REQUIRES driver) set(COMPONENT_PRIV_REQUIRES esp_peripherals audio_sal audio_hal) -#[[ if (CONFIG_ESP_LYRAT_V4_2_BOARD) message(STATUS "Current board name is " CONFIG_ESP_LYRAT_V4_2_BOARD) list(APPEND COMPONENT_ADD_INCLUDEDIRS ./lyrat_v4_2) @@ -13,7 +12,6 @@ set(COMPONENT_SRCS ./lyrat_v4_2/board_pins_config.c ) endif() -]] if (CONFIG_ESP_LYRAT_V4_3_BOARD) message(STATUS "Current board name is " CONFIG_ESP_LYRAT_V4_3_BOARD) diff --git a/components/audio_board/Kconfig.projbuild b/components/audio_board/Kconfig.projbuild index 1684d1b..4b9db9a 100644 --- a/components/audio_board/Kconfig.projbuild +++ b/components/audio_board/Kconfig.projbuild @@ -9,8 +9,8 @@ config AUDIO_BOARD_CUSTOM bool "Custom audio board" config ESP_LYRAT_V4_3_BOARD bool "ESP32-Lyrat V4.3" -#config ESP_LYRAT_V4_2_BOARD -# bool "ESP32-Lyrat V4.2" +config ESP_LYRAT_V4_2_BOARD + bool "ESP32-Lyrat V4.2" #config ESP_LYRATD_MSC_V2_1_BOARD # bool "ESP32-LyraTD-MSC V2.1" #config ESP_LYRATD_MSC_V2_2_BOARD diff --git a/components/audio_board/lyrat_v4_2/board.c b/components/audio_board/lyrat_v4_2/board.c index 11f14c9..a9bfb73 100644 --- a/components/audio_board/lyrat_v4_2/board.c +++ b/components/audio_board/lyrat_v4_2/board.c @@ -49,11 +49,11 @@ audio_board_handle_t audio_board_init(void) { return board_handle; } -esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, - periph_sdcard_mode_t mode) { - esp_err_t ret = ESP_FAIL; - return ret; -} +// esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, +// periph_sdcard_mode_t mode) { +// esp_err_t ret = ESP_FAIL; +// return ret; +// } audio_board_handle_t audio_board_get_handle(void) { return board_handle; } diff --git a/components/audio_board/lyrat_v4_2/board.h b/components/audio_board/lyrat_v4_2/board.h index b67fb6c..ce0fdfe 100644 --- a/components/audio_board/lyrat_v4_2/board.h +++ b/components/audio_board/lyrat_v4_2/board.h @@ -30,9 +30,9 @@ #include "audio_hal.h" #include "board_def.h" #include "board_pins_config.h" -#include "display_service.h" -#include "esp_peripherals.h" -#include "periph_sdcard.h" +// #include "display_service.h" +// #include "esp_peripherals.h" +// #include "periph_sdcard.h" #ifdef __cplusplus extern "C" { @@ -66,7 +66,7 @@ audio_hal_handle_t audio_board_codec_init(void); * * @return The audio display service handle */ -display_service_handle_t audio_board_led_init(void); +// display_service_handle_t audio_board_led_init(void); /** * @brief Initialize key peripheral @@ -77,7 +77,7 @@ display_service_handle_t audio_board_led_init(void); * - ESP_OK, success * - Others, fail */ -esp_err_t audio_board_key_init(esp_periph_set_handle_t set); +// esp_err_t audio_board_key_init(esp_periph_set_handle_t set); /** * @brief Initialize sdcard peripheral @@ -88,8 +88,8 @@ esp_err_t audio_board_key_init(esp_periph_set_handle_t set); * - ESP_OK, success * - Others, fail */ -esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, - periph_sdcard_mode_t mode); +// esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, +// periph_sdcard_mode_t mode); /** * @brief Query audio_board_handle diff --git a/sdkconfig b/sdkconfig index 527c140..1e393be 100644 --- a/sdkconfig +++ b/sdkconfig @@ -360,6 +360,7 @@ CONFIG_USE_SAMPLE_INSERTION=y # # CONFIG_AUDIO_BOARD_CUSTOM is not set CONFIG_ESP_LYRAT_V4_3_BOARD=y +# CONFIG_ESP_LYRAT_V4_2_BOARD is not set # CONFIG_ESP_LYRAT_MINI_V1_1_BOARD is not set # end of Audio HAL diff --git a/sdkconfig.old b/sdkconfig.old index 080ba1b..992acb7 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -358,48 +358,12 @@ CONFIG_USE_SAMPLE_INSERTION=y # # Audio HAL # -CONFIG_AUDIO_BOARD_CUSTOM=y +# CONFIG_AUDIO_BOARD_CUSTOM is not set # CONFIG_ESP_LYRAT_V4_3_BOARD is not set +CONFIG_ESP_LYRAT_V4_2_BOARD=y # CONFIG_ESP_LYRAT_MINI_V1_1_BOARD is not set # end of Audio HAL -# -# Custom Audio Board -# -# CONFIG_DAC_PCM51XX is not set -# CONFIG_DAC_PCM5102A is not set -# CONFIG_DAC_MA120 is not set -# CONFIG_DAC_MA120X0 is not set -CONFIG_DAC_ADAU1961=y -# CONFIG_DAC_MAX98357 is not set - -# -# DAC I2C control interface -# -CONFIG_DAC_I2C_SDA=12 -CONFIG_DAC_I2C_SCL=14 -CONFIG_DAC_I2C_ADDR=0x70 -# end of DAC I2C control interface - -# -# I2S master interface -# -CONFIG_MASTER_I2S_MCLK_PIN=3 -CONFIG_MASTER_I2S_BCK_PIN=15 -CONFIG_MASTER_I2S_LRCK_PIN=13 -CONFIG_MASTER_I2S_DATAOUT_PIN=4 -# end of I2S master interface - -# -# I2S slave interface -# -CONFIG_SLAVE_I2S_MCLK_PIN=0 -CONFIG_SLAVE_I2S_BCK_PIN=26 -CONFIG_SLAVE_I2S_LRCK_PIN=12 -CONFIG_SLAVE_I2S_DATAOUT_PIN=5 -# end of I2S slave interface -# end of Custom Audio Board - # # ESP32 DSP processor config #