alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 04:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/add_alias_name_for_ets_common_api' into 'master'

Browse Source 
esp_rom: extract common ets apis into esp_rom_sys.h

See merge request espressif/esp-idf!9701
This commit is contained in:
Ivan Grokhotkov
2020-07-28 15:04:55 +08:00
parent a6c1834327 2917651478
commit 16c73edc67
140 changed files with 490 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/driver/test/touch_sensor_test/test_esp32s2.c
View File

@@ -36,6 +36,7 @@
#include "soc/rtc_io_struct.h"
#include "soc/apb_ctrl_reg.h"
#include "driver/rtc_io.h"
#include "esp_rom_sys.h"
#if !DISABLED_FOR_TARGETS(ESP8266, ESP32) // This testcase for ESP32S2
@@ -623,7 +624,7 @@ 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) {
ets_printf("priximity base(%d) cnt(%d)\n", evt.slp_proxi_base, evt.slp_proxi_cnt);
esp_rom_printf("priximity base(%d) cnt(%d)\n", evt.slp_proxi_base, evt.slp_proxi_cnt);
}
}
}
@@ -665,7 +666,7 @@ 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) {
ets_printf("priximity base(%d) cnt(%d)\n", evt.slp_proxi_base, evt.slp_proxi_cnt);
esp_rom_printf("priximity base(%d) cnt(%d)\n", evt.slp_proxi_base, evt.slp_proxi_cnt);
}
}
}
@@ -742,7 +743,7 @@ static esp_err_t test_touch_check_ch_intr_timeout(touch_pad_t pad_num)
touch_pad_timeout_resume();
break;
} else {
ets_printf("-timeout %x T[%d] status %d, evt_msk %x -\n",
esp_rom_printf("-timeout %x T[%d] status %d, evt_msk %x -\n",
s_touch_timeout_mask, evt.pad_num, evt.pad_status, evt.intr_mask);
touch_pad_timeout_resume();
}
@@ -768,7 +769,7 @@ static void test_touch_intr_cb(void *arg)
evt.pad_num = touch_pad_get_current_meas_channel();
if (!evt.intr_mask) {
ets_printf(".");
esp_rom_printf(".");
return;
}
if (evt.intr_mask & TOUCH_PAD_INTR_MASK_SCAN_DONE) {
@@ -779,11 +780,10 @@ static void test_touch_intr_cb(void *arg)
touch_pad_sleep_channel_read_proximity_cnt(slp_config.touch_num, &cnt);
evt.slp_proxi_cnt = cnt;
evt.slp_proxi_base = touch_value;
// ets_printf("[intr] base(%d) cnt(%d)\n", touch_value, cnt);
}
if (evt.intr_mask & TOUCH_PAD_INTR_MASK_TIMEOUT) {
s_touch_timeout_mask |= (BIT(evt.pad_num));
ets_printf("-%dtout-", SENS.sar_touch_status0.touch_scan_curr);
esp_rom_printf("-%dtout-", SENS.sar_touch_status0.touch_scan_curr);
}
xQueueSendFromISR(que_touch, &evt, &task_awoken);