diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index abbd1a63c..e4fc2eca5 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -23,7 +23,48 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - GP2040_BOARDCONFIG: [ARCController, Blank, Pico, PicoW, BentoBox, ergoSHIFTRev2, FightboardV3, FightboardV3Mirrored, FlatboxRev4, FlatboxRev5, FlatboxRev5RGB, FlatboxRev5USBPassthrough, FlatboxRev5Southpaw, Granola, KB2040, KeyboardConverter, Haute42COSMOX, Liatris, MavercadeRev1, MavercadeRev2, MiSTercadeV2, OpenCore0, OpenCore0WASD, OSUMGP-RP2040, PicoAnn, PicoFightingBoard, PXPGamepad, RanaTadpole, ReflexCtrlGenesis6, ReflexCtrlNES, ReflexCtrlSaturn, ReflexCtrlSNES, ReflexCtrlVB, ReflexEncodeV1.2, ReflexEncodeV2.0, RP2040AdvancedBreakoutBoard, RP2040AdvancedBreakoutBoardUSBPassthrough, RP2040MiniBreakoutBoard, SparkFunProMicro, WaveshareZero, Stress, SGFDevices, ZeroRhythm] + GP2040_BOARDCONFIG: + [ARCController, + Blank, + Pico, + PicoW, + BentoBox, + ergoSHIFTRev2, + FlatboxRev4, + FlatboxRev5, + FlatboxRev5RGB, + FlatboxRev5USBPassthrough, + FlatboxRev5Southpaw, + Granola, + KB2040, + KeyboardConverter, + Haute42COSMOX, + Liatris, + MavercadeRev1, + MavercadeRev2, + MiSTercadeV2, + OpenCore0, + OpenCore0WASD, + OSUMGP-RP2040, + PicoAnn, + PicoFightingBoard, + PXPGamepad, + ReflexCtrlGenesis6, + ReflexCtrlNES, + ReflexCtrlSaturn, + ReflexCtrlSNES, + ReflexCtrlVB, + ReflexEncodeV1.2, + ReflexEncodeV2.0, + RP2040AdvancedBreakoutBoard, + RP2040AdvancedBreakoutBoardUSBPassthrough, + RP2040MiniBreakoutBoard, + RP2040MiniBreakoutBoardUSBPassthrough, + SparkFunProMicro, + WaveshareZero, + Stress, + SGFDevices, + ZeroRhythm] steps: #Global Setup diff --git a/configs/FightboardV3/README.md b/configs/FightboardV3/README.md deleted file mode 100644 index 21b4392c7..000000000 --- a/configs/FightboardV3/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# GP2040 Configuration for the Fightboard v3 - -![Pin Mapping](assets/FightboardV3.jpg) - -This configuration is for the Fightboard v3 using the Waveshare RP2040 Zero. - -## Main Pin Mapping Configuration - -| RP2040 Pin | Action | GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -|------------|-------------------------------|--------|--------|--------|----------|--------|--------| -| GPIO_PIN_29| GpioAction::BUTTON_PRESS_UP | UP | UP | UP | UP | UP | UP | -| GPIO_PIN_27| GpioAction::BUTTON_PRESS_DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -| GPIO_PIN_26| GpioAction::BUTTON_PRESS_RIGHT| RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -| GPIO_PIN_28| GpioAction::BUTTON_PRESS_LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -| GPIO_PIN_05| GpioAction::BUTTON_PRESS_B1 | B1 | A | B | Cross | 2 | K1 | -| GPIO_PIN_06| GpioAction::BUTTON_PRESS_B2 | B2 | B | A | Circle | 3 | K2 | -| GPIO_PIN_07| GpioAction::BUTTON_PRESS_R2 | R2 | RT | ZR | R2 | 8 | K3 | -| GPIO_PIN_08| GpioAction::BUTTON_PRESS_L2 | L2 | LT | ZL | L2 | 7 | K4 | -| GPIO_PIN_01| GpioAction::BUTTON_PRESS_B3 | B3 | X | Y | Square | 1 | P1 | -| GPIO_PIN_02| GpioAction::BUTTON_PRESS_B4 | B4 | Y | X | Triangle | 4 | P2 | -| GPIO_PIN_03| GpioAction::BUTTON_PRESS_R1 | R1 | RB | R | R1 | 6 | P3 | -| GPIO_PIN_04| GpioAction::BUTTON_PRESS_L1 | L1 | LB | L | L1 | 5 | P4 | -| GPIO_PIN_10| GpioAction::BUTTON_PRESS_S1 | S1 | Back | Minus | Select | 9 | Coin | -| GPIO_PIN_12| GpioAction::BUTTON_PRESS_S2 | S2 | Start | Plus | Start | 10 | Start | -| GPIO_PIN_09| GpioAction::BUTTON_PRESS_L3 | L3 | LS | LS | L3 | 11 | LS | -| GPIO_PIN_13| GpioAction::BUTTON_PRESS_R3 | R3 | RS | RS | R3 | 12 | RS | -| GPIO_PIN_11| GpioAction::BUTTON_PRESS_A1 | A1 | Guide | Home | PS | 13 | ~ | -| GPIO_PIN_17| GpioAction::BUTTON_PRESS_A2 | A2 | ~ | Capture| ~ | 14 | ~ | \ No newline at end of file diff --git a/configs/FightboardV3/assets/FightboardV3.jpg b/configs/FightboardV3/assets/FightboardV3.jpg deleted file mode 100644 index 880fa74a1..000000000 Binary files a/configs/FightboardV3/assets/FightboardV3.jpg and /dev/null differ diff --git a/configs/FightboardV3Mirrored/BoardConfig.h b/configs/FightboardV3Mirrored/BoardConfig.h deleted file mode 100644 index 6e2e9efd3..000000000 --- a/configs/FightboardV3Mirrored/BoardConfig.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * SPDX-License-Identifier: MIT - * SPDX-FileCopyrightText: Copyright (c) 2024 OpenStickCommunity (gp2040-ce.info) - */ - -#ifndef PICO_BOARD_CONFIG_H_ -#define PICO_BOARD_CONFIG_H_ - -#include "enums.pb.h" -#include "class/hid/hid.h" - -#define BOARD_CONFIG_LABEL "Fightboard V3 Mirrored" - -// Main pin mapping Configuration -// // GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -#define GPIO_PIN_00 GpioAction::BUTTON_PRESS_UP // UP | UP | UP | UP | UP | UP | -#define GPIO_PIN_02 GpioAction::BUTTON_PRESS_DOWN // DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -#define GPIO_PIN_03 GpioAction::BUTTON_PRESS_RIGHT // RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -#define GPIO_PIN_01 GpioAction::BUTTON_PRESS_LEFT // LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -#define GPIO_PIN_09 GpioAction::BUTTON_PRESS_B1 // B1 | A | B | Cross | 2 | K1 | -#define GPIO_PIN_12 GpioAction::BUTTON_PRESS_B2 // B2 | B | A | Circle | 3 | K2 | -#define GPIO_PIN_13 GpioAction::BUTTON_PRESS_R2 // R2 | RT | ZR | R2 | 8 | K3 | -#define GPIO_PIN_14 GpioAction::BUTTON_PRESS_L2 // L2 | LT | ZL | L2 | 7 | K4 | -#define GPIO_PIN_15 GpioAction::BUTTON_PRESS_B3 // B3 | X | Y | Square | 1 | P1 | -#define GPIO_PIN_28 GpioAction::BUTTON_PRESS_B4 // B4 | Y | X | Triangle | 4 | P2 | -#define GPIO_PIN_27 GpioAction::BUTTON_PRESS_R1 // R1 | RB | R | R1 | 6 | P3 | -#define GPIO_PIN_26 GpioAction::BUTTON_PRESS_L1 // L1 | LB | L | L1 | 5 | P4 | -#define GPIO_PIN_07 GpioAction::BUTTON_PRESS_S1 // S1 | Back | Minus | Select | 9 | Coin | -#define GPIO_PIN_05 GpioAction::BUTTON_PRESS_S2 // S2 | Start | Plus | Start | 10 | Start | -#define GPIO_PIN_08 GpioAction::BUTTON_PRESS_L3 // L3 | LS | LS | L3 | 11 | LS | -#define GPIO_PIN_04 GpioAction::BUTTON_PRESS_R3 // R3 | RS | RS | R3 | 12 | RS | -#define GPIO_PIN_06 GpioAction::BUTTON_PRESS_A1 // A1 | Guide | Home | PS | 13 | ~ | -#define GPIO_PIN_17 GpioAction::BUTTON_PRESS_A2 // A2 | ~ | Capture | ~ | 14 | ~ | - -// Setting GPIO pins to assigned by add-on -// -#define GPIO_PIN_10 GpioAction::ASSIGNED_TO_ADDON -#define GPIO_PIN_11 GpioAction::ASSIGNED_TO_ADDON -#define GPIO_PIN_29 GpioAction::ASSIGNED_TO_ADDON - -// Keyboard Mapping Configuration -// // GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -#define KEY_DPAD_UP HID_KEY_ARROW_UP // UP | UP | UP | UP | UP | UP | -#define KEY_DPAD_DOWN HID_KEY_ARROW_DOWN // DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -#define KEY_DPAD_RIGHT HID_KEY_ARROW_RIGHT // RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -#define KEY_DPAD_LEFT HID_KEY_ARROW_LEFT // LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -#define KEY_BUTTON_B1 HID_KEY_SHIFT_LEFT // B1 | A | B | Cross | 2 | K1 | -#define KEY_BUTTON_B2 HID_KEY_Z // B2 | B | A | Circle | 3 | K2 | -#define KEY_BUTTON_R2 HID_KEY_X // R2 | RT | ZR | R2 | 8 | K3 | -#define KEY_BUTTON_L2 HID_KEY_V // L2 | LT | ZL | L2 | 7 | K4 | -#define KEY_BUTTON_B3 HID_KEY_CONTROL_LEFT // B3 | X | Y | Square | 1 | P1 | -#define KEY_BUTTON_B4 HID_KEY_ALT_LEFT // B4 | Y | X | Triangle | 4 | P2 | -#define KEY_BUTTON_R1 HID_KEY_SPACE // R1 | RB | R | R1 | 6 | P3 | -#define KEY_BUTTON_L1 HID_KEY_C // L1 | LB | L | L1 | 5 | P4 | -#define KEY_BUTTON_S1 HID_KEY_5 // S1 | Back | Minus | Select | 9 | Coin | -#define KEY_BUTTON_S2 HID_KEY_1 // S2 | Start | Plus | Start | 10 | Start | -#define KEY_BUTTON_L3 HID_KEY_EQUAL // L3 | LS | LS | L3 | 11 | LS | -#define KEY_BUTTON_R3 HID_KEY_MINUS // R3 | RS | RS | R3 | 12 | RS | -#define KEY_BUTTON_A1 HID_KEY_9 // A1 | Guide | Home | PS | 13 | ~ | -#define KEY_BUTTON_A2 HID_KEY_F2 // A2 | ~ | Capture | ~ | 14 | ~ | -#define KEY_BUTTON_FN -1 // Hotkey Function | - -#define BOARD_LEDS_PIN 29 - -#define LED_BRIGHTNESS_MAXIMUM 50 -#define LED_BRIGHTNESS_STEPS 5 -#define LEDS_PER_PIXEL 1 -#define LEDS_BASE_ANIMATION_INDEX 3 -#define LEDS_THEME_INDEX 19 -#define LEDS_BUTTON_COLOR_INDEX 0 -#define LEDS_BRIGHTNESS 2 - -#define LEDS_DPAD_LEFT 10 -#define LEDS_DPAD_DOWN 9 -#define LEDS_DPAD_RIGHT 8 -#define LEDS_DPAD_UP 11 -#define LEDS_BUTTON_B3 0 -#define LEDS_BUTTON_B4 1 -#define LEDS_BUTTON_R1 2 -#define LEDS_BUTTON_L1 3 -#define LEDS_BUTTON_B1 7 -#define LEDS_BUTTON_B2 6 -#define LEDS_BUTTON_R2 5 -#define LEDS_BUTTON_L2 4 - -#define HAS_I2C_DISPLAY 1 -#define I2C1_ENABLED 1 -#define I2C1_PIN_SDA 10 -#define I2C1_PIN_SCL 11 -#define DISPLAY_I2C_BLOCK i2c1 - -#define BUTTON_LAYOUT BUTTON_LAYOUT_FIGHTBOARD_MIRRORED -#define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_FIGHTBOARD_STICK_MIRRORED - -#endif \ No newline at end of file diff --git a/configs/FightboardV3Mirrored/README.md b/configs/FightboardV3Mirrored/README.md deleted file mode 100644 index 10aecdc23..000000000 --- a/configs/FightboardV3Mirrored/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# GP2040 Configuration for the mirrored Fightboard v3 - -![Pin Mapping](assets/FightboardV3Mirrored.jpg) - -This configuration is for the mirrored version of the Fightboard v3 using the Waveshare RP2040 Zero. - -## Main Pin Mapping Configuration - -| RP2040 Pin | Action | GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -|------------|-------------------------------|--------|--------|--------|----------|--------|--------| -| GPIO_PIN_00| GpioAction::BUTTON_PRESS_UP | UP | UP | UP | UP | UP | UP | -| GPIO_PIN_02| GpioAction::BUTTON_PRESS_DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -| GPIO_PIN_03| GpioAction::BUTTON_PRESS_RIGHT| RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -| GPIO_PIN_01| GpioAction::BUTTON_PRESS_LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -| GPIO_PIN_09| GpioAction::BUTTON_PRESS_B1 | B1 | A | B | Cross | 2 | K1 | -| GPIO_PIN_12| GpioAction::BUTTON_PRESS_B2 | B2 | B | A | Circle | 3 | K2 | -| GPIO_PIN_13| GpioAction::BUTTON_PRESS_R2 | R2 | RT | ZR | R2 | 8 | K3 | -| GPIO_PIN_14| GpioAction::BUTTON_PRESS_L2 | L2 | LT | ZL | L2 | 7 | K4 | -| GPIO_PIN_15| GpioAction::BUTTON_PRESS_B3 | B3 | X | Y | Square | 1 | P1 | -| GPIO_PIN_28| GpioAction::BUTTON_PRESS_B4 | B4 | Y | X | Triangle | 4 | P2 | -| GPIO_PIN_27| GpioAction::BUTTON_PRESS_R1 | R1 | RB | R | R1 | 6 | P3 | -| GPIO_PIN_26| GpioAction::BUTTON_PRESS_L1 | L1 | LB | L | L1 | 5 | P4 | -| GPIO_PIN_07| GpioAction::BUTTON_PRESS_S1 | S1 | Back | Minus | Select | 9 | Coin | -| GPIO_PIN_05| GpioAction::BUTTON_PRESS_S2 | S2 | Start | Plus | Start | 10 | Start | -| GPIO_PIN_08| GpioAction::BUTTON_PRESS_L3 | L3 | LS | LS | L3 | 11 | LS | -| GPIO_PIN_04| GpioAction::BUTTON_PRESS_R3 | R3 | RS | RS | R3 | 12 | RS | -| GPIO_PIN_06| GpioAction::BUTTON_PRESS_A1 | A1 | Guide | Home | PS | 13 | ~ | -| GPIO_PIN_17| GpioAction::BUTTON_PRESS_A2 | A2 | ~ | Capture| ~ | 14 | ~ | \ No newline at end of file diff --git a/configs/FightboardV3Mirrored/assets/FightboardV3Mirrored.jpg b/configs/FightboardV3Mirrored/assets/FightboardV3Mirrored.jpg deleted file mode 100644 index 34fd9b4be..000000000 Binary files a/configs/FightboardV3Mirrored/assets/FightboardV3Mirrored.jpg and /dev/null differ diff --git a/configs/FightboardV3/BoardConfig.h b/configs/RP2040MiniBreakoutBoardUSBPassthrough/BoardConfig.h similarity index 62% rename from configs/FightboardV3/BoardConfig.h rename to configs/RP2040MiniBreakoutBoardUSBPassthrough/BoardConfig.h index b484754d3..69084c219 100644 --- a/configs/FightboardV3/BoardConfig.h +++ b/configs/RP2040MiniBreakoutBoardUSBPassthrough/BoardConfig.h @@ -9,34 +9,34 @@ #include "enums.pb.h" #include "class/hid/hid.h" -#define BOARD_CONFIG_LABEL "Fightboard V3" +#define BOARD_CONFIG_LABEL "RP2040 Mini Breakout Board USB Passthrough" // Main pin mapping Configuration // // GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -#define GPIO_PIN_29 GpioAction::BUTTON_PRESS_UP // UP | UP | UP | UP | UP | UP | -#define GPIO_PIN_27 GpioAction::BUTTON_PRESS_DOWN // DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -#define GPIO_PIN_26 GpioAction::BUTTON_PRESS_RIGHT // RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -#define GPIO_PIN_28 GpioAction::BUTTON_PRESS_LEFT // LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -#define GPIO_PIN_05 GpioAction::BUTTON_PRESS_B1 // B1 | A | B | Cross | 2 | K1 | -#define GPIO_PIN_06 GpioAction::BUTTON_PRESS_B2 // B2 | B | A | Circle | 3 | K2 | -#define GPIO_PIN_07 GpioAction::BUTTON_PRESS_R2 // R2 | RT | ZR | R2 | 8 | K3 | -#define GPIO_PIN_08 GpioAction::BUTTON_PRESS_L2 // L2 | LT | ZL | L2 | 7 | K4 | -#define GPIO_PIN_01 GpioAction::BUTTON_PRESS_B3 // B3 | X | Y | Square | 1 | P1 | -#define GPIO_PIN_02 GpioAction::BUTTON_PRESS_B4 // B4 | Y | X | Triangle | 4 | P2 | -#define GPIO_PIN_03 GpioAction::BUTTON_PRESS_R1 // R1 | RB | R | R1 | 6 | P3 | +#define GPIO_PIN_15 GpioAction::BUTTON_PRESS_UP // UP | UP | UP | UP | UP | UP | +#define GPIO_PIN_14 GpioAction::BUTTON_PRESS_DOWN // DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | +#define GPIO_PIN_13 GpioAction::BUTTON_PRESS_RIGHT // RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | +#define GPIO_PIN_12 GpioAction::BUTTON_PRESS_LEFT // LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | +#define GPIO_PIN_03 GpioAction::BUTTON_PRESS_B1 // B1 | A | B | Cross | 2 | K1 | +#define GPIO_PIN_02 GpioAction::BUTTON_PRESS_B2 // B2 | B | A | Circle | 3 | K2 | +#define GPIO_PIN_00 GpioAction::BUTTON_PRESS_R2 // R2 | RT | ZR | R2 | 8 | K3 | +#define GPIO_PIN_01 GpioAction::BUTTON_PRESS_L2 // L2 | LT | ZL | L2 | 7 | K4 | +#define GPIO_PIN_08 GpioAction::BUTTON_PRESS_B3 // B3 | X | Y | Square | 1 | P1 | +#define GPIO_PIN_06 GpioAction::BUTTON_PRESS_B4 // B4 | Y | X | Triangle | 4 | P2 | +#define GPIO_PIN_05 GpioAction::BUTTON_PRESS_R1 // R1 | RB | R | R1 | 6 | P3 | #define GPIO_PIN_04 GpioAction::BUTTON_PRESS_L1 // L1 | LB | L | L1 | 5 | P4 | -#define GPIO_PIN_10 GpioAction::BUTTON_PRESS_S1 // S1 | Back | Minus | Select | 9 | Coin | -#define GPIO_PIN_12 GpioAction::BUTTON_PRESS_S2 // S2 | Start | Plus | Start | 10 | Start | -#define GPIO_PIN_09 GpioAction::BUTTON_PRESS_L3 // L3 | LS | LS | L3 | 11 | LS | -#define GPIO_PIN_13 GpioAction::BUTTON_PRESS_R3 // R3 | RS | RS | R3 | 12 | RS | -#define GPIO_PIN_11 GpioAction::BUTTON_PRESS_A1 // A1 | Guide | Home | PS | 13 | ~ | -#define GPIO_PIN_17 GpioAction::BUTTON_PRESS_A2 // A2 | ~ | Capture | ~ | 14 | ~ | +#define GPIO_PIN_11 GpioAction::BUTTON_PRESS_S1 // S1 | Back | Minus | Select | 9 | Coin | +#define GPIO_PIN_09 GpioAction::BUTTON_PRESS_S2 // S2 | Start | Plus | Start | 10 | Start | +#define GPIO_PIN_28 GpioAction::BUTTON_PRESS_L3 // L3 | LS | LS | L3 | 11 | LS | +#define GPIO_PIN_29 GpioAction::BUTTON_PRESS_R3 // R3 | RS | RS | R3 | 12 | RS | +#define GPIO_PIN_10 GpioAction::BUTTON_PRESS_A1 // A1 | Guide | Home | PS | 13 | ~ | +#define GPIO_PIN_27 GpioAction::BUTTON_PRESS_A2 // A2 | ~ | Capture | ~ | 14 | ~ | // Setting GPIO pins to assigned by add-on // -#define GPIO_PIN_00 GpioAction::ASSIGNED_TO_ADDON -#define GPIO_PIN_14 GpioAction::ASSIGNED_TO_ADDON -#define GPIO_PIN_15 GpioAction::ASSIGNED_TO_ADDON +#define GPIO_PIN_16 GpioAction::ASSIGNED_TO_ADDON +#define GPIO_PIN_18 GpioAction::ASSIGNED_TO_ADDON +#define GPIO_PIN_19 GpioAction::ASSIGNED_TO_ADDON // Keyboard Mapping Configuration // // GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | @@ -60,37 +60,30 @@ #define KEY_BUTTON_A2 HID_KEY_F2 // A2 | ~ | Capture | ~ | 14 | ~ | #define KEY_BUTTON_FN -1 // Hotkey Function | -#define BOARD_LEDS_PIN 0 +#define BOARD_LEDS_PIN 16 -#define LED_BRIGHTNESS_MAXIMUM 50 -#define LED_BRIGHTNESS_STEPS 5 -#define LEDS_PER_PIXEL 1 +#define USB_PERIPHERAL_ENABLED 1 -#define LEDS_DPAD_LEFT 10 -#define LEDS_DPAD_DOWN 9 -#define LEDS_DPAD_RIGHT 8 -#define LEDS_DPAD_UP 11 -#define LEDS_BUTTON_B3 0 -#define LEDS_BUTTON_B4 1 -#define LEDS_BUTTON_R1 2 -#define LEDS_BUTTON_L1 3 -#define LEDS_BUTTON_B1 7 -#define LEDS_BUTTON_B2 6 -#define LEDS_BUTTON_R2 5 -#define LEDS_BUTTON_L2 4 +#define USB_PERIPHERAL_PIN_DPLUS 18 +#define USB_PERIPHERAL_PIN_ORDER 0 -#define HAS_I2C_DISPLAY 1 -#define I2C1_ENABLED 1 -#define I2C1_PIN_SDA 14 -#define I2C1_PIN_SCL 15 -#define DISPLAY_I2C_BLOCK i2c1 +#define DEFAULT_INPUT_MODE_R1 INPUT_MODE_XBONE +#define DEFAULT_INPUT_MODE_B4 INPUT_MODE_PS5 +#define DEFAULT_PS5AUTHENTICATION_TYPE INPUT_MODE_AUTH_TYPE_USB -#define BUTTON_LAYOUT BUTTON_LAYOUT_FIGHTBOARD_STICK -#define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_FIGHTBOARD +#define LED_BRIGHTNESS_MAXIMUM 100 -#define LEDS_BASE_ANIMATION_INDEX 3 -#define LEDS_THEME_INDEX 19 -#define LEDS_BUTTON_COLOR_INDEX 0 -#define LEDS_BRIGHTNESS 2 +#define LEDS_DPAD_LEFT 0 +#define LEDS_DPAD_DOWN 1 +#define LEDS_DPAD_RIGHT 2 +#define LEDS_DPAD_UP 3 +#define LEDS_BUTTON_B3 4 +#define LEDS_BUTTON_B4 5 +#define LEDS_BUTTON_R1 6 +#define LEDS_BUTTON_L1 7 +#define LEDS_BUTTON_B1 8 +#define LEDS_BUTTON_B2 9 +#define LEDS_BUTTON_R2 10 +#define LEDS_BUTTON_L2 11 #endif \ No newline at end of file diff --git a/configs/RP2040MiniBreakoutBoardUSBPassthrough/README.md b/configs/RP2040MiniBreakoutBoardUSBPassthrough/README.md new file mode 100644 index 000000000..59b28113c --- /dev/null +++ b/configs/RP2040MiniBreakoutBoardUSBPassthrough/README.md @@ -0,0 +1,26 @@ +# GP2040 Configuration for the RP2040 Mini Breakout Board USB Passthrough + +![RP2040 RP2040 Mini Breakout Board USB Passthrough](assets/RP2040MiniBreakoutBoardUSBPassthrough.jpeg) + +## Main Pin Mapping Configuration + +| RP2040 Pin | Action | GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | +|------------|-------------------------------|--------|--------|--------|----------|--------|--------| +| GPIO_PIN_15| GpioAction::BUTTON_PRESS_UP | UP | UP | UP | UP | UP | UP | +| GPIO_PIN_14| GpioAction::BUTTON_PRESS_DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | +| GPIO_PIN_13| GpioAction::BUTTON_PRESS_RIGHT| RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | +| GPIO_PIN_12| GpioAction::BUTTON_PRESS_LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | +| GPIO_PIN_03| GpioAction::BUTTON_PRESS_B1 | B1 | A | B | Cross | 2 | K1 | +| GPIO_PIN_02| GpioAction::BUTTON_PRESS_B2 | B2 | B | A | Circle | 3 | K2 | +| GPIO_PIN_00| GpioAction::BUTTON_PRESS_R2 | R2 | RT | ZR | R2 | 8 | K3 | +| GPIO_PIN_01| GpioAction::BUTTON_PRESS_L2 | L2 | LT | ZL | L2 | 7 | K4 | +| GPIO_PIN_08| GpioAction::BUTTON_PRESS_B3 | B3 | X | Y | Square | 1 | P1 | +| GPIO_PIN_06| GpioAction::BUTTON_PRESS_B4 | B4 | Y | X | Triangle| 4 | P2 | +| GPIO_PIN_05| GpioAction::BUTTON_PRESS_R1 | R1 | RB | R | R1 | 6 | P3 | +| GPIO_PIN_04| GpioAction::BUTTON_PRESS_L1 | L1 | LB | L | L1 | 5 | P4 | +| GPIO_PIN_11| GpioAction::BUTTON_PRESS_S1 | S1 | Back | Minus | Select | 9 | Coin | +| GPIO_PIN_09| GpioAction::BUTTON_PRESS_S2 | S2 | Start | Plus | Start | 10 | Start | +| GPIO_PIN_28| GpioAction::BUTTON_PRESS_L3 | L3 | LS | LS | L3 | 11 | LS | +| GPIO_PIN_29| GpioAction::BUTTON_PRESS_R3 | R3 | RS | RS | R3 | 12 | RS | +| GPIO_PIN_10| GpioAction::BUTTON_PRESS_A1 | A1 | Guide | Home | PS | 13 | ~ | +| GPIO_PIN_27| GpioAction::BUTTON_PRESS_A2 | A2 | ~ | Capture | ~ | 14 | ~ | \ No newline at end of file diff --git a/configs/RanaTadpole/RanaTadpole.h b/configs/RP2040MiniBreakoutBoardUSBPassthrough/RP2040MiniBreakoutBoard.h similarity index 80% rename from configs/RanaTadpole/RanaTadpole.h rename to configs/RP2040MiniBreakoutBoardUSBPassthrough/RP2040MiniBreakoutBoard.h index 9aa060705..2b76f71b3 100644 --- a/configs/RanaTadpole/RanaTadpole.h +++ b/configs/RP2040MiniBreakoutBoardUSBPassthrough/RP2040MiniBreakoutBoard.h @@ -10,19 +10,21 @@ // ----------------------------------------------------- -#ifndef _BOARDS_RANATADPOLE_H -#define _BOARDS_RANATADPOLE_H +#ifndef _BOARDS_RP2040MINIBREAKOUTBOARDUSBPASSTHROUGH_H +#define _BOARDS_RP2040MINIBREAKOUTBOARDUSBPASSTHROUGH_H // For board detection -#define RANATADPOLE +#define RP2040MINIBREAKOUTBOARD //For crappy crystal #ifndef PICO_XOSC_STARTUP_DELAY_MULTIPLIER #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 #endif -// no onboard LED - +// --- LED --- +#ifndef PICO_DEFAULT_LED_PIN +#define PICO_DEFAULT_LED_PIN 25 +#endif // no PICO_DEFAULT_WS2812_PIN // --- FLASH --- diff --git a/configs/RP2040MiniBreakoutBoardUSBPassthrough/assets/RP2040MiniBreakoutBoardUSBPassthrough.jpeg b/configs/RP2040MiniBreakoutBoardUSBPassthrough/assets/RP2040MiniBreakoutBoardUSBPassthrough.jpeg new file mode 100644 index 000000000..31c390ea5 Binary files /dev/null and b/configs/RP2040MiniBreakoutBoardUSBPassthrough/assets/RP2040MiniBreakoutBoardUSBPassthrough.jpeg differ diff --git a/configs/RanaTadpole/BoardConfig.h b/configs/RanaTadpole/BoardConfig.h deleted file mode 100644 index 1f7c7480f..000000000 --- a/configs/RanaTadpole/BoardConfig.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * SPDX-License-Identifier: MIT - * SPDX-FileCopyrightText: Copyright (c) 2024 OpenStickCommunity (gp2040-ce.info) - */ - -#ifndef PICO_BOARD_CONFIG_H_ -#define PICO_BOARD_CONFIG_H_ - -#include "enums.pb.h" -#include "class/hid/hid.h" - -#define BOARD_CONFIG_LABEL "Rana Tadpole" - -// Main pin mapping Configuration -// // GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -#define GPIO_PIN_00 GpioAction::BUTTON_PRESS_UP // UP | UP | UP | UP | UP | UP | -#define GPIO_PIN_03 GpioAction::BUTTON_PRESS_DOWN // DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -#define GPIO_PIN_02 GpioAction::BUTTON_PRESS_RIGHT // RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -#define GPIO_PIN_04 GpioAction::BUTTON_PRESS_LEFT // LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -#define GPIO_PIN_26 GpioAction::BUTTON_PRESS_B1 // B1 | A | B | Cross | 2 | K1 | -#define GPIO_PIN_21 GpioAction::BUTTON_PRESS_B2 // B2 | B | A | Circle | 3 | K2 | -#define GPIO_PIN_19 GpioAction::BUTTON_PRESS_R2 // R2 | RT | ZR | R2 | 8 | K3 | -#define GPIO_PIN_17 GpioAction::BUTTON_PRESS_L2 // L2 | LT | ZL | L2 | 7 | K4 | -#define GPIO_PIN_27 GpioAction::BUTTON_PRESS_B3 // B3 | X | Y | Square | 1 | P1 | -#define GPIO_PIN_22 GpioAction::BUTTON_PRESS_B4 // B4 | Y | X | Triangle | 4 | P2 | -#define GPIO_PIN_20 GpioAction::BUTTON_PRESS_R1 // R1 | RB | R | R1 | 6 | P3 | -#define GPIO_PIN_18 GpioAction::BUTTON_PRESS_L1 // L1 | LB | L | L1 | 5 | P4 | -#define GPIO_PIN_07 GpioAction::BUTTON_PRESS_S1 // S1 | Back | Minus | Select | 9 | Coin | -#define GPIO_PIN_06 GpioAction::BUTTON_PRESS_S2 // S2 | Start | Plus | Start | 10 | Start | -#define GPIO_PIN_15 GpioAction::BUTTON_PRESS_L3 // L3 | LS | LS | L3 | 11 | LS | -#define GPIO_PIN_16 GpioAction::BUTTON_PRESS_R3 // R3 | RS | RS | R3 | 12 | RS | -#define GPIO_PIN_13 GpioAction::BUTTON_PRESS_A1 // A1 | Guide | Home | PS | 13 | ~ | -#define GPIO_PIN_12 GpioAction::BUTTON_PRESS_A2 // A2 | ~ | Capture | ~ | 14 | ~ | -#define GPIO_PIN_14 GpioAction::BUTTON_PRESS_FN // Hotkey Function | - -// Keyboard Mapping Configuration -// // GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -#define KEY_DPAD_UP HID_KEY_ARROW_UP // UP | UP | UP | UP | UP | UP | -#define KEY_DPAD_DOWN HID_KEY_ARROW_DOWN // DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -#define KEY_DPAD_RIGHT HID_KEY_ARROW_RIGHT // RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -#define KEY_DPAD_LEFT HID_KEY_ARROW_LEFT // LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -#define KEY_BUTTON_B1 HID_KEY_SHIFT_LEFT // B1 | A | B | Cross | 2 | K1 | -#define KEY_BUTTON_B2 HID_KEY_Z // B2 | B | A | Circle | 3 | K2 | -#define KEY_BUTTON_R2 HID_KEY_X // R2 | RT | ZR | R2 | 8 | K3 | -#define KEY_BUTTON_L2 HID_KEY_V // L2 | LT | ZL | L2 | 7 | K4 | -#define KEY_BUTTON_B3 HID_KEY_CONTROL_LEFT // B3 | X | Y | Square | 1 | P1 | -#define KEY_BUTTON_B4 HID_KEY_ALT_LEFT // B4 | Y | X | Triangle | 4 | P2 | -#define KEY_BUTTON_R1 HID_KEY_SPACE // R1 | RB | R | R1 | 6 | P3 | -#define KEY_BUTTON_L1 HID_KEY_C // L1 | LB | L | L1 | 5 | P4 | -#define KEY_BUTTON_S1 HID_KEY_5 // S1 | Back | Minus | Select | 9 | Coin | -#define KEY_BUTTON_S2 HID_KEY_1 // S2 | Start | Plus | Start | 10 | Start | -#define KEY_BUTTON_L3 HID_KEY_EQUAL // L3 | LS | LS | L3 | 11 | LS | -#define KEY_BUTTON_R3 HID_KEY_MINUS // R3 | RS | RS | R3 | 12 | RS | -#define KEY_BUTTON_A1 HID_KEY_9 // A1 | Guide | Home | PS | 13 | ~ | -#define KEY_BUTTON_A2 HID_KEY_F2 // A2 | ~ | Capture | ~ | 14 | ~ | -#define KEY_BUTTON_FN -1 // Hotkey Function | - -#define GPIO_PIN_05 GpioAction::BUTTON_PRESS_L3 - -#endif \ No newline at end of file diff --git a/configs/RanaTadpole/README.md b/configs/RanaTadpole/README.md deleted file mode 100644 index d8761a51f..000000000 --- a/configs/RanaTadpole/README.md +++ /dev/null @@ -1,35 +0,0 @@ -# GP2040 Configuration for the Rana Tadpole - -![Rana Tadpole 1](assets/RanaTadpole1.jpg) -![Rana Tadpole 2](assets/RanaTadpole2.jpg) - -Basic button setup for the Rana Tadpole. - -![Buttons](assets/RanaTadpole_buttons.png) - -GitHub repo for the Tadpole: - - -## Main Pin Mapping Configuration - -| RP2040 Pin | Action | GP2040 | Xinput | Switch | PS3/4/5 | Dinput | Arcade | -|------------|-------------------------------|--------|--------|--------|----------|--------|--------| -| GPIO_PIN_00| GpioAction::BUTTON_PRESS_UP | UP | UP | UP | UP | UP | UP | -| GPIO_PIN_03| GpioAction::BUTTON_PRESS_DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | DOWN | -| GPIO_PIN_02| GpioAction::BUTTON_PRESS_RIGHT| RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | RIGHT | -| GPIO_PIN_04| GpioAction::BUTTON_PRESS_LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | LEFT | -| GPIO_PIN_26| GpioAction::BUTTON_PRESS_B1 | B1 | A | B | Cross | 2 | K1 | -| GPIO_PIN_21| GpioAction::BUTTON_PRESS_B2 | B2 | B | A | Circle | 3 | K2 | -| GPIO_PIN_19| GpioAction::BUTTON_PRESS_R2 | R2 | RT | ZR | R2 | 8 | K3 | -| GPIO_PIN_17| GpioAction::BUTTON_PRESS_L2 | L2 | LT | ZL | L2 | 7 | K4 | -| GPIO_PIN_27| GpioAction::BUTTON_PRESS_B3 | B3 | X | Y | Square | 1 | P1 | -| GPIO_PIN_22| GpioAction::BUTTON_PRESS_B4 | B4 | Y | X | Triangle| 4 | P2 | -| GPIO_PIN_20| GpioAction::BUTTON_PRESS_R1 | R1 | RB | R | R1 | 6 | P3 | -| GPIO_PIN_18| GpioAction::BUTTON_PRESS_L1 | L1 | LB | L | L1 | 5 | P4 | -| GPIO_PIN_07| GpioAction::BUTTON_PRESS_S1 | S1 | Back | Minus | Select | 9 | Coin | -| GPIO_PIN_06| GpioAction::BUTTON_PRESS_S2 | S2 | Start | Plus | Start | 10 | Start | -| GPIO_PIN_15| GpioAction::BUTTON_PRESS_L3 | L3 | LS | LS | L3 | 11 | LS | -| GPIO_PIN_16| GpioAction::BUTTON_PRESS_R3 | R3 | RS | RS | R3 | 12 | RS | -| GPIO_PIN_13| GpioAction::BUTTON_PRESS_A1 | A1 | Guide | Home | PS | 13 | ~ | -| GPIO_PIN_12| GpioAction::BUTTON_PRESS_A2 | A2 | ~ | Capture | ~ | 14 | ~ | -| GPIO_PIN_14| GpioAction::BUTTON_PRESS_FN | Hotkey Function | \ No newline at end of file diff --git a/configs/RanaTadpole/assets/RanaTadpole1.jpg b/configs/RanaTadpole/assets/RanaTadpole1.jpg deleted file mode 100644 index aa096cb1a..000000000 Binary files a/configs/RanaTadpole/assets/RanaTadpole1.jpg and /dev/null differ diff --git a/configs/RanaTadpole/assets/RanaTadpole2.jpg b/configs/RanaTadpole/assets/RanaTadpole2.jpg deleted file mode 100644 index 42f5f053c..000000000 Binary files a/configs/RanaTadpole/assets/RanaTadpole2.jpg and /dev/null differ diff --git a/configs/RanaTadpole/assets/RanaTadpole_buttons.png b/configs/RanaTadpole/assets/RanaTadpole_buttons.png deleted file mode 100644 index eded53fae..000000000 Binary files a/configs/RanaTadpole/assets/RanaTadpole_buttons.png and /dev/null differ