Update ACES Split MK1-L to v0.7.3

InfraredAces · Jul 26, 2023 · 6dae8f2 · 6dae8f2
1 parent 1d68682
commit 6dae8f2
Show file tree

Hide file tree

Showing 2 changed files with 139 additions and 40 deletions.
diff --git a/ACES-Split-MK1-L/BoardConfig.h b/ACES-Split-MK1-L/BoardConfig.h
@@ -34,10 +34,11 @@
 #define PIN_BUTTON_R3   18          // R3 / RS / RS / R3 / 12 / RS
 #define PIN_BUTTON_A1   20          // A1 / Guide / Home / PS / 13 / ~
 #define PIN_BUTTON_A2   21          // A2 / ~ / Capture / ~ / 14 / ~
+#define PIN_BUTTON_FN   -1          // Hotkey Function
 #define PIN_BUTTON_TURBO -1         // Turbo
 #define PIN_BUTTON_REVERSE -1       // UDLR Reverse
-#define PIN_SLIDER_LS    26         // Left Stick Slider
-#define PIN_SLIDER_RS    27         // Right Stick Slider
+#define PIN_SLIDER_LS    27         // Left Stick Slider
+#define PIN_SLIDER_RS    26         // Right Stick Slider
 #define PIN_SLIDER_SOCD_ONE    14         // SOCD Slider Pin One
 #define PIN_SLIDER_SOCD_TWO    15         // SOCD Slider Pin Two
 
@@ -51,13 +52,14 @@
 
 #define DEFAULT_SOCD_MODE SOCD_MODE_NEUTRAL
 // SOCD Slider Slot Defaults
-#define SLIDER_SOCD_ENABLED 0
+#define SLIDER_SOCD_ENABLED 1
 #define SLIDER_SOCD_SLOT_ONE SOCD_MODE_NEUTRAL
-#define SLIDER_SOCD_SLOT_TWO SOCD_MODE_SECOND_INPUT_PRIORITY
+#define SLIDER_SOCD_SLOT_TWO SOCD_MODE_UP_PRIORITY
 #define SLIDER_SOCD_SLOT_DEFAULT SOCD_MODE_NEUTRAL
 
 #define DEFAULT_INPUT_MODE INPUT_MODE_XINPUT //INPUT_MODE_XINPUT (XInput), INPUT_MODE_SWITCH (Nintendo Switch), INPUT_MODE_HID (D-Input), INPUT_MODE_KEYBOARD (Keyboard)
 #define DEFAULT_DPAD_MODE DPAD_MODE_DIGITAL  //DPAD_MODE_DIGITAL, DPAD_MODE_LEFT_ANALOG, DPAD_MODE_RIGHT_ANALOG, 
+
 #define DEFAULT_FORCED_SETUP_MODE FORCED_SETUP_MODE_OFF // 	FORCED_SETUP_MODE_OFF, FORCED_SETUP_MODE_LOCK_MODE_SWITCH, FORCED_SETUP_MODE_LOCK_WEB_CONFIG, FORCED_SETUP_MODE_LOCK_BOTH
 #define DEFAULT_LOCK_HOTKEYS false // or true
 
@@ -127,8 +129,16 @@
 // The default for `ANALOG_ADC_VRX` and `ANALOG_ADC_VRY` is `-1` which disables them.
 // To enable a `ANALOG_ADC_VRX` and `ANALOG_ADC_VRY`, replace the `-1` with the GPIO pin numbers that are desired. 
 
-#define ANALOG_ADC_VRX -1
-#define ANALOG_ADC_VRY -1
+#define ANALOG_ADC_1_VRX -1
+#define ANALOG_ADC_1_VRY -1
+#define ANALOG_ADC_1_MODE DPAD_MODE_LEFT_ANALOG
+#define ANALOG_ADC_1_INVERT INVERT_NONE
+
+#define ANALOG_ADC_2_VRX -1
+#define ANALOG_ADC_2_VRY -1
+#define ANALOG_ADC_2_MODE DPAD_MODE_RIGHT_ANALOG
+#define ANALOG_ADC_2_INVERT INVERT_NONE
+
 
 // This is the I2C Display section (commonly known as the OLED display section).
 // In this section you can specify if a display as been enabled, which pins are assined to it, the block address and speed.
@@ -214,6 +224,9 @@
 
 #define BOARD_LED_TYPE ON_BOARD_LED_MODE_OFF
 
+// Joystick Selection Slider Options
+#define JSLIDER_ENABLED 1
+
 // Dual Directional Add-on Options
 
 #define PIN_DUAL_DIRECTIONAL_UP -1
@@ -223,6 +236,20 @@
 #define DUAL_DIRECTIONAL_STICK_MODE DPAD_MODE_DIGITAL
 #define DUAL_DIRECTIONAL_COMBINE_MODE DUAL_COMBINE_MODE_MIXED
 
