Skip to content

Commit 6dae8f2

Browse files
InfraredAcesInfraredAces
committed
Update ACES Split MK1-L to v0.7.3
1 parent 1d68682 commit 6dae8f2

2 files changed

Lines changed: 139 additions & 40 deletions

File tree

‎ACES-Split-MK1-L/BoardConfig.h‎

Lines changed: 112 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@
3434
#define PIN_BUTTON_R3 18 // R3 / RS / RS / R3 / 12 / RS
3535
#define PIN_BUTTON_A1 20 // A1 / Guide / Home / PS / 13 / ~
3636
#define PIN_BUTTON_A2 21 // A2 / ~ / Capture / ~ / 14 / ~
37+
#define PIN_BUTTON_FN -1 // Hotkey Function
3738
#define PIN_BUTTON_TURBO -1 // Turbo
3839
#define PIN_BUTTON_REVERSE -1 // UDLR Reverse
39-
#define PIN_SLIDER_LS 26 // Left Stick Slider
40-
#define PIN_SLIDER_RS 27 // Right Stick Slider
40+
#define PIN_SLIDER_LS 27 // Left Stick Slider
41+
#define PIN_SLIDER_RS 26 // Right Stick Slider
4142
#define PIN_SLIDER_SOCD_ONE 14 // SOCD Slider Pin One
4243
#define PIN_SLIDER_SOCD_TWO 15 // SOCD Slider Pin Two
4344

@@ -51,13 +52,14 @@
5152

5253
#define DEFAULT_SOCD_MODE SOCD_MODE_NEUTRAL
5354
// SOCD Slider Slot Defaults
54-
#define SLIDER_SOCD_ENABLED 0
55+
#define SLIDER_SOCD_ENABLED 1
5556
#define SLIDER_SOCD_SLOT_ONE SOCD_MODE_NEUTRAL
56-
#define SLIDER_SOCD_SLOT_TWO SOCD_MODE_SECOND_INPUT_PRIORITY
57+
#define SLIDER_SOCD_SLOT_TWO SOCD_MODE_UP_PRIORITY
5758
#define SLIDER_SOCD_SLOT_DEFAULT SOCD_MODE_NEUTRAL
5859

5960
#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)
6061
#define DEFAULT_DPAD_MODE DPAD_MODE_DIGITAL //DPAD_MODE_DIGITAL, DPAD_MODE_LEFT_ANALOG, DPAD_MODE_RIGHT_ANALOG,
62+
6163
#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
6264
#define DEFAULT_LOCK_HOTKEYS false // or true
6365

@@ -127,8 +129,16 @@
127129
// The default for `ANALOG_ADC_VRX` and `ANALOG_ADC_VRY` is `-1` which disables them.
128130
// To enable a `ANALOG_ADC_VRX` and `ANALOG_ADC_VRY`, replace the `-1` with the GPIO pin numbers that are desired.
129131

130-
#define ANALOG_ADC_VRX -1
131-
#define ANALOG_ADC_VRY -1
132+
#define ANALOG_ADC_1_VRX -1
133+
#define ANALOG_ADC_1_VRY -1
134+
#define ANALOG_ADC_1_MODE DPAD_MODE_LEFT_ANALOG
135+
#define ANALOG_ADC_1_INVERT INVERT_NONE
136+
137+
#define ANALOG_ADC_2_VRX -1
138+
#define ANALOG_ADC_2_VRY -1
139+
#define ANALOG_ADC_2_MODE DPAD_MODE_RIGHT_ANALOG
140+
#define ANALOG_ADC_2_INVERT INVERT_NONE
141+
132142

133143
// This is the I2C Display section (commonly known as the OLED display section).
134144
// 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 @@
214224

215225
#define BOARD_LED_TYPE ON_BOARD_LED_MODE_OFF
216226

227+
// Joystick Selection Slider Options
228+
#define JSLIDER_ENABLED 1
229+
217230
// Dual Directional Add-on Options
218231

