fix(button): fix not triggering longpress start with polling intervals over 20ms

Author: lijunru-hub

components/button/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+## v3.4.1 - 2024-12-6
+
+### Fix:
+
+* Fix the issue where `BUTTON_LONG_PRESS_START` is not triggered when the polling interval exceeds 20ms.
+* Remove the `BUTTON_LONG_PRESS_TOLERANCE_MS` configuration option.
+
 ## v3.4.0 - 2024-10-22
 
 ### Enhancements:

components/button/Kconfig

@@ -24,10 +24,6 @@ menu "IoT Button"
         range 500 5000
         default 1500
 
-    config BUTTON_LONG_PRESS_TOLERANCE_MS
-        int "BUTTON LONG PRESS TOLERANCE TIME (MS)"
-        default 20
-
     config BUTTON_SERIAL_TIME_MS
         int "BUTTON SERIAL TIME (MS)"
         range 2 1000

components/button/idf_component.yml

@@ -1,4 +1,4 @@
-version: "3.4.0"
+version: "3.4.1"
 description: GPIO and ADC button driver
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/button
 repository: https://github.com/espressif/esp-iot-solution.git

components/button/iot_button.c

@@ -94,7 +94,7 @@ static button_power_save_config_t power_save_usr_cfg = {0};
 #define SHORT_TICKS       (CONFIG_BUTTON_SHORT_PRESS_TIME_MS /TICKS_INTERVAL)
 #define LONG_TICKS        (CONFIG_BUTTON_LONG_PRESS_TIME_MS /TICKS_INTERVAL)
 #define SERIAL_TICKS      (CONFIG_BUTTON_SERIAL_TIME_MS /TICKS_INTERVAL)
-#define TOLERANCE         CONFIG_BUTTON_LONG_PRESS_TOLERANCE_MS
+#define TOLERANCE         (CONFIG_BUTTON_PERIOD_TIME_MS*4)
 
 #define CALL_EVENT_CB(ev)                                                   \
     if (btn->cb_info[ev]) {                                                 \
@@ -148,7 +148,7 @@ static void button_handler(button_dev_t *btn)
             btn->ticks = 0;
             btn->state = 2;
 
-        } else if (btn->ticks > btn->long_press_ticks) {
+        } else if (btn->ticks >= btn->long_press_ticks) {
             btn->event = (uint8_t)BUTTON_LONG_PRESS_START;
             btn->state = 4;
             /** Calling callbacks for BUTTON_LONG_PRESS_START */

components/button/test_apps/main/button_test.c

@@ -595,7 +595,7 @@ TEST_CASE("gpio button auto-test", "[button][iot][auto]")
     vTaskDelay(pdMS_TO_TICKS(100));
 }
 
-#define TOLERANCE CONFIG_BUTTON_LONG_PRESS_TOLERANCE_MS
+#define TOLERANCE (CONFIG_BUTTON_PERIOD_TIME_MS * 4)
 
 uint16_t long_press_time[5] = {2000, 2500, 3000, 3500, 4000};
 static SemaphoreHandle_t long_press_check = NULL;