Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_touch_curr_scan_workaround_on_p4_v5.4' into 'release/v5.4'

Browse Source 
fix(esp32p4): P4 touch channel 14 failure fix (v5.4)

See merge request espressif/esp-idf!42923
This commit is contained in:
morris
2025-10-30 13:04:58 +08:00
parent 2919462028 3e043a065e
commit edb33e78a3
3 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/hal/esp32p4/include/hal/touch_sensor_ll.h
+1 -5
View File
@@ -482,11 +482,7 @@ static inline void touch_ll_set_idle_channel_connect(touch_pad_conn_type_t type)
__attribute__((always_inline))
static inline uint32_t touch_ll_get_current_meas_channel(void)
{
uint32_t curr_chan = LP_TOUCH.chn_status.scan_curr;
HAL_ASSERT(curr_chan < 14);
// Workaround: the curr channel read 0 when the actual channel is 14
curr_chan = curr_chan == 0 ? 14 : curr_chan;
return curr_chan;
return LP_TOUCH.chn_status.scan_curr;
}
/**