219232
#define PIN_DUAL_DIRECTIONAL_UP -1
@@ -223,6 +236,20 @@
223236
#define DUAL_DIRECTIONAL_STICK_MODE DPAD_MODE_DIGITAL
224237
#define DUAL_DIRECTIONAL_COMBINE_MODE DUAL_COMBINE_MODE_MIXED
225238

239+
// TILTAdd-on Options
240+
#define PIN_TILT_1 -1
241+
#define PIN_TILT_2 -1
242+
#define PIN_TILT_FUNCTION -1
243+
#define PIN_TILT_LEFT_ANALOG_UP -1
244+
#define PIN_TILT_LEFT_ANALOG_DOWN -1
245+
#define PIN_TILT_LEFT_ANALOG_LEFT -1
246+
#define PIN_TILT_LEFT_ANALOG_RIGHT -1
247+
#define PIN_TILT_RIGHT_ANALOG_UP -1
248+
#define PIN_TILT_RIGHT_ANALOG_DOWN -1
249+
#define PIN_TILT_RIGHT_ANALOG_LEFT -1
250+
#define PIN_TILT_RIGHT_ANALOG_RIGHT -1
251+
#define TILT_SOCD_MODE SOCD_MODE_NEUTRAL
252+
226253
// BOOTSEL Button Add-on setting
227254
#define BOOTSEL_BUTTON_MASK 0 // 0 means none, get other mask from GamepadState.h
228255

@@ -241,6 +268,14 @@
241268
// For directions, use GAMEPAD_MASK_DU, GAMEPAD_MASK_DD, GAMEPAD_MASK_DL and GAMEPAD_MASK_DR
242269
#define EXTRA_BUTTON_PIN 22
243270

271+
// Button Lock Add-on setting
272+
#define FOCUS_MODE_BUTTON_MASK 0 // 0 means none, get other mask from GamepadState.h
273+
// For directions, use GAMEPAD_MASK_DU, GAMEPAD_MASK_DD, GAMEPAD_MASK_DL and GAMEPAD_MASK_DR
274+
#define FOCUS_MODE_PIN -1
275+
#define FOCUS_MODE_OLED_LOCK_ENABLED 0
276+
#define FOCUS_MODE_RGB_LOCK_ENABLED 0
277+
#define FOCUS_MODE_BUTTON_LOCK_ENABLED 0
278+
244279
// Keyboard Mapping Configuration
245280
// List of HID keycodes can be located here: https://github.com/hathach/tinyusb/blob/3623ba1884ddff23e9b64766cb6dd032f1425846/src/class/hid/hid.h#L356
246281
// 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 @@
263298
#define KEY_BUTTON_A1 HID_KEY_9 // A1 / Guide / Home / PS / 13 / ~
264299
#define KEY_BUTTON_A2 HID_KEY_F2 // A2 / ~ / Capture / ~ / 14 / ~
265300

