Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/fix_ci_about_touch_sensor_denoise_ut' into 'master'

Browse source 
driver(touch): fix touch sensor denoise unit test case

Closes IDF-1834 and TIDF-13311

See merge request espressif/esp-idf!9150
This commit is contained in:
Michael (XIAO Xufeng) 2020-07-02 11:22:42 +08:00
commit 370a1fa6df
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/driver/test/touch_sensor_test/test_esp32s2.c
View file

@ -1408,13 +1408,19 @@ TEST_CASE("Touch Sensor denoise test (cap, level)", "[touch]")
uint32_t denoise_val[TOUCH_PAD_DENOISE_CAP_MAX];
ESP_LOGI(TAG, "*********** touch filter denoise level test ********************");
TEST_ESP_OK( test_touch_denoise(val_1, NULL, TOUCH_PAD_DENOISE_BIT4, TOUCH_PAD_DENOISE_CAP_L0) );
TEST_ESP_OK( test_touch_denoise(val_1, &denoise_val[0], TOUCH_PAD_DENOISE_BIT4, TOUCH_PAD_DENOISE_CAP_L0) );
TEST_ESP_OK( test_touch_denoise(val_2, NULL, TOUCH_PAD_DENOISE_BIT8, TOUCH_PAD_DENOISE_CAP_L0) );
TEST_ESP_OK( test_touch_denoise(val_3, NULL, TOUCH_PAD_DENOISE_BIT12, TOUCH_PAD_DENOISE_CAP_L0) );
for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) {
TEST_ASSERT_GREATER_OR_EQUAL(val_3[i], val_2[i]);
TEST_ASSERT_GREATER_OR_EQUAL(val_2[i], val_1[i]);
if ((denoise_val[0] & 0xFF) < (0xFF - 10) && (denoise_val[0] & 0xFF) > 10) {
for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) {
TEST_ASSERT_GREATER_OR_EQUAL(val_3[i], val_2[i]);
TEST_ASSERT_GREATER_OR_EQUAL(val_2[i], val_1[i]);
}
} else {
/* If the value of (denoise_val[0] & 0xFF) 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, "*********** touch filter denoise cap level test ********************");