Skip to content

Commit acedae1

Browse files
committed
Merge branch 'docs/fix-typo-touch-pad-esp32s2-esp32s3' into 'master'
docs:fix a typo in touch_sensor.h of esp32s2 and esp32s3 Closes DOC-4065 See merge request espressif/esp-idf!20956
2 parents 056d72e + 5406c80 commit acedae1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

components/driver/esp32s2/include/driver/touch_sensor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ esp_err_t touch_pad_get_meas_time(uint16_t *sleep_cycle, uint16_t *meas_times)
116116
__attribute__((deprecated("please use 'touch_pad_get_charge_discharge_times' and 'touch_pad_get_measurement_interval' instead")));
117117

118118
/**
119-
* @brief Set connection type of touch channel in idle status.
119+
* @brief Set the connection type of touch channels in idle status.
120120
* When a channel is in measurement mode, other initialized channels are in idle mode.
121121
* The touch channel is generally adjacent to the trace, so the connection state of the idle channel
122122
* affects the stability and sensitivity of the test channel.
@@ -129,7 +129,7 @@ __attribute__((deprecated("please use 'touch_pad_get_charge_discharge_times' and
129129
esp_err_t touch_pad_set_idle_channel_connect(touch_pad_conn_type_t type);
130130

131131
/**
132-
* @brief Set connection type of touch channel in idle status.
132+
* @brief Get the connection type of touch channels in idle status.
133133
* When a channel is in measurement mode, other initialized channels are in idle mode.
134134
* The touch channel is generally adjacent to the trace, so the connection state of the idle channel
135135
* affects the stability and sensitivity of the test channel.

components/driver/esp32s3/include/driver/touch_sensor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ esp_err_t touch_pad_get_meas_time(uint16_t *sleep_cycle, uint16_t *meas_times)
116116
__attribute__((deprecated("please use 'touch_pad_get_charge_discharge_times' and 'touch_pad_get_measurement_interval' instead")));
117117

118118
/**
119-
* @brief Set connection type of touch channel in idle status.
119+
* @brief Set the connection type of touch channels in idle status.
120120
* When a channel is in measurement mode, other initialized channels are in idle mode.
121121
* The touch channel is generally adjacent to the trace, so the connection state of the idle channel
122122
* affects the stability and sensitivity of the test channel.
@@ -129,7 +129,7 @@ __attribute__((deprecated("please use 'touch_pad_get_charge_discharge_times' and
129129
esp_err_t touch_pad_set_idle_channel_connect(touch_pad_conn_type_t type);
130130

131131
/**
132-
* @brief Set connection type of touch channel in idle status.
132+
* @brief Get the connection type of touch channels in idle status.
133133
* When a channel is in measurement mode, other initialized channels are in idle mode.
134134
* The touch channel is generally adjacent to the trace, so the connection state of the idle channel
135135
* affects the stability and sensitivity of the test channel.

0 commit comments

Comments
 (0)