diff --git a/components/ulp/CMakeLists.txt b/components/ulp/CMakeLists.txt index 4d336620bb..b410482744 100644 --- a/components/ulp/CMakeLists.txt +++ b/components/ulp/CMakeLists.txt @@ -49,7 +49,3 @@ endif() idf_component_register(SRCS ${srcs} INCLUDE_DIRS ${includes} REQUIRES driver esp_adc) - -if(CONFIG_SOC_ULP_SUPPORTED OR CONFIG_SOC_RISCV_COPROC_SUPPORTED) - target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") -endif() diff --git a/components/ulp/ulp_common/ulp_common.c b/components/ulp/ulp_common/ulp_common.c index 32307ba729..52b64254e7 100644 --- a/components/ulp/ulp_common/ulp_common.c +++ b/components/ulp/ulp_common/ulp_common.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -32,7 +32,7 @@ esp_err_t ulp_set_wakeup_period(size_t period_index, uint32_t period_us) + REG_GET_FIELD(RTC_CNTL_TIMER2_REG, RTC_CNTL_ULPCP_TOUCH_START_WAIT); if (period_cycles < min_sleep_period_cycles) { period_cycles = min_sleep_period_cycles; - ESP_LOGW("ulp", "Sleep period clipped to minimum of %d cycles", (uint32_t) min_sleep_period_cycles); + ESP_LOGW("ulp", "Sleep period clipped to minimum of %"PRIu32" cycles", (uint32_t) min_sleep_period_cycles); } else { period_cycles -= min_sleep_period_cycles; } diff --git a/components/ulp/ulp_fsm/ulp_macro.c b/components/ulp/ulp_fsm/ulp_macro.c index 59eaefbae9..fd4c335c4d 100644 --- a/components/ulp/ulp_fsm/ulp_macro.c +++ b/components/ulp/ulp_fsm/ulp_macro.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -190,7 +190,7 @@ esp_err_t ulp_process_macros_and_load(uint32_t load_addr, const ulp_insn_t* prog size_t real_program_size = *psize - macro_count; const size_t ulp_mem_end = CONFIG_ULP_COPROC_RESERVE_MEM / sizeof(ulp_insn_t); if (load_addr > ulp_mem_end) { - ESP_LOGW(TAG, "invalid load address %x, max is %x", + ESP_LOGW(TAG, "invalid load address %"PRIx32", max is %x", load_addr, ulp_mem_end); return ESP_ERR_ULP_INVALID_LOAD_ADDR; }