idf components: update button, cmake_utilities, lcd_touch and tiny_usb

Lawrence Nahum · Jamie C. Driver · commit 5dba69c954cc · 2025-03-19T16:37:09.000Z
Small tweaks to update touchscreen devices, then re-enable their builds
and reinstate relevant ci builds which had been temporarily flagged as
'allowed to fail'.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -217,7 +217,6 @@ test_build_display_m5core2:
     - cp configs/sdkconfig_display_m5core2.defaults sdkconfig.defaults
   after_script:
     - mv build build_display_m5core2
-  allow_failure: true
 
 test_build_display_m5stickcplus:
   extends: .test_build_template
@@ -239,15 +238,13 @@ test_build_display_m5cores3:
     - cp configs/sdkconfig_display_m5cores3.defaults sdkconfig.defaults
   after_script:
     - mv build build_display_m5cores3
-  allow_failure: true
 
 test_build_display_twatchs3:
   extends: .test_build_template
   before_script:
     - cp configs/sdkconfig_display_ttgo_twatchs3.defaults sdkconfig.defaults
   after_script:
     - mv build build_display_twatchs3
-  allow_failure: true
 
 test_build_display_ttgo_tdisplay:
   extends: .test_build_template
diff --git a/configs/sdkconfig_display_m5blackgray.defaults b/configs/sdkconfig_display_m5blackgray.defaults
@@ -24,8 +24,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_m5core2.defaults b/configs/sdkconfig_display_m5core2.defaults
@@ -25,8 +25,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_m5cores3.defaults b/configs/sdkconfig_display_m5cores3.defaults
@@ -19,8 +19,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_m5fire.defaults b/configs/sdkconfig_display_m5fire.defaults
@@ -25,8 +25,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
diff --git a/configs/sdkconfig_display_m5stickcplus.defaults b/configs/sdkconfig_display_m5stickcplus.defaults
@@ -24,8 +24,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_m5stickcplus2.defaults b/configs/sdkconfig_display_m5stickcplus2.defaults
@@ -24,8 +24,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplay.defaults b/configs/sdkconfig_display_ttgo_tdisplay.defaults
@@ -24,8 +24,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3.defaults b/configs/sdkconfig_display_ttgo_tdisplays3.defaults
@@ -19,8 +19,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3_ci.defaults b/configs/sdkconfig_display_ttgo_tdisplays3_ci.defaults
@@ -19,8 +19,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3_gcov_ci.defaults b/configs/sdkconfig_display_ttgo_tdisplays3_gcov_ci.defaults
@@ -10,8 +10,8 @@ CONFIG_BOARD_TYPE_TTGO_TDISPLAYS3=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3procamera.defaults b/configs/sdkconfig_display_ttgo_tdisplays3procamera.defaults
@@ -19,8 +19,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_display_ttgo_twatchs3.defaults b/configs/sdkconfig_display_ttgo_twatchs3.defaults
@@ -18,8 +18,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_CXX_EXCEPTIONS=y
 CONFIG_COMPILER_CXX_RTTI=y
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
diff --git a/configs/sdkconfig_diycam_esp32-cam.defaults b/configs/sdkconfig_diycam_esp32-cam.defaults
@@ -26,8 +26,8 @@ CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
 CONFIG_BUTTON_B_ACTIVE_HIGH=y
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_CAMERA_D0=5
 CONFIG_CAMERA_D1=18
 CONFIG_CAMERA_D2=19
diff --git a/configs/sdkconfig_diycam_esp32-wrover-cam.defaults b/configs/sdkconfig_diycam_esp32-wrover-cam.defaults
@@ -25,8 +25,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_CAMERA_D0=4
 CONFIG_CAMERA_D1=5
 CONFIG_CAMERA_D2=18
diff --git a/configs/sdkconfig_diycam_tcameraplus.defaults b/configs/sdkconfig_diycam_tcameraplus.defaults
@@ -25,8 +25,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_CAMERA_D0=34
 CONFIG_CAMERA_D1=13
 CONFIG_CAMERA_D2=26
