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

Merge branch 'bugfix/o3_fails' into 'master'

Browse Source 
Fix compilation errors when -O3 is used

See merge request idf/esp-idf!2396
This commit is contained in:
Jiang Jiang Jian
2018-05-17 16:48:13 +08:00
parent 59db3cb1c2 ca08397b6b
commit 993b8b7bf6
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/driver/rtc_module.c
View File

@@ -508,9 +508,10 @@ static void touch_pad_filter_cb(void *arg)
if (s_touch_pad_filter == NULL) {
return;
}
uint16_t val;
uint16_t val = 0;
for (int i = 0; i < TOUCH_PAD_MAX; i++) {
touch_pad_read(i, &val);
(void) touch_pad_read(i, &val);
// if touch_pad_read fails then the previous value of val is used
s_touch_pad_filter->filtered_val[i] = s_touch_pad_filter->filtered_val[i] == 0 ? (val << TOUCH_PAD_SHIFT_DEFAULT) : s_touch_pad_filter->filtered_val[i];
s_touch_pad_filter->filtered_val[i] = _touch_filter_iir((val << TOUCH_PAD_SHIFT_DEFAULT),
s_touch_pad_filter->filtered_val[i], TOUCH_PAD_FILTER_FACTOR_DEFAULT);