Skip to content

Commit

Permalink
Merge branch 'bugfix/cmake_for_custom_audio_board' into 'master'
Browse files Browse the repository at this point in the history
Bugfix/cmake for custom audio board

See merge request adf/esp-adf-internal!432
  • Loading branch information
jason-mao committed Feb 21, 2020
2 parents 37fd328 + 0f38a98 commit 2a95e1f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
24 changes: 24 additions & 0 deletions examples/get-started/play_mp3/components/my_board/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Edit following two lines to set component requirements (see docs)
set(COMPONENT_REQUIRES)
set(COMPONENT_PRIV_REQUIRES audio_sal audio_hal esp_dispatcher esp_peripherals display_service)

if(CONFIG_AUDIO_BOARD_CUSTOM)
message(STATUS "Current board name is " CONFIG_AUDIO_BOARD_CUSTOM)
list(APPEND COMPONENT_ADD_INCLUDEDIRS ./my_board_v1_0 ./my_codec_driver)
set(COMPONENT_SRCS
./my_board_v1_0/board.c
./my_board_v1_0/board_pins_config.c
./my_codec_driver/new_codec.c
)
endif()

register_component()

IF (IDF_VER MATCHES "v4.")
idf_component_get_property(audio_board_lib audio_board COMPONENT_LIB)
set_property(TARGET ${audio_board_lib} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${COMPONENT_LIB})

ELSEIF (IDF_VER MATCHES "v3.")
set_property(TARGET idf_component_audio_board APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:${COMPONENT_TARGET},INTERFACE_INCLUDE_DIRECTORIES>)

ENDIF (IDF_VER MATCHES "v4.")
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@ audio_hal_func_t AUDIO_NEW_CODEC_DEFAULT_HANDLE = {
.audio_codec_get_volume = new_codec_get_voice_volume,
};

static bool new_codec_initialized()
bool new_codec_initialized()
{
return codec_init_flag;
}

esp_err_t new_codec_init(audio_hal_codec_config_t *cfg)
{
ESP_LOGI(TAG, "new_codec init");
return ESP_OK;
}

Expand Down

0 comments on commit 2a95e1f

Please sign in to comment.