Fix Open_Core0 and Open_Core0 WASD configs (#949)

This PR updates the config files for the Open_Core0 and Open_Core0 WASD so they function as intended. There is also a small update to buttonlayouts.h as S1 was represented for both S1 and S2 on the Open_Core0 WASD layout.
OpenStickCommunity · Apr 8, 2024 · 715bcc3 · 715bcc3
1 parent 5bf292d
commit 715bcc3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/configs/OpenCore0/BoardConfig.h b/configs/OpenCore0/BoardConfig.h
@@ -103,7 +103,7 @@
 #define I2C0_PIN_SDA 0
 #define I2C0_PIN_SCL 1
 #define DISPLAY_I2C_BLOCK i2c0
-#define DISPLAY_FLIP 3
+#define DISPLAY_FLIP 1
 
 #define REVERSE_UP_DEFAULT 1
 #define REVERSE_DOWN_DEFAULT 1
@@ -113,6 +113,7 @@
 #define BUTTON_LAYOUT BUTTON_LAYOUT_STICKLESS
 #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_STICKLESSB
 #define SPLASH_MODE SPLASH_MODE_STATIC
+#define SPLASH_DURATION 3000
 
 #define FOCUS_MODE_ENABLED 1
 #define FOCUS_MODE_BUTTON_MASK GAMEPAD_MASK_S1 | GAMEPAD_MASK_S2 | GAMEPAD_MASK_A1 | GAMEPAD_MASK_A2 | GAMEPAD_MASK_L3 | GAMEPAD_MASK_R3

diff --git a/configs/OpenCore0WASD/BoardConfig.h b/configs/OpenCore0WASD/BoardConfig.h
@@ -104,11 +104,12 @@
 #define I2C0_PIN_SDA 0
 #define I2C0_PIN_SCL 1
 #define DISPLAY_I2C_BLOCK i2c0
-#define DISPLAY_FLIP 3
+#define DISPLAY_FLIP 1
 
 #define BUTTON_LAYOUT BUTTON_LAYOUT_OPENCORE0WASDA
 #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_OPENCORE0WASDB
 #define SPLASH_MODE SPLASH_MODE_STATIC
+#define SPLASH_DURATION 3000
 
 #define GPIO_PIN_13 GpioAction::BUTTON_PRESS_UP
 

diff --git a/headers/buttonlayouts.h b/headers/buttonlayouts.h
@@ -80,7 +80,7 @@
     {GP_ELEMENT_DIR_BUTTON, {27, 39, 37, 49, 1, 1, GAMEPAD_MASK_DOWN,  GP_SHAPE_SQUARE}},\
     {GP_ELEMENT_DIR_BUTTON, {27, 28, 37, 38, 1, 1, GAMEPAD_MASK_UP,    GP_SHAPE_SQUARE}},\
     {GP_ELEMENT_DIR_BUTTON, {38, 39, 48, 49, 1, 1, GAMEPAD_MASK_RIGHT, GP_SHAPE_SQUARE}},\
-    {GP_ELEMENT_BTN_BUTTON, {6,  19,  3,  3, 1, 1, GAMEPAD_MASK_S1,    GP_SHAPE_ELLIPSE}},\
+    {GP_ELEMENT_BTN_BUTTON, {6,  19,  3,  3, 1, 1, GAMEPAD_MASK_S2,    GP_SHAPE_ELLIPSE}},\
     {GP_ELEMENT_BTN_BUTTON, {14, 19,  3,  3, 1, 1, GAMEPAD_MASK_S1,    GP_SHAPE_ELLIPSE}},\
     {GP_ELEMENT_BTN_BUTTON, {23, 19,  3,  3, 1, 1, GAMEPAD_MASK_A1,    GP_SHAPE_ELLIPSE}},\
     {GP_ELEMENT_BTN_BUTTON, {31, 19,  3,  3, 1, 1, GAMEPAD_MASK_A2,    GP_SHAPE_ELLIPSE}},\