Merge branch 'master' into develop

2025-12-09 05:59:15 -06:00
parent ae8d3fbb3d 042543eb25
commit 8e63dcf59a
12 changed files with 33 additions and 28 deletions
@@ -62,17 +62,11 @@ extern "C" {
 /*
 * Buttons
 */
-#define PIN_BUTTON2 (32 + 10)
+#define PIN_BUTTON1 (32 + 10)
+#define PIN_BUTTON2 (32 + 7)
 #define ALT_BUTTON_PIN PIN_BUTTON2
 #define ALT_BUTTON_ACTIVE_LOW true
 #define ALT_BUTTON_ACTIVE_PULLUP true
-#define PIN_BUTTON1 (32 + 7)
-
-// #define PIN_BUTTON1 (0 + 11)
-// #define PIN_BUTTON1 (32 + 7)
-
-// #define BUTTON_CLICK_MS 400
-// #define BUTTON_TOUCH_MS 200

 /*
 * Analog pins
@@ -203,4 +197,4 @@ External serial flash WP25R1635FZUIL0
 }
 #endif

-#endif
+#endif