Merge branch 'bugfix/esp_pm_and_sleep_build_errors' into 'master'

esp_system: Fix various PM and sleep build errors Closes IDFGH-8930 See merge request espressif/esp-idf!21606
espressif · Dec 22, 2022 · 14394ed · 14394ed
2 parents d534d08 + 2f50469
commit 14394ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/components/esp_pm/pm_impl.c b/components/esp_pm/pm_impl.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <stdint.h>
 #include <sys/param.h>
 
 #include "esp_attr.h"
@@ -646,7 +647,7 @@ void IRAM_ATTR vApplicationSleep( TickType_t xExpectedIdleTime )
         int64_t sleep_time_us = MIN(wakeup_delay_us, time_until_next_alarm);
         if (sleep_time_us >= configEXPECTED_IDLE_TIME_BEFORE_SLEEP * portTICK_PERIOD_MS * 1000LL) {
             esp_sleep_enable_timer_wakeup(sleep_time_us - LIGHT_SLEEP_EARLY_WAKEUP_US);
-#ifdef CONFIG_PM_TRACE
+#if CONFIG_PM_TRACE && SOC_PM_SUPPORT_RTC_PERIPH_PD
             /* to force tracing GPIOs to keep state */
             esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
 #endif
@@ -704,7 +705,7 @@ void esp_pm_impl_dump_stats(FILE* out)
             /* don't display light sleep mode if it's not enabled */
             continue;
         }
-        fprintf(out, "%-8s  %-3dM%-7s %-10lld  %-2d%%\n",
+        fprintf(out, "%-8s  %-3"PRIu32"M%-7s %-10lld  %-2d%%\n",
                 s_mode_names[i],
                 s_cpu_freq_by_mode[i].freq_mhz,
                 "",                                     //Empty space to align columns

diff --git a/components/esp_pm/test/CMakeLists.txt b/components/esp_pm/test/CMakeLists.txt
@@ -1,3 +1,2 @@
 idf_component_register(SRC_DIRS .
                        PRIV_REQUIRES unity esp_pm ulp driver esp_timer test_utils)
-target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
diff --git a/components/esp_pm/test/test_pm.c b/components/esp_pm/test/test_pm.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/param.h>
@@ -351,7 +352,7 @@ TEST_CASE("esp_timer produces correct delays with light sleep", "[pm]")
         test_args_t *p_args = (test_args_t *) arg;
         int64_t t_end = esp_clk_rtc_time();
         int32_t ms_diff = (t_end - p_args->t_start) / 1000;
-        printf("timer #%d %dms\n", p_args->cur_interval, ms_diff);
+        printf("timer #%d %"PRIi32"ms\n", p_args->cur_interval, ms_diff);
         p_args->intervals[p_args->cur_interval++] = ms_diff;
         // Deliberately make timer handler run longer.
         // We check that this doesn't affect the result.