From d4fa8638d730d034603b332a33fe731893af69ec Mon Sep 17 00:00:00 2001 From: Philippe G Date: Fri, 26 Nov 2021 00:32:36 -0800 Subject: [PATCH] Timer stack needs a bit more room + no EXT_RAM_ATTR for .data (again) --- build-scripts/ESP32-A1S-sdkconfig.defaults | 4 ++-- build-scripts/I2S-4MFlash-sdkconfig.defaults | 4 ++-- build-scripts/SqueezeAmp-sdkconfig.defaults | 4 ++-- components/services/accessors.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/ESP32-A1S-sdkconfig.defaults b/build-scripts/ESP32-A1S-sdkconfig.defaults index 44adbdf9..265c5765 100644 --- a/build-scripts/ESP32-A1S-sdkconfig.defaults +++ b/build-scripts/ESP32-A1S-sdkconfig.defaults @@ -466,7 +466,7 @@ CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2432 +CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2800 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 #CONFIG_FREERTOS_USE_TRACE_FACILITY=y @@ -832,7 +832,7 @@ CONFIG_MB_TIMER_INDEX=0 CONFIG_SUPPORT_STATIC_ALLOCATION=y # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2432 +CONFIG_TIMER_TASK_STACK_DEPTH=2800 CONFIG_TIMER_QUEUE_LENGTH=10 # CONFIG_L2_TO_L3_COPY is not set # CONFIG_USE_ONLY_LWIP_SELECT is not set diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index 8730d1fe..e5664c8a 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -422,7 +422,7 @@ CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2432 +CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2800 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 #CONFIG_FREERTOS_USE_TRACE_FACILITY=y @@ -793,7 +793,7 @@ CONFIG_MB_TIMER_INDEX=0 CONFIG_SUPPORT_STATIC_ALLOCATION=y # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2432 +CONFIG_TIMER_TASK_STACK_DEPTH=2800 CONFIG_TIMER_QUEUE_LENGTH=10 # CONFIG_L2_TO_L3_COPY is not set # CONFIG_USE_ONLY_LWIP_SELECT is not set diff --git a/build-scripts/SqueezeAmp-sdkconfig.defaults b/build-scripts/SqueezeAmp-sdkconfig.defaults index b48dbcb3..a9411991 100644 --- a/build-scripts/SqueezeAmp-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp-sdkconfig.defaults @@ -424,7 +424,7 @@ CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2432 +CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2800 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 #CONFIG_FREERTOS_USE_TRACE_FACILITY=y @@ -789,7 +789,7 @@ CONFIG_MB_TIMER_INDEX=0 CONFIG_SUPPORT_STATIC_ALLOCATION=y # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2432 +CONFIG_TIMER_TASK_STACK_DEPTH=2800 CONFIG_TIMER_QUEUE_LENGTH=10 # CONFIG_L2_TO_L3_COPY is not set # CONFIG_USE_ONLY_LWIP_SELECT is not set diff --git a/components/services/accessors.c b/components/services/accessors.c index 0601312b..a0735654 100644 --- a/components/services/accessors.c +++ b/components/services/accessors.c @@ -118,7 +118,7 @@ static void set_i2s_pin(char *config, i2s_pin_config_t *pin_config) { * Get i2s config structure from config string */ const i2s_platform_config_t * config_get_i2s_from_str(char * dac_config ){ - static EXT_RAM_ATTR i2s_platform_config_t i2s_dac_pin = { + static i2s_platform_config_t i2s_dac_pin = { .i2c_addr = -1, .sda= -1, .scl = -1, @@ -146,7 +146,7 @@ const i2s_platform_config_t * config_get_i2s_from_str(char * dac_config ){ * Get eth config structure from config string */ const eth_config_t * config_get_eth_from_str(char * eth_config ){ - static EXT_RAM_ATTR eth_config_t eth_pin = { + static eth_config_t eth_pin = { .rmii = false, .model = "", }; @@ -561,7 +561,7 @@ const set_GPIO_struct_t * get_gpio_struct(){ */ const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) { char *nvs_item, *p; - static EXT_RAM_ATTR spi_bus_config_t spi = { + static spi_bus_config_t spi = { .mosi_io_num = -1, .sclk_io_num = -1, .miso_io_num = -1,