+// TILTAdd-on Options
+#define PIN_TILT_1 -1
+#define PIN_TILT_2 -1
+#define PIN_TILT_FUNCTION -1
+#define PIN_TILT_LEFT_ANALOG_UP -1
+#define PIN_TILT_LEFT_ANALOG_DOWN -1
+#define PIN_TILT_LEFT_ANALOG_LEFT -1
+#define PIN_TILT_LEFT_ANALOG_RIGHT -1
+#define PIN_TILT_RIGHT_ANALOG_UP -1
+#define PIN_TILT_RIGHT_ANALOG_DOWN -1
+#define PIN_TILT_RIGHT_ANALOG_LEFT -1
+#define PIN_TILT_RIGHT_ANALOG_RIGHT -1
+#define TILT_SOCD_MODE SOCD_MODE_NEUTRAL
+
 // BOOTSEL Button Add-on setting
 #define BOOTSEL_BUTTON_MASK 0 // 0 means none, get other mask from GamepadState.h
 
@@ -241,6 +268,14 @@
                             // For directions, use GAMEPAD_MASK_DU, GAMEPAD_MASK_DD, GAMEPAD_MASK_DL and GAMEPAD_MASK_DR
 #define EXTRA_BUTTON_PIN 22
 
+// Button Lock Add-on setting
+#define FOCUS_MODE_BUTTON_MASK 0 // 0 means none, get other mask from GamepadState.h
+                            // For directions, use GAMEPAD_MASK_DU, GAMEPAD_MASK_DD, GAMEPAD_MASK_DL and GAMEPAD_MASK_DR
+#define FOCUS_MODE_PIN -1
+#define FOCUS_MODE_OLED_LOCK_ENABLED 0
+#define FOCUS_MODE_RGB_LOCK_ENABLED 0
+#define FOCUS_MODE_BUTTON_LOCK_ENABLED 0
+
 // Keyboard Mapping Configuration
 // List of HID keycodes can be located here: https://github.com/hathach/tinyusb/blob/3623ba1884ddff23e9b64766cb6dd032f1425846/src/class/hid/hid.h#L356
 // Even for the modifier keys, HID_KEY entries should be used as the implementation expects those and will convert as necessary.
@@ -263,24 +298,76 @@
 #define KEY_BUTTON_A1   HID_KEY_9             // A1 / Guide / Home / PS / 13 / ~
 #define KEY_BUTTON_A2   HID_KEY_F2            // A2 / ~ / Capture / ~ / 14 / ~
 
-// Hotkey Action Mapping
-// Find the list of hotkey actions in GamepadEnums.h
-#define HOTKEY_F1_UP_MASK      GAMEPAD_MASK_UP
-#define HOTKEY_F1_UP_ACTION    HOTKEY_HOME_BUTTON
-#define HOTKEY_F1_DOWN_MASK    GAMEPAD_MASK_DOWN
-#define HOTKEY_F1_DOWN_ACTION  HOTKEY_DPAD_DIGITAL
-#define HOTKEY_F1_LEFT_MASK    GAMEPAD_MASK_LEFT
-#define HOTKEY_F1_LEFT_ACTION  HOTKEY_DPAD_LEFT_ANALOG
-#define HOTKEY_F1_RIGHT_MASK   GAMEPAD_MASK_RIGHT
-#define HOTKEY_F1_RIGHT_ACTION HOTKEY_DPAD_RIGHT_ANALOG
-
-#define HOTKEY_F2_UP_MASK      GAMEPAD_MASK_UP
-#define HOTKEY_F2_UP_ACTION    HOTKEY_SOCD_UP_PRIORITY
-#define HOTKEY_F2_DOWN_MASK    GAMEPAD_MASK_DOWN
-#define HOTKEY_F2_DOWN_ACTION  HOTKEY_SOCD_NEUTRAL
-#define HOTKEY_F2_LEFT_MASK    GAMEPAD_MASK_LEFT
-#define HOTKEY_F2_LEFT_ACTION  HOTKEY_SOCD_FIRST_INPUT
-#define HOTKEY_F2_RIGHT_MASK   GAMEPAD_MASK_RIGHT
-#define HOTKEY_F2_RIGHT_ACTION HOTKEY_SOCD_LAST_INPUT
+// Keyboard Host Addon defaults
+#define KEYBOARD_HOST_ENABLED 0
+#define KEYBOARD_HOST_PIN_DPLUS -1
+
+#// For details on this, see: https://gp2040-ce.info/#/development?id=i2c-display-splash
+#define DEFAULT_SPLASH \
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xDF,0xC0, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0xC1,0xFF,0xA0, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0xCF,0xFE,0x80, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xFF,0xE0,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xAB,0xC0,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2C,0x00,0x00,0xFB,0x83,0xFF,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x01,0xFF,0x00,0x01,0xF3,0x07,0xFC,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x07,0xFF,0x00,0x03,0xE0,0x3F,0xF4,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x2C,0x38,0x0A,0xE7,0x80,0x03,0xC0,0x5F,0x80,0x00, \
+	0x00,0x00,0x00,0x20,0x07,0x81,0xFF,0x39,0xC3,0xC7,0x01,0xD7,0x80,0x3F,0x00,0x00, \
+	0x00,0x00,0x00,0xE0,0x1F,0xE7,0xFF,0x79,0xC7,0x87,0x9F,0xA7,0x80,0x6E,0x3C,0x00, \
+	0x00,0x00,0xA0,0xC0,0x3F,0xEA,0xE7,0xF3,0xEF,0x07,0x7F,0xC7,0x01,0xCF,0xFF,0x80, \
+	0x00,0x03,0x8F,0xFC,0x7F,0xC3,0xC7,0x7F,0xFE,0x0F,0x7E,0x8F,0x87,0xDF,0xFC,0x00, \
+	0x00,0x0F,0xFF,0xFF,0x73,0xC7,0x87,0xFF,0xDE,0x0E,0x50,0x07,0x1F,0x1F,0xD0,0x00, \
+	0x00,0x1F,0x57,0xFF,0xE7,0x8F,0x07,0xFF,0x1C,0x3E,0x00,0x0F,0xFF,0x7F,0x00,0x00, \
+	0x00,0x7E,0x0B,0x8F,0x8F,0x8E,0x0F,0xFF,0x9E,0x7C,0x00,0x07,0xFD,0xFC,0x00,0x00, \
+	0x00,0x7C,0x37,0x9F,0x1F,0x1E,0x0F,0x87,0x1E,0xF8,0x00,0x07,0xF0,0x30,0x00,0x00, \
+	0x00,0xF1,0xF7,0xFE,0x1E,0x1C,0x3E,0x0E,0x1F,0xF0,0x00,0x01,0x40,0x28,0x00,0x00, \
+	0x01,0xEF,0xE7,0xF8,0x3C,0x3E,0x7C,0x0F,0x1F,0xE0,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x03,0xFF,0x8F,0xF0,0x7F,0xFE,0xF8,0x0E,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x03,0xFF,0xCF,0xC0,0xFF,0xFF,0xF0,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x07,0x8B,0xFF,0x01,0xFF,0x8F,0xC0,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x07,0x87,0xFE,0x01,0xFE,0x0F,0x80,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x07,0x1F,0xDE,0x03,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x07,0xBF,0x9E,0x01,0xC0,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x07,0xFF,0x9C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x07,0xFB,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x03,0xE7,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x01,0x47,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x0E,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 
 #endif