266-
// Hotkey Action Mapping
267-
// Find the list of hotkey actions in GamepadEnums.h
268-
#define HOTKEY_F1_UP_MASK GAMEPAD_MASK_UP
269-
#define HOTKEY_F1_UP_ACTION HOTKEY_HOME_BUTTON
270-
#define HOTKEY_F1_DOWN_MASK GAMEPAD_MASK_DOWN
271-
#define HOTKEY_F1_DOWN_ACTION HOTKEY_DPAD_DIGITAL
272-
#define HOTKEY_F1_LEFT_MASK GAMEPAD_MASK_LEFT
273-
#define HOTKEY_F1_LEFT_ACTION HOTKEY_DPAD_LEFT_ANALOG
274-
#define HOTKEY_F1_RIGHT_MASK GAMEPAD_MASK_RIGHT
275-
#define HOTKEY_F1_RIGHT_ACTION HOTKEY_DPAD_RIGHT_ANALOG
276-
277-
#define HOTKEY_F2_UP_MASK GAMEPAD_MASK_UP
278-
#define HOTKEY_F2_UP_ACTION HOTKEY_SOCD_UP_PRIORITY
279-
#define HOTKEY_F2_DOWN_MASK GAMEPAD_MASK_DOWN
280-
#define HOTKEY_F2_DOWN_ACTION HOTKEY_SOCD_NEUTRAL
281-
#define HOTKEY_F2_LEFT_MASK GAMEPAD_MASK_LEFT
282-
#define HOTKEY_F2_LEFT_ACTION HOTKEY_SOCD_FIRST_INPUT
283-
#define HOTKEY_F2_RIGHT_MASK GAMEPAD_MASK_RIGHT
284-
#define HOTKEY_F2_RIGHT_ACTION HOTKEY_SOCD_LAST_INPUT
301+
// Keyboard Host Addon defaults
302+
#define KEYBOARD_HOST_ENABLED 0
303+
#define KEYBOARD_HOST_PIN_DPLUS -1
304+
305+
#// For details on this, see: https://gp2040-ce.info/#/development?id=i2c-display-splash
306+
#define DEFAULT_SPLASH \
307+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
308+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
309+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
310+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
311+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
312+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
313+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
314+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
315+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
316+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
317+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
318+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
319+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
320+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
321+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
322+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
323+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, \
324+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x00, \
325+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xDF,0xC0, \
326+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0xC1,0xFF,0xA0, \
327+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0xCF,0xFE,0x80, \
328+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xFF,0xE0,0x00, \
329+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xAB,0xC0,0x00, \
330+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2C,0x00,0x00,0xFB,0x83,0xFF,0x00, \
331+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x01,0xFF,0x00,0x01,0xF3,0x07,0xFC,0x00, \
332+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x07,0xFF,0x00,0x03,0xE0,0x3F,0xF4,0x00, \
333+
0x00,0x00,0x00,0x00,0x00,0x00,0x2C,0x38,0x0A,0xE7,0x80,0x03,0xC0,0x5F,0x80,0x00, \
334+
0x00,0x00,0x00,0x20,0x07,0x81,0xFF,0x39,0xC3,0xC7,0x01,0xD7,0x80,0x3F,0x00,0x00, \
335+
0x00,0x00,0x00,0xE0,0x1F,0xE7,0xFF,0x79,0xC7,0x87,0x9F,0xA7,0x80,0x6E,0x3C,0x00, \
336+
0x00,0x00,0xA0,0xC0,0x3F,0xEA,0xE7,0xF3,0xEF,0x07,0x7F,0xC7,0x01,0xCF,0xFF,0x80, \
337+
0x00,0x03,0x8F,0xFC,0x7F,0xC3,0xC7,0x7F,0xFE,0x0F,0x7E,0x8F,0x87,0xDF,0xFC,0x00, \
338+
0x00,0x0F,0xFF,0xFF,0x73,0xC7,0x87,0xFF,0xDE,0x0E,0x50,0x07,0x1F,0x1F,0xD0,0x00, \
339+
0x00,0x1F,0x57,0xFF,0xE7,0x8F,0x07,0xFF,0x1C,0x3E,0x00,0x0F,0xFF,0x7F,0x00,0x00, \
340+
0x00,0x7E,0x0B,0x8F,0x8F,0x8E,0x0F,0xFF,0x9E,0x7C,0x00,0x07,0xFD,0xFC,0x00,0x00, \
341+
0x00,0x7C,0x37,0x9F,0x1F,0x1E,0x0F,0x87,0x1E,0xF8,0x00,0x07,0xF0,0x30,0x00,0x00, \
342+
0x00,0xF1,0xF7,0xFE,0x1E,0x1C,0x3E,0x0E,0x1F,0xF0,0x00,0x01,0x40,0x28,0x00,0x00, \
343+
0x01,0xEF,0xE7,0xF8,0x3C,0x3E,0x7C,0x0F,0x1F,0xE0,0x00,0x00,0x00,0x00,0x00,0x00, \
344+
0x03,0xFF,0x8F,0xF0,0x7F,0xFE,0xF8,0x0E,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00, \
345+
0x03,0xFF,0xCF,0xC0,0xFF,0xFF,0xF0,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
346+
0x07,0x8B,0xFF,0x01,0xFF,0x8F,0xC0,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
347+
0x07,0x87,0xFE,0x01,0xFE,0x0F,0x80,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
348+
0x07,0x1F,0xDE,0x03,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
349+
0x07,0xBF,0x9E,0x01,0xC0,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
350+
0x07,0xFF,0x9C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
351+
0x07,0xFB,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
352+
0x03,0xE7,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
353+
0x01,0x47,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
354+
0x00,0x0E,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
355+
0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
356+
0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
357+
0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
358+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
359+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
360+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
361+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
362+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
363+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
364+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
365+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
366+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
367+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
368+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
369+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, \
370+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
285371

