From 48ce5d7c018d428ab0d6d6580f9df1582c18730c Mon Sep 17 00:00:00 2001 From: wangyuanze Date: Mon, 8 Aug 2022 14:42:59 +0800 Subject: [PATCH] touch: adapt touch-related code to compile with -Wno-format flag --- .../test/touch_sensor_test/test_touch_v2.c | 91 ++++++++++--------- components/touch_element/CMakeLists.txt | 1 - components/touch_element/touch_button.c | 1 + components/touch_element/touch_element.c | 9 +- components/touch_element/touch_matrix.c | 7 +- 5 files changed, 56 insertions(+), 53 deletions(-) diff --git a/components/driver/test/touch_sensor_test/test_touch_v2.c b/components/driver/test/touch_sensor_test/test_touch_v2.c index 7424c8afe7..5ddd7cbe4a 100644 --- a/components/driver/test/touch_sensor_test/test_touch_v2.c +++ b/components/driver/test/touch_sensor_test/test_touch_v2.c @@ -11,6 +11,7 @@ #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #include +#include #include "esp_system.h" #include "driver/touch_pad.h" #include "unity.h" @@ -114,7 +115,7 @@ static void printf_touch_hw_read(const char *str) printf("[%s] ", str); for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { touch_pad_read_raw_data(touch_list[i], &touch_value); - printf("[%d]%d ", touch_list[i], touch_value); + printf("[%d]%"PRIu32" ", touch_list[i], touch_value); } printf("\r\n"); } @@ -125,7 +126,7 @@ static void printf_touch_benchmark_read(const char *str) printf("[%s] ", str); for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); - printf("[%d]%d ", touch_list[i], touch_value); + printf("[%d]%"PRIu32" ", touch_list[i], touch_value); } printf("\r\n"); } @@ -136,7 +137,7 @@ static void printf_touch_smooth_read(const char *str) printf("[%s] ", str); for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { touch_pad_filter_read_smooth(touch_list[i], &touch_value); - printf("[%d]%d ", touch_list[i], touch_value); + printf("[%d]%"PRIu32" ", touch_list[i], touch_value); } printf("\r\n"); } @@ -227,7 +228,7 @@ esp_err_t test_touch_sw_read(void) TEST_ESP_OK( touch_pad_sw_start() ); while (!touch_pad_meas_is_done()) ; TEST_ESP_OK( touch_pad_read_raw_data(touch_list[i], &touch_value[i]) ); - printf("T%d:[%4d] ", touch_list[i], touch_value[i]); + printf("T%d:[%4"PRIu32"] ", touch_list[i], touch_value[i]); TEST_ASSERT_NOT_EQUAL(TOUCH_READ_INVALID_VAL, touch_value[i]); } printf("\n"); @@ -246,7 +247,7 @@ esp_err_t test_touch_sw_read(void) TEST_ESP_OK( touch_pad_sw_start() ); while (!touch_pad_meas_is_done()) ; TEST_ESP_OK( touch_pad_read_raw_data(touch_list[i], &touch_push[i]) ); - printf("T%d:[%4d] ", touch_list[i], touch_push[i]); + printf("T%d:[%4"PRIu32"] ", touch_list[i], touch_push[i]); TEST_ASSERT_NOT_EQUAL(TOUCH_READ_INVALID_VAL, touch_push[i]); } printf("\n"); @@ -298,7 +299,7 @@ esp_err_t test_touch_timer_read(void) for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { TEST_ESP_OK( touch_pad_read_raw_data(touch_list[i], &touch_value[i]) ); TEST_ASSERT_NOT_EQUAL(TOUCH_READ_INVALID_VAL, touch_value[i]); - printf("T%d:[%4d] ", touch_list[i], touch_value[i]); + printf("T%d:[%4"PRIu32"] ", touch_list[i], touch_value[i]); } printf("\n"); for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { @@ -314,7 +315,7 @@ esp_err_t test_touch_timer_read(void) /* Read the touch sensor raw data in FSM mode. */ for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { TEST_ESP_OK( touch_pad_read_raw_data(touch_list[i], &touch_push[i]) ); - printf("T%d:[%4d] ", touch_list[i], touch_push[i]); + printf("T%d:[%4"PRIu32"] ", touch_list[i], touch_push[i]); TEST_ASSERT_NOT_EQUAL(TOUCH_READ_INVALID_VAL, touch_push[i]); } printf("\n"); @@ -472,7 +473,7 @@ int test_touch_base_parameter(touch_pad_t pad_num, int meas_time, int slp_time, } touch_temp = touch_value; - printf("T%d:[%4d] ", pad_num, touch_value); + printf("T%d:[%4"PRIu32"] ", pad_num, touch_value); val_sum += touch_value; // For check. vTaskDelay(20 / portTICK_PERIOD_MS); } @@ -544,7 +545,7 @@ static esp_err_t test_touch_check_ch_touched(uint32_t test_ch_num, uint32_t exce while (1) { if (pdTRUE == xQueueReceive(que_touch, &evt, exceed_time_ms / portTICK_PERIOD_MS)) { if (evt.intr_mask & TOUCH_PAD_INTR_MASK_ACTIVE) { - printf("0x%x, ", evt.pad_status); + printf("0x%"PRIx32", ", evt.pad_status); if (test_ch_num == __builtin_popcount(evt.pad_status)) { ret = ESP_OK; break; @@ -552,7 +553,7 @@ static esp_err_t test_touch_check_ch_touched(uint32_t test_ch_num, uint32_t exce } else if (evt.intr_mask & (TOUCH_PAD_INTR_MASK_DONE | TOUCH_PAD_INTR_MASK_SCAN_DONE)) { continue; } else { // If the interrupt type error, test error. - ESP_LOGI(TAG, "Touch[%d] intr error, status %d, evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); + ESP_LOGI(TAG, "Touch[%"PRIu32"] intr error, status %"PRIx32", evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); break; } } else { @@ -575,7 +576,7 @@ static esp_err_t test_touch_check_ch_released(uint32_t test_ch_num, uint32_t exc while (1) { if (pdTRUE == xQueueReceive(que_touch, &evt, exceed_time_ms / portTICK_PERIOD_MS)) { if (evt.intr_mask & TOUCH_PAD_INTR_MASK_INACTIVE) { - printf("0x%x, ", evt.pad_status); + printf("0x%"PRIx32", ", evt.pad_status); if ((TEST_TOUCH_CHANNEL - test_ch_num) == __builtin_popcount(evt.pad_status)) { ret = ESP_OK; break; @@ -583,7 +584,7 @@ static esp_err_t test_touch_check_ch_released(uint32_t test_ch_num, uint32_t exc } else if (evt.intr_mask & (TOUCH_PAD_INTR_MASK_DONE | TOUCH_PAD_INTR_MASK_SCAN_DONE)) { continue; } else { // If the interrupt type error, test error. - ESP_LOGI(TAG, "Touch[%d] intr error, status %d, evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); + ESP_LOGI(TAG, "Touch[%"PRIu32"] intr error, status %"PRIx32", evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); break; } } else { @@ -607,7 +608,7 @@ static esp_err_t test_touch_check_ch_touched_with_proximity(uint32_t test_ch_num while (1) { if (pdTRUE == xQueueReceive(que_touch, &evt, exceed_time_ms / portTICK_PERIOD_MS)) { if (evt.intr_mask & TOUCH_PAD_INTR_MASK_ACTIVE) { - printf("0x%x, ", evt.pad_status); + printf("0x%"PRIx32", ", evt.pad_status); if (test_ch_num == __builtin_popcount(evt.pad_status)) { ret = ESP_OK; break; @@ -618,14 +619,14 @@ static esp_err_t test_touch_check_ch_touched_with_proximity(uint32_t test_ch_num if (BIT(i) & ch_mask) { if (evt.pad_num == i) { if (count == evt.slp_proxi_cnt) { - esp_rom_printf("priximity base(%d) cnt(%d)\n", evt.slp_proxi_base, evt.slp_proxi_cnt); + esp_rom_printf("priximity base(%"PRIu32") cnt(%"PRIu32")\n", evt.slp_proxi_base, evt.slp_proxi_cnt); } } } } continue; } else { // If the interrupt type error, test error. - ESP_LOGI(TAG, "Touch[%d] intr error, status %d, evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); + ESP_LOGI(TAG, "Touch[%"PRIu32"] intr error, status %"PRIx32", evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); continue;; } } else { @@ -649,7 +650,7 @@ static esp_err_t test_touch_check_ch_released_with_proximity(uint32_t test_ch_nu while (1) { if (pdTRUE == xQueueReceive(que_touch, &evt, exceed_time_ms / portTICK_PERIOD_MS)) { if (evt.intr_mask & TOUCH_PAD_INTR_MASK_INACTIVE) { - printf("0x%x, ", evt.pad_status); + printf("0x%"PRIx32", ", evt.pad_status); if ((TEST_TOUCH_CHANNEL - test_ch_num) == __builtin_popcount(evt.pad_status)) { ret = ESP_OK; break; @@ -660,14 +661,14 @@ static esp_err_t test_touch_check_ch_released_with_proximity(uint32_t test_ch_nu if (BIT(i) & ch_mask) { if (evt.pad_num == i) { if (count == evt.slp_proxi_cnt) { - esp_rom_printf("priximity base(%d) cnt(%d)\n", evt.slp_proxi_base, evt.slp_proxi_cnt); + esp_rom_printf("priximity base(%"PRIu32") cnt(%"PRIu32")\n", evt.slp_proxi_base, evt.slp_proxi_cnt); } } } } continue; } else { // If the interrupt type error, test error. - ESP_LOGI(TAG, "Touch[%d] intr error, status %d, evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); + ESP_LOGI(TAG, "Touch[%"PRIu32"] intr error, status %"PRIx32", evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); continue;; } } else { @@ -705,7 +706,7 @@ static esp_err_t test_touch_check_ch_intr_scan_done(void) } else if (evt.intr_mask & (TOUCH_PAD_INTR_MASK_DONE | TOUCH_PAD_INTR_MASK_SCAN_DONE)) { continue; } else { // If the interrupt type error, test error. - ESP_LOGI(TAG, "Touch[%d] intr error, status %d, evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); + ESP_LOGI(TAG, "Touch[%"PRIu32"] intr error, status %"PRIx32", evt_msk0x%x", evt.pad_num, evt.pad_status, evt.intr_mask); break; } } else { @@ -737,7 +738,7 @@ static esp_err_t test_touch_check_ch_intr_timeout(touch_pad_t pad_num) touch_pad_timeout_resume(); break; } else { - esp_rom_printf("-timeout %x T[%d] status %d, evt_msk %x -\n", + esp_rom_printf("-timeout %x T[%"PRIu32"] status %"PRIx32", evt_msk %x -\n", s_touch_timeout_mask, evt.pad_num, evt.pad_status, evt.intr_mask); touch_pad_timeout_resume(); } @@ -832,7 +833,7 @@ esp_err_t test_touch_interrupt(void) TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_filter_read_smooth(touch_list[i], &smooth) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, smooth %d, thresh %d", + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", smooth %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, smooth, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } @@ -900,7 +901,7 @@ esp_err_t test_touch_scan_done_interrupt(void) TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_filter_read_smooth(touch_list[i], &smooth) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, smooth %d, thresh %d", \ + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", smooth %"PRIu32", thresh %"PRIu32"", \ touch_list[i], touch_value, smooth, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } @@ -965,7 +966,7 @@ esp_err_t test_touch_timeout_interrupt(void) TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_filter_read_smooth(touch_list[i], &smooth) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, smooth %d, thresh %d", + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", smooth %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, smooth, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } /* Set timeout parameter */ @@ -1011,7 +1012,7 @@ TEST_CASE("Touch Sensor interrupt test (active, inactive, scan_done, timeout)", static void test_touch_measure_step(uint32_t step) { /* Fake the process of debounce. */ - // printf("measure cnt %d: [ ", step); + // printf("measure cnt %"PRIu32": [ ", step); for (int i = 0; i < step; i++) { for (int j = 0; j < TEST_TOUCH_CHANNEL; j++) { TEST_ESP_OK( touch_pad_sw_start() ); @@ -1067,7 +1068,7 @@ esp_err_t test_touch_filter_parameter_debounce(int deb_cnt) for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, thresh %d", \ + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", thresh %"PRIu32"", \ touch_list[i], touch_value, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } @@ -1132,7 +1133,7 @@ esp_err_t test_touch_filter_parameter_reset(int reset_cnt) for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, thresh %d", \ + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", thresh %"PRIu32"", \ touch_list[i], touch_value, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } @@ -1267,7 +1268,7 @@ esp_err_t test_touch_filter_parameter_jitter(int jitter_step) TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); //set interrupt threshold. TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, thresh %d", \ + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", thresh %"PRIu32"", \ touch_list[i], touch_value, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } @@ -1400,7 +1401,7 @@ TEST_CASE("Touch Sensor denoise test (cap, level)", "[touch]") } else { /* If the value of denoise is approximately 0, The difference between touch reading is very small. Should skip value test. */ - ESP_LOGI(TAG, "denoise value is %d", denoise_val[0]); + ESP_LOGI(TAG, "denoise value is %"PRIu32"", denoise_val[0]); } ESP_LOGI(TAG, "*********** touch filter denoise cap level test ********************"); @@ -1416,7 +1417,7 @@ TEST_CASE("Touch Sensor denoise test (cap, level)", "[touch]") printf("denoise read: "); for (int i = 0; i < TOUCH_PAD_DENOISE_CAP_MAX - 1; i++) { TEST_ASSERT_GREATER_OR_EQUAL(denoise_val[i], denoise_val[i + 1]); - printf("%d ", denoise_val[i]); + printf("%"PRIu32" ", denoise_val[i]); } printf("\n"); } @@ -1557,11 +1558,11 @@ esp_err_t test_touch_proximity(int meas_num) /* The threshold of proximity pad is the sum of touch reading `meas_num` times */ TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], meas_num * touch_value * (1 + TOUCH_INTR_THRESHOLD)) ); - ESP_LOGI(TAG, "proximity pad [%d] base %d, thresh %d", touch_list[i], touch_value, + ESP_LOGI(TAG, "proximity pad [%d] base %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, (uint32_t)(meas_num * touch_value * (1 + TOUCH_INTR_THRESHOLD))); } else { TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "touch pad [%d] base %d, thresh %d", \ + ESP_LOGI(TAG, "touch pad [%d] base %"PRIu32", thresh %"PRIu32"", \ touch_list[i], touch_value, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } } @@ -1653,7 +1654,7 @@ esp_err_t test_touch_sleep_reading_stable(touch_pad_t sleep_pad) TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_filter_read_smooth(touch_list[i], &smooth) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, smooth %d, thresh %d", + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", smooth %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, smooth, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } @@ -1754,18 +1755,18 @@ uint32_t test_touch_sleep_pad_proximity(touch_pad_t sleep_pad, bool is_proximity if (touch_list[i] == sleep_pad) { touch_pad_sleep_channel_read_smooth(sleep_pad, &touch_value); touch_pad_sleep_set_threshold(sleep_pad, meas_num * touch_value * (1 + TOUCH_INTR_THRESHOLD)); - ESP_LOGI(TAG, "Sleep pad [%d] base %d, thresh %d", touch_list[i], touch_value, + ESP_LOGI(TAG, "Sleep pad [%d] base %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, (uint32_t)(meas_num * touch_value * (1 + TOUCH_INTR_THRESHOLD))); } else if (touch_list[i] == sleep_pad) { touch_pad_sleep_channel_read_smooth(sleep_pad, &touch_value); /* The threshold of proximity pad is the sum of touch reading `meas_num` times */ touch_pad_sleep_set_threshold(sleep_pad, meas_num * touch_value * (1 + TOUCH_INTR_THRESHOLD)); - ESP_LOGI(TAG, "proximity pad [%d] base %d, thresh %d", touch_list[i], touch_value, + ESP_LOGI(TAG, "proximity pad [%d] base %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, (uint32_t)(meas_num * touch_value * (1 + TOUCH_INTR_THRESHOLD))); } else { TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "touch pad [%d] base %d, thresh %d", \ + ESP_LOGI(TAG, "touch pad [%d] base %"PRIu32", thresh %"PRIu32"", \ touch_list[i], touch_value, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } } @@ -1787,7 +1788,7 @@ uint32_t test_touch_sleep_pad_proximity(touch_pad_t sleep_pad, bool is_proximity TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_filter_read_smooth(touch_list[i], &smooth) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, smooth %d, thresh %d", + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", smooth %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, smooth, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } /* Sleep channel setting */ @@ -1808,7 +1809,7 @@ uint32_t test_touch_sleep_pad_proximity(touch_pad_t sleep_pad, bool is_proximity TEST_ESP_OK( touch_pad_proximity_get_data(sleep_pad, &measure_out) ); TEST_ESP_OK( touch_pad_sleep_channel_read_proximity_cnt(sleep_pad, &proximity_cnt) ); TEST_ESP_OK( touch_pad_sleep_get_threshold(sleep_pad, &touch_thres) ); - printf("touch slp smooth %d, base %d, proxi %d cnt %d thres%d status 0x%x\n", + printf("touch slp smooth %"PRIu32", base %"PRIu32", proxi %"PRIu32" cnt %"PRIu32" thres%"PRIu32" status 0x%"PRIx32"\n", smooth, touch_value, measure_out, proximity_cnt, touch_thres, touch_pad_get_status()); } @@ -1820,7 +1821,7 @@ uint32_t test_touch_sleep_pad_proximity(touch_pad_t sleep_pad, bool is_proximity TEST_ESP_OK( touch_pad_sleep_channel_read_benchmark(sleep_pad, &touch_value) ); TEST_ESP_OK( touch_pad_proximity_get_data(sleep_pad, &measure_out) ); TEST_ESP_OK( touch_pad_sleep_channel_read_proximity_cnt(sleep_pad, &proximity_cnt) ); - printf("touch slp smooth %d, base %d, proxi %d cnt %d status 0x%x\n", + printf("touch slp smooth %"PRIu32", base %"PRIu32", proxi %"PRIu32" cnt %"PRIu32" status 0x%"PRIx32"\n", smooth, touch_value, measure_out, proximity_cnt, touch_pad_get_status()); } } @@ -1899,7 +1900,7 @@ esp_err_t test_touch_sleep_pad_interrupt_wakeup_deep_sleep(touch_pad_t sleep_pad TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_filter_read_smooth(touch_list[i], &smooth) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_INTR_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, smooth %d, thresh %d", + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", smooth %"PRIu32", thresh %"PRIu32"", touch_list[i], touch_value, smooth, (uint32_t)(touch_value * TOUCH_INTR_THRESHOLD)); } @@ -1915,7 +1916,7 @@ esp_err_t test_touch_sleep_pad_interrupt_wakeup_deep_sleep(touch_pad_t sleep_pad TEST_ESP_OK( touch_pad_sleep_channel_read_smooth(sleep_pad, &smooth) ); TEST_ESP_OK( touch_pad_sleep_channel_read_data(sleep_pad, &raw) ); TEST_ESP_OK( touch_pad_sleep_channel_read_benchmark(sleep_pad, &touch_value) ); - printf("touch slp raw %d, smooth %d, base %d, status 0x%x\n", raw, smooth, touch_value, touch_pad_get_status()); + printf("touch slp raw %"PRIu32", smooth %"PRIu32", base %"PRIu32", status 0x%"PRIx32"\n", raw, smooth, touch_value, touch_pad_get_status()); test_touch_release_all(); TEST_ESP_OK( test_touch_check_ch_released(TEST_TOUCH_CHANNEL, TOUCH_EXCEED_TIME_MS) ); @@ -1923,7 +1924,7 @@ esp_err_t test_touch_sleep_pad_interrupt_wakeup_deep_sleep(touch_pad_t sleep_pad TEST_ESP_OK( touch_pad_sleep_channel_read_smooth(sleep_pad, &smooth) ); TEST_ESP_OK( touch_pad_sleep_channel_read_data(sleep_pad, &raw) ); TEST_ESP_OK( touch_pad_sleep_channel_read_benchmark(sleep_pad, &touch_value) ); - printf("touch slp raw %d, smooth %d, base %d, status 0x%x\n", raw, smooth, touch_value, touch_pad_get_status()); + printf("touch slp raw %"PRIu32", smooth %"PRIu32", base %"PRIu32", status 0x%"PRIx32"\n", raw, smooth, touch_value, touch_pad_get_status()); return ESP_OK; } @@ -1944,18 +1945,18 @@ static void test_deep_sleep_init(void) uint64_t wakeup_pin_mask = esp_sleep_get_ext1_wakeup_status(); if (wakeup_pin_mask != 0) { int pin = __builtin_ffsll(wakeup_pin_mask) - 1; - printf("Wake up from GPIO %d\n", pin); + printf("Wake up from GPIO %"PRIu32"\n", pin); } else { printf("Wake up from GPIO\n"); } break; } case ESP_SLEEP_WAKEUP_TIMER: { - printf("Wake up from timer. Time spent in deep sleep: %dms\n", sleep_time_ms); + printf("Wake up from timer. Time spent in deep sleep: %"PRIu32"ms\n", sleep_time_ms); break; } case ESP_SLEEP_WAKEUP_TOUCHPAD: { - printf("Wake up from touch on pad %d\n", esp_sleep_get_touchpad_wakeup_status()); + printf("Wake up from touch on pad %"PRIu32"\n", esp_sleep_get_touchpad_wakeup_status()); break; } case ESP_SLEEP_WAKEUP_UNDEFINED: @@ -2059,7 +2060,7 @@ void test_touch_slope_debug(int pad_num) TEST_ESP_OK( touch_pad_read_benchmark(touch_list[i], &touch_value) ); TEST_ESP_OK( touch_pad_filter_read_smooth(touch_list[i], &smooth) ); TEST_ESP_OK( touch_pad_set_thresh(touch_list[i], touch_value * TOUCH_THRESHOLD) ); - ESP_LOGI(TAG, "test init: touch pad [%d] base %d, smooth %d, thresh %d", \ + ESP_LOGI(TAG, "test init: touch pad [%d] base %"PRIu32", smooth %"PRIu32", thresh %"PRIu32"", \ touch_list[i], touch_value, smooth, (uint32_t)(touch_value * TOUCH_THRESHOLD)); } diff --git a/components/touch_element/CMakeLists.txt b/components/touch_element/CMakeLists.txt index b8b90e7efd..21a54d5aad 100644 --- a/components/touch_element/CMakeLists.txt +++ b/components/touch_element/CMakeLists.txt @@ -8,5 +8,4 @@ if(IDF_TARGET IN_LIST TOUCH_ELEMENT_COMPATIBLE_TARGETS) INCLUDE_DIRS include REQUIRES driver PRIV_REQUIRES esp_timer) - target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") endif() diff --git a/components/touch_element/touch_button.c b/components/touch_element/touch_button.c index 2ecceed198..fea5d8198a 100644 --- a/components/touch_element/touch_button.c +++ b/components/touch_element/touch_button.c @@ -12,6 +12,7 @@ #include #include +#include #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" #include "esp_log.h" diff --git a/components/touch_element/touch_element.c b/components/touch_element/touch_element.c index 6622cc84cd..ec465c95b3 100644 --- a/components/touch_element/touch_element.c +++ b/components/touch_element/touch_element.c @@ -5,6 +5,7 @@ */ #include +#include #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" #include "freertos/queue.h" @@ -402,7 +403,7 @@ static void te_proc_timer_cb(void *arg) ESP_LOGD(TE_DEBUG_TAG, "Set waterproof shield level"); } } - ESP_LOGD(TE_DEBUG_TAG, "read denoise channel %d", s_te_obj->denoise_channel_raw); + ESP_LOGD(TE_DEBUG_TAG, "read denoise channel %"PRIu32, s_te_obj->denoise_channel_raw); } else if (te_intr_msg.intr_type == TE_INTR_TIMEOUT) { //Timeout processing touch_pad_timeout_resume(); } @@ -516,7 +517,7 @@ esp_err_t te_dev_set_threshold(te_dev_t *device) { uint32_t smo_val = te_read_smooth_signal(device->channel); esp_err_t ret = touch_pad_set_thresh(device->channel, device->sens * smo_val); - ESP_LOGD(TE_DEBUG_TAG, "channel: %d, smo_val: %d", device->channel, smo_val); + ESP_LOGD(TE_DEBUG_TAG, "channel: %"PRIu8", smo_val: %"PRIu32, device->channel, smo_val); return ret; } @@ -812,14 +813,14 @@ static bool waterproof_channel_check(touch_pad_t channel_num) te_waterproof_handle_t waterproof_handle = s_te_obj->waterproof_handle; if (waterproof_shield_check_state()) { if (channel_num == waterproof_handle->shield_channel) { - ESP_LOGE(TE_TAG, "TOUCH_PAD_NUM%d has been used for waterproof shield channel," + ESP_LOGE(TE_TAG, "TOUCH_PAD_NUM%"PRIu8" has been used for waterproof shield channel," " please change the touch sensor channel or disable waterproof", channel_num); return true; } } if (waterproof_guard_check_state()) { if (channel_num == waterproof_handle->guard_device->channel) { - ESP_LOGE(TE_TAG, "TOUCH_PAD_NUM%d has been used for waterproof guard channel," + ESP_LOGE(TE_TAG, "TOUCH_PAD_NUM%"PRIu8" has been used for waterproof guard channel," " please change the touch sensor channel or disable waterproof", channel_num); return true; } diff --git a/components/touch_element/touch_matrix.c b/components/touch_element/touch_matrix.c index 89e24d126d..08f380f82d 100644 --- a/components/touch_element/touch_matrix.c +++ b/components/touch_element/touch_matrix.c @@ -12,6 +12,7 @@ #include #include +#include #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" #include "esp_log.h" @@ -575,7 +576,7 @@ static void matrix_proc_state(te_matrix_handle_t matrix_handle) if (matrix_handle->current_state == TE_STATE_PRESS) { if (matrix_handle->last_state == TE_STATE_IDLE) { //IDLE ---> Press = On_Press matrix_update_position(matrix_handle, press_pos); - ESP_LOGD(TE_DEBUG_TAG, "matrix press (%d, %d)", matrix_handle->position.x_axis, matrix_handle->position.y_axis); + ESP_LOGD(TE_DEBUG_TAG, "matrix press (%"PRIu8", %"PRIu8")", matrix_handle->position.x_axis, matrix_handle->position.y_axis); if (event_mask & TOUCH_ELEM_EVENT_ON_PRESS) { matrix_handle->event = TOUCH_MATRIX_EVT_ON_PRESS; matrix_dispatch(matrix_handle, dispatch_method); @@ -583,7 +584,7 @@ static void matrix_proc_state(te_matrix_handle_t matrix_handle) } else if (matrix_handle->last_state == TE_STATE_PRESS) { //Press ---> Press = On_LongPress if (event_mask & TOUCH_ELEM_EVENT_ON_LONGPRESS) { if (++matrix_handle->trigger_cnt >= matrix_handle->trigger_thr) { - ESP_LOGD(TE_DEBUG_TAG, "matrix longpress (%d, %d)", matrix_handle->position.x_axis, matrix_handle->position.y_axis); + ESP_LOGD(TE_DEBUG_TAG, "matrix longpress (%"PRIu8", %"PRIu8")", matrix_handle->position.x_axis, matrix_handle->position.y_axis); matrix_handle->event = TOUCH_MATRIX_EVT_ON_LONGPRESS; matrix_dispatch(matrix_handle, dispatch_method); matrix_handle->trigger_cnt = 0; @@ -592,7 +593,7 @@ static void matrix_proc_state(te_matrix_handle_t matrix_handle) } } else if (matrix_handle->current_state == TE_STATE_RELEASE) { if (matrix_handle->last_state == TE_STATE_PRESS) { //Press ---> Release = On_Release - ESP_LOGD(TE_DEBUG_TAG, "matrix release (%d, %d)", matrix_handle->position.x_axis, matrix_handle->position.y_axis); + ESP_LOGD(TE_DEBUG_TAG, "matrix release (%"PRIu8", %"PRIu8")", matrix_handle->position.x_axis, matrix_handle->position.y_axis); if (event_mask & TOUCH_ELEM_EVENT_ON_RELEASE) { matrix_handle->event = TOUCH_MATRIX_EVT_ON_RELEASE; matrix_dispatch(matrix_handle, dispatch_method);