+
diff --git a/ACES-Split-MK1-L/README.md b/ACES-Split-MK1-L/README.md
@@ -14,34 +14,50 @@ jobs:
 
 # ACES Split MK1
 
-## Changes from default Pico pinout.
+## Difference from default Pico pinout 
+
+### Changes made in Main Pin Definition section
+
+- Remove Turbo from GPIO pin 14, Set to -1
+- Remove Turbo LED from GPIO pin 15, Set to -1
+- Add PIN_SLIDER_LS to GPIO pin 27
+- Add PIN_SLIDER_RS to GPIO pin 26
+- Set PIN_SLIDER_SOCD_ONE to GPIO pin 14
+- Set PIN_SLIDER_SOCD_TWO to GPIO pin 15
+
+#### Changes for Left Handed Layout
 
 - Changed PIN_DPAD_LEFT to GPIO pin 4
 - Changed PIN_DPAD_RIGHT to GPIO pin 5
-- Add SOCD1 to GPIO pin 14
-- Remove Turbo from GPIO pin 14
-- Add SOCD2 to GPIO pin 15
-- Remove Turbo LED from GPIO pin 15
 - Changed PIN_BUTTON_S2 to GPIO pin 16
 - Changed PIN_BUTTON_S1 to GPIO pin 17
 - Changed PIN_BUTTON_R3 to GPIO pin 18
 - Changed PIN_BUTTON_L3 to GPIO pin 19
+
+### Changes made in Add On configuration
+
 - Add Extra Button to GPIO pin 22
-- Add LS to GPIO pin 26
-- Add RS to GPIO pin 27
 
 ## Changes to default Pico Add On Configuration
 
 ### SOCD Slider
 
-- Add Enable definition (Disabled for time being)
+- Add Enable definition
 
 ```
-#define SLIDER_SOCD_ENABLED 0
+#define SLIDER_SOCD_ENABLED 1
 ```
 
 - Set SLIDER_SOCD_SLOT_ONE to SOCD_MODE_NEUTRAL
-- Set SLIDER_SOCD_SLOT_TWO to SOCD_MODE_SECOND_INPUT_PRIORITY
+- Set SLIDER_SOCD_SLOT_TWO to SOCD_MODE_UP_PRIORITY
+
+## Joystick Selection Slider
+
+- Add Enable definition
+
+```
+#define JSLIDER_ENABLED 1
+```
 
 ### RGB LED
 - Set LED_BRIGHTNESS_MAXIMUM to 80
@@ -73,8 +89,4 @@ Waiting to add Extra Button to RGB LED chain
 ```
 
 - Change EXTRA_BUTTON_MASK to GAMEPAD_MASK_DU
-- Change EXTRA_BUTTON_PIN to 22
-
-### Hotkey Action Mapping
-- Set HOTKEY_F2_LEFT_ACTION to HOTKEY_SOCD_FIRST_INPUT
-- Set HOTKEY_F2_RIGHT_ACTION to HOTKEY_SOCD_LAST_INPUT
+- Change EXTRA_BUTTON_PIN to 22