286372
#endif
373+

‎ACES-Split-MK1-L/README.md‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,50 @@ jobs:
1414

1515
# ACES Split MK1
1616

17-
## Changes from default Pico pinout.
17+
## Difference from default Pico pinout
18+
19+
### Changes made in Main Pin Definition section
20+
21+
- Remove Turbo from GPIO pin 14, Set to -1
22+
- Remove Turbo LED from GPIO pin 15, Set to -1
23+
- Add PIN_SLIDER_LS to GPIO pin 27
24+
- Add PIN_SLIDER_RS to GPIO pin 26
25+
- Set PIN_SLIDER_SOCD_ONE to GPIO pin 14
26+
- Set PIN_SLIDER_SOCD_TWO to GPIO pin 15
27+
28+
#### Changes for Left Handed Layout
1829

1930
- Changed PIN_DPAD_LEFT to GPIO pin 4
2031
- Changed PIN_DPAD_RIGHT to GPIO pin 5
21-
- Add SOCD1 to GPIO pin 14
22-
- Remove Turbo from GPIO pin 14
23-
- Add SOCD2 to GPIO pin 15
24-
- Remove Turbo LED from GPIO pin 15
2532
- Changed PIN_BUTTON_S2 to GPIO pin 16
2633
- Changed PIN_BUTTON_S1 to GPIO pin 17
2734
- Changed PIN_BUTTON_R3 to GPIO pin 18
2835
- Changed PIN_BUTTON_L3 to GPIO pin 19
36+
37+
### Changes made in Add On configuration
38+
2939
- Add Extra Button to GPIO pin 22
30-
- Add LS to GPIO pin 26
31-
- Add RS to GPIO pin 27
3240

3341
## Changes to default Pico Add On Configuration
3442

3543
### SOCD Slider
3644

37-
- Add Enable definition (Disabled for time being)
45+
- Add Enable definition
3846

3947
```
40-
#define SLIDER_SOCD_ENABLED 0
48+
#define SLIDER_SOCD_ENABLED 1
4149
```
4250

4351
- Set SLIDER_SOCD_SLOT_ONE to SOCD_MODE_NEUTRAL
44-
- Set SLIDER_SOCD_SLOT_TWO to SOCD_MODE_SECOND_INPUT_PRIORITY
52+
- Set SLIDER_SOCD_SLOT_TWO to SOCD_MODE_UP_PRIORITY
53+
54+
## Joystick Selection Slider
55+
56+
- Add Enable definition
57+
58+
```
59+
#define JSLIDER_ENABLED 1
60+
```
4561

4662
### RGB LED
4763
- Set LED_BRIGHTNESS_MAXIMUM to 80
@@ -73,8 +89,4 @@ Waiting to add Extra Button to RGB LED chain
7389
```
7490

7591
- Change EXTRA_BUTTON_MASK to GAMEPAD_MASK_DU
76-
- Change EXTRA_BUTTON_PIN to 22
77-
78-
### Hotkey Action Mapping
79-
- Set HOTKEY_F2_LEFT_ACTION to HOTKEY_SOCD_FIRST_INPUT
80-
- Set HOTKEY_F2_RIGHT_ACTION to HOTKEY_SOCD_LAST_INPUT
92+
- Change EXTRA_BUTTON_PIN to 22

0 commit comments

Comments
 (0)