From 04308e71de701d36562242ef91301280ff53a990 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 21 Apr 2020 14:15:15 -0400 Subject: [PATCH] increase log verbosity --- build-scripts/ESP32-A1S-sdkconfig.defaults | 4 ++-- build-scripts/I2S-4MFlash-sdkconfig.defaults | 9 ++++----- .../SqueezeAmp4MBFlash-sdkconfig.defaults | 4 ++-- .../SqueezeAmp8MBFlash-sdkconfig.defaults | 4 ++-- build-scripts/sdkconfig | 4 ++-- sdkconfig | 18 +++++++++--------- squeezelite.cmake | 14 ++++++++------ 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/build-scripts/ESP32-A1S-sdkconfig.defaults b/build-scripts/ESP32-A1S-sdkconfig.defaults index 56b85fa7..2271504b 100644 --- a/build-scripts/ESP32-A1S-sdkconfig.defaults +++ b/build-scripts/ESP32-A1S-sdkconfig.defaults @@ -444,11 +444,11 @@ CONFIG_HEAP_TRACING_OFF=y # CONFIG_HEAP_TRACING is not set # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set -CONFIG_LOG_DEFAULT_LEVEL_WARN=y +CONFIG_LOG_DEFAULT_LEVEL_INFO=y # CONFIG_LOG_DEFAULT_LEVEL_INFO is not set # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set -CONFIG_LOG_DEFAULT_LEVEL=2 +CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_COLORS=y CONFIG_LWIP_LOCAL_HOSTNAME="esp32a1s" # CONFIG_LWIP_L2_TO_L3_COPY is not set diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index ca22728e..070d1470 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -15,11 +15,10 @@ CONFIG_APP_COMPILE_TIME_DATE=y # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set # CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set -CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y -# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set +CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set -CONFIG_BOOTLOADER_LOG_LEVEL=2 +CONFIG_BOOTLOADER_LOG_LEVEL=3 CONFIG_BOOTLOADER_SPI_WP_PIN=7 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y # CONFIG_BOOTLOADER_FACTORY_RESET is not set @@ -436,11 +435,11 @@ CONFIG_HEAP_TRACING_OFF=y CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set -CONFIG_LOG_DEFAULT_LEVEL_WARN=y +CONFIG_LOG_DEFAULT_LEVEL_INFO=y # CONFIG_LOG_DEFAULT_LEVEL_INFO is not set # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set -CONFIG_LOG_DEFAULT_LEVEL=2 +CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_COLORS=y CONFIG_LWIP_LOCAL_HOSTNAME="squeezelite-esp32" # CONFIG_LWIP_L2_TO_L3_COPY is not set diff --git a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults index 46512dab..90f5ad96 100644 --- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults @@ -457,11 +457,11 @@ CONFIG_HEAP_TRACING_OFF=y # CONFIG_HEAP_TRACING is not set # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set -CONFIG_LOG_DEFAULT_LEVEL_WARN=y +CONFIG_LOG_DEFAULT_LEVEL_INFO=y # CONFIG_LOG_DEFAULT_LEVEL_INFO is not set # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set -CONFIG_LOG_DEFAULT_LEVEL=2 +CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_COLORS=y CONFIG_LWIP_LOCAL_HOSTNAME="SqueezeAMP" # CONFIG_LWIP_L2_TO_L3_COPY is not set diff --git a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults index 5bad6c1b..8b7b4f67 100644 --- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults @@ -456,11 +456,11 @@ CONFIG_HEAP_TRACING_OFF=y # CONFIG_HEAP_TRACING is not set # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set -CONFIG_LOG_DEFAULT_LEVEL_WARN=y +CONFIG_LOG_DEFAULT_LEVEL_INFO=y # CONFIG_LOG_DEFAULT_LEVEL_INFO is not set # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set -CONFIG_LOG_DEFAULT_LEVEL=2 +CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_COLORS=y CONFIG_LWIP_LOCAL_HOSTNAME="SqueezeAMP" # CONFIG_LWIP_L2_TO_L3_COPY is not set diff --git a/build-scripts/sdkconfig b/build-scripts/sdkconfig index 57e2384a..799a8740 100644 --- a/build-scripts/sdkconfig +++ b/build-scripts/sdkconfig @@ -446,11 +446,11 @@ CONFIG_HEAP_TRACING_OFF=y # CONFIG_HEAP_TRACING is not set # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set -CONFIG_LOG_DEFAULT_LEVEL_WARN=y +CONFIG_LOG_DEFAULT_LEVEL_INFO=y # CONFIG_LOG_DEFAULT_LEVEL_INFO is not set # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set -CONFIG_LOG_DEFAULT_LEVEL=2 +CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_COLORS=y CONFIG_LWIP_LOCAL_HOSTNAME="squeezelite-esp32" # CONFIG_LWIP_L2_TO_L3_COPY is not set diff --git a/sdkconfig b/sdkconfig index 5eb0bc2f..3e3202f9 100644 --- a/sdkconfig +++ b/sdkconfig @@ -15,11 +15,11 @@ CONFIG_APP_COMPILE_TIME_DATE=y # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set # CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set -CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y -# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set +# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set +CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set -CONFIG_BOOTLOADER_LOG_LEVEL=2 +CONFIG_BOOTLOADER_LOG_LEVEL=3 CONFIG_BOOTLOADER_SPI_WP_PIN=7 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y # CONFIG_BOOTLOADER_FACTORY_RESET is not set @@ -434,11 +434,11 @@ CONFIG_HEAP_TRACING_OFF=y CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set -CONFIG_LOG_DEFAULT_LEVEL_WARN=y -# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set +# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set +CONFIG_LOG_DEFAULT_LEVEL_INFO=y # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set -CONFIG_LOG_DEFAULT_LEVEL=2 +CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_COLORS=y CONFIG_LWIP_LOCAL_HOSTNAME="squeezelite-esp32" # CONFIG_LWIP_L2_TO_L3_COPY is not set @@ -652,11 +652,11 @@ CONFIG_DSP_MAX_FFT_SIZE=512 CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set -CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y -# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set +# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set +CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y # CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set -CONFIG_LOG_BOOTLOADER_LEVEL=2 +CONFIG_LOG_BOOTLOADER_LEVEL=3 # CONFIG_APP_ROLLBACK_ENABLE is not set # CONFIG_FLASH_ENCRYPTION_ENABLED is not set CONFIG_FLASHMODE_QIO=y diff --git a/squeezelite.cmake b/squeezelite.cmake index 62b7bc50..d8355a74 100644 --- a/squeezelite.cmake +++ b/squeezelite.cmake @@ -1,9 +1,11 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) -function(___register_flash target_name sub_type) +function(___register_flash partition_name sub_type) + + message(STATUS "Adding new build target (from build folder): ninja ${partition_name}-flash") partition_table_get_partition_info(otaapp_offset "--partition-type app --partition-subtype ${sub_type}" "offset") - esptool_py_flash_project_args(${target_name} ${otaapp_offset} ${build_dir}/${target_name}.bin FLASH_IN_PROJECT) - esptool_py_custom_target(${target_name}-flash ${target_name} "${target_name}") + esptool_py_flash_project_args(${partition_name} ${otaapp_offset} ${build_dir}/${partition_name}.bin FLASH_IN_PROJECT ) + esptool_py_custom_target(${partition_name}-flash ${partition_name} "${build_dir}/${partition_name}.bin") ## IDF-V4.2+ idf_component_get_property(main_args esptool_py FLASH_ARGS) ## IDF-V4.2+ idf_component_get_property(sub_args esptool_py FLASH_SUB_ARGS) ## IDF-V4.2+ esptool_py_flash_target(${target_name}-flash "${main_args}" "${sub_args}") @@ -94,18 +96,18 @@ function(___create_new_target target_name) # Add size targets, depend on map file, run idf_size.py - message(STATUS "adding new target (from build folder): size-${target_name}") + message(STATUS "Adding new build target (from build folder): ninja size-${target_name}") add_custom_target(size-${target_name} DEPENDS ${target_elf} COMMAND ${idf_size} ${target_name_mapfile} ) - message(STATUS "adding new target (from build folder): ninja size-files-${target_name}") + message(STATUS "Adding new build target (from build folder): ninja size-files-${target_name}") add_custom_target(size-files-${target_name} DEPENDS ${target_elf} COMMAND ${idf_size} --files ${target_name_mapfile} ) - message(STATUS "adding new target (from build folder): size-components-${target_name}") + message(STATUS "Adding new build target (from build folder): ninja size-components-${target_name}") add_custom_target(size-components-${target_name} DEPENDS ${target_elf} COMMAND ${idf_size} --archives ${target_name_mapfile}