Merge branch 'ripplebiz:dev' into dev

Author: recrof

variants/wio-tracker-l1/variant.h

@@ -30,7 +30,7 @@
 #define PIN_BUTTON3             (26) // Joystick Down
 #define PIN_BUTTON4             (27) // Joystick Left
 #define PIN_BUTTON5             (28) // Joystick Right
-#define PIN_BUTTON6             (28) // Joystick Press
+#define PIN_BUTTON6             (29) // Joystick Press
 #define PIN_USER_BTN            PIN_BUTTON1
 #define JOYSTICK_UP             PIN_BUTTON2
 #define JOYSTICK_DOWN           PIN_BUTTON3