diff --git a/components/esp_driver_ana_cmpr/ana_cmpr.c b/components/esp_driver_ana_cmpr/ana_cmpr.c index 381cf6c07b..92ebf93984 100644 --- a/components/esp_driver_ana_cmpr/ana_cmpr.c +++ b/components/esp_driver_ana_cmpr/ana_cmpr.c @@ -241,8 +241,10 @@ esp_err_t ana_cmpr_set_cross_type(ana_cmpr_handle_t cmpr, ana_cmpr_cross_type_t return ESP_ERR_NOT_SUPPORTED; #else ANA_CMPR_NULL_POINTER_CHECK_SAFE(cmpr); - ESP_RETURN_ON_FALSE_ISR(cross_type >= ANA_CMPR_CROSS_DISABLE && cross_type <= ANA_CMPR_CROSS_ANY, - ESP_ERR_INVALID_ARG, TAG, "invalid cross type"); + if (unlikely(cross_type < ANA_CMPR_CROSS_DISABLE || cross_type > ANA_CMPR_CROSS_ANY)) { + ESP_EARLY_LOGE(TAG, "invalid cross type"); + return ESP_ERR_INVALID_ARG; + } portENTER_CRITICAL_SAFE(&s_spinlock); analog_cmpr_ll_set_intr_cross_type(cmpr->dev, cross_type); diff --git a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.ci.cache_safe b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.ci.cache_safe index 35539be28f..5f1f5c1300 100644 --- a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.ci.cache_safe +++ b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.ci.cache_safe @@ -1,6 +1,5 @@ CONFIG_COMPILER_DUMP_RTL_FILES=y CONFIG_ANA_CMPR_ISR_CACHE_SAFE=y -CONFIG_ANA_CMPR_CTRL_FUNC_IN_IRAM=y CONFIG_GPIO_CTRL_FUNC_IN_IRAM=y CONFIG_COMPILER_OPTIMIZATION_NONE=y # place non-ISR FreeRTOS functions in Flash diff --git a/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults b/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults index 8e326e32e1..a58b4feee7 100644 --- a/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults +++ b/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults @@ -1,2 +1,3 @@ CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_TASK_WDT_INIT=n +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 diff --git a/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults.esp32s3 b/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults.esp32s3 new file mode 100644 index 0000000000..db575808cf --- /dev/null +++ b/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults.esp32s3 @@ -0,0 +1,2 @@ +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0