fix(touch): fix unexpected touch start on RTC peripheral init

boarchuz · L-KAYA · commit 2ec93b33948a · 2025-01-23T11:55:40.000+08:00
Merges #7707
diff --git a/components/hal/esp32/include/hal/touch_sensor_ll.h b/components/hal/esp32/include/hal/touch_sensor_ll.h
@@ -681,8 +681,8 @@ static inline void touch_ll_stop_fsm(void)
  */
 static inline void touch_ll_start_sw_meas(void)
 {
-    SENS.sar_touch_ctrl2.touch_start_en = 0;
     SENS.sar_touch_ctrl2.touch_start_en = 1;
+    SENS.sar_touch_ctrl2.touch_start_en = 0;
 }
 
 /**
diff --git a/components/hal/esp32s2/include/hal/touch_sensor_ll.h b/components/hal/esp32s2/include/hal/touch_sensor_ll.h
@@ -1061,8 +1061,8 @@ static inline bool touch_ll_get_fsm_state(void)
  */
 static inline void touch_ll_start_sw_meas(void)
 {
-    RTCCNTL.touch_ctrl2.touch_start_en = 0;
     RTCCNTL.touch_ctrl2.touch_start_en = 1;
+    RTCCNTL.touch_ctrl2.touch_start_en = 0;
 }
 
 /**
diff --git a/components/hal/esp32s3/include/hal/touch_sensor_ll.h b/components/hal/esp32s3/include/hal/touch_sensor_ll.h
@@ -1086,8 +1086,8 @@ static inline bool touch_ll_get_fsm_state(void)
  */
 static inline void touch_ll_start_sw_meas(void)
 {
-    RTCCNTL.touch_ctrl2.touch_start_en = 0;
     RTCCNTL.touch_ctrl2.touch_start_en = 1;
+    RTCCNTL.touch_ctrl2.touch_start_en = 0;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -681,8 +681,8 @@ static inline void touch_ll_stop_fsm(void)`
`681`	`681`	`*/`
`682`	`682`	`static inline void touch_ll_start_sw_meas(void)`
`683`	`683`	`{`
`684`		`- SENS.sar_touch_ctrl2.touch_start_en = 0;`
`685`	`684`	`SENS.sar_touch_ctrl2.touch_start_en = 1;`
	`685`	`+ SENS.sar_touch_ctrl2.touch_start_en = 0;`
`686`	`686`	`}`
`687`	`687`
`688`	`688`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1061,8 +1061,8 @@ static inline bool touch_ll_get_fsm_state(void)`
`1061`	`1061`	`*/`
`1062`	`1062`	`static inline void touch_ll_start_sw_meas(void)`
`1063`	`1063`	`{`
`1064`		`- RTCCNTL.touch_ctrl2.touch_start_en = 0;`
`1065`	`1064`	`RTCCNTL.touch_ctrl2.touch_start_en = 1;`
	`1065`	`+ RTCCNTL.touch_ctrl2.touch_start_en = 0;`
`1066`	`1066`	`}`
`1067`	`1067`
`1068`	`1068`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1086,8 +1086,8 @@ static inline bool touch_ll_get_fsm_state(void)`
`1086`	`1086`	`*/`
`1087`	`1087`	`static inline void touch_ll_start_sw_meas(void)`
`1088`	`1088`	`{`
`1089`		`- RTCCNTL.touch_ctrl2.touch_start_en = 0;`
`1090`	`1089`	`RTCCNTL.touch_ctrl2.touch_start_en = 1;`
	`1090`	`+ RTCCNTL.touch_ctrl2.touch_start_en = 0;`
`1091`	`1091`	`}`
`1092`	`1092`
`1093`	`1093`	`/**`