diff --git a/configs/sdkconfig_jade.defaults b/configs/sdkconfig_jade.defaults
@@ -24,8 +24,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_ci.defaults b/configs/sdkconfig_jade_ci.defaults
@@ -24,8 +24,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_ndebug.defaults b/configs/sdkconfig_jade_ndebug.defaults
@@ -24,8 +24,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_noradio.defaults b/configs/sdkconfig_jade_noradio.defaults
@@ -10,8 +10,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_noradio_ci.defaults b/configs/sdkconfig_jade_noradio_ci.defaults
@@ -10,8 +10,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_ALL=y
diff --git a/configs/sdkconfig_jade_noradio_ndebug.defaults b/configs/sdkconfig_jade_noradio_ndebug.defaults
@@ -10,8 +10,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v1_1.defaults b/configs/sdkconfig_jade_v1_1.defaults
@@ -25,8 +25,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v1_1_ci.defaults b/configs/sdkconfig_jade_v1_1_ci.defaults
@@ -25,8 +25,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v1_1_ndebug.defaults b/configs/sdkconfig_jade_v1_1_ndebug.defaults
@@ -25,8 +25,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v1_1_noradio.defaults b/configs/sdkconfig_jade_v1_1_noradio.defaults
@@ -11,8 +11,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v1_1_noradio_ci.defaults b/configs/sdkconfig_jade_v1_1_noradio_ci.defaults
@@ -11,8 +11,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_ALL=y
diff --git a/configs/sdkconfig_jade_v1_1_noradio_ndebug.defaults b/configs/sdkconfig_jade_v1_1_noradio_ndebug.defaults
@@ -11,8 +11,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v2s3.defaults b/configs/sdkconfig_jade_v2s3.defaults
@@ -19,8 +19,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v2s3_ci.defaults b/configs/sdkconfig_jade_v2s3_ci.defaults
@@ -19,8 +19,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v2s3_ndebug.defaults b/configs/sdkconfig_jade_v2s3_ndebug.defaults
@@ -19,8 +19,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v2s3_noradio.defaults b/configs/sdkconfig_jade_v2s3_noradio.defaults
@@ -6,8 +6,8 @@ CONFIG_BOARD_TYPE_JADE_V2=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v2s3_noradio_ci.defaults b/configs/sdkconfig_jade_v2s3_noradio_ci.defaults
@@ -6,8 +6,8 @@ CONFIG_BOARD_TYPE_JADE_V2=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_jade_v2s3_noradio_ndebug.defaults b/configs/sdkconfig_jade_v2s3_noradio_ndebug.defaults
@@ -6,8 +6,8 @@ CONFIG_BOARD_TYPE_JADE_V2=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_noradio.defaults b/configs/sdkconfig_noradio.defaults
@@ -20,8 +20,8 @@ CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
 CONFIG_BT_NIMBLE_SM_LEGACY=n
 CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="j"
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_qemu.defaults b/configs/sdkconfig_qemu.defaults
@@ -10,8 +10,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_qemu_psram.defaults b/configs/sdkconfig_qemu_psram.defaults
@@ -10,8 +10,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
diff --git a/configs/sdkconfig_qemu_psram_webdisplay.defaults b/configs/sdkconfig_qemu_psram_webdisplay.defaults
@@ -10,8 +10,8 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_WDT_ENABLE=n
+CONFIG_BUTTON_LONG_PRESS_HOLD_SERIAL_TIME_MS=100
 CONFIG_BUTTON_LONG_PRESS_TIME_MS=500
-CONFIG_BUTTON_SERIAL_TIME_MS=100
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
 CONFIG_COMPILER_WARN_WRITE_STRINGS=y
diff --git a/configs/sdkconfig_qemu_psram_webdisplay_larger.defaults b/configs/sdkconfig_qemu_psram_webdisplay_larger.defaults
diff --git a/dependencies.lock.esp32 b/dependencies.lock.esp32
diff --git a/dependencies.lock.esp32s3 b/dependencies.lock.esp32s3
diff --git a/main/camera.c b/main/camera.c
diff --git a/main/idf_component.yml b/main/idf_component.yml
diff --git a/main/input/navbtns.inc b/main/input/navbtns.inc
diff --git a/main/input/selectbtn.inc b/main/input/selectbtn.inc
diff --git a/main/input/singlebtn.inc b/main/input/singlebtn.inc
diff --git a/main/input/touchscreen.inc b/main/input/touchscreen.inc
diff --git a/production/sdkconfig_jade_noradio_prod.defaults b/production/sdkconfig_jade_noradio_prod.defaults
diff --git a/production/sdkconfig_jade_prod.defaults b/production/sdkconfig_jade_prod.defaults
diff --git a/production/sdkconfig_jade_v1_1_noradio_prod.defaults b/production/sdkconfig_jade_v1_1_noradio_prod.defaults
diff --git a/production/sdkconfig_jade_v1_1_prod.defaults b/production/sdkconfig_jade_v1_1_prod.defaults
diff --git a/production/sdkconfig_jade_v1_1_smoketest.defaults b/production/sdkconfig_jade_v1_1_smoketest.defaults
diff --git a/production/sdkconfig_jade_v2s3_noradio_prod.defaults b/production/sdkconfig_jade_v2s3_noradio_prod.defaults
diff --git a/production/sdkconfig_jade_v2s3_prod.defaults b/production/sdkconfig_jade_v2s3_prod.defaults
diff --git a/production/sdkconfig_jade_v2s3_smoketest.defaults b/production/sdkconfig_jade_v2s3_smoketest.defaults
