Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Driver Input Updates & Auth Mechanisms (UI & FW) #890

Merged
merged 39 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a446414
[ImgBot] Optimize images
ImgBotApp Feb 5, 2024
df2e3ec
Merge pull request #8 from arntsonl/imgbot
arntsonl Feb 8, 2024
baa61e6
Merge branch 'OpenStickCommunity:main' into main
arntsonl Feb 8, 2024
9ddf6cd
Merge branch 'main' of https://github.com/arntsonl/GP2040-CE
arntsonl Feb 17, 2024
96fe38c
Doesn't compile yet but this is the start of the input auth code
arntsonl Feb 24, 2024
ce37239
Merge branch 'OpenStickCommunity:main' into 20240217_inputauth_moved
arntsonl Feb 24, 2024
664b4f8
Merge branch 'OpenStickCommunity:main' into 20240217_inputauth_moved
arntsonl Feb 26, 2024
1408316
Moving add-ons over to drivers for authentication, added a special ca…
arntsonl Feb 26, 2024
d9e212e
Merge branch '20240217_inputauth_moved' of https://github.com/arntson…
arntsonl Feb 26, 2024
55bef1c
Merge branch 'OpenStickCommunity:main' into 20240217_inputauth_moved
arntsonl Feb 26, 2024
6a02019
Merge branch '20240217_inputauth_moved' of https://github.com/arntson…
arntsonl Feb 27, 2024
bdf2356
Merge branch '20240217_inputauth_moved' into 2024_inputauthfix
arntsonl Feb 28, 2024
664b421
Merge pull request #9 from arntsonl/2024_inputauthfix
arntsonl Feb 28, 2024
e3b111f
Merge branch '20240217_inputauth_moved' of https://github.com/arntson…
arntsonl Feb 28, 2024
84acdbf
Updates for all drivers and config utils, removed ps4 report hack, lo…
arntsonl Feb 29, 2024
05b5354
Large amount of changes to remove authentication add-ons and move eve…
arntsonl Mar 8, 2024
9893239
Moved reset auth to where it should be. Updated web page to work with…
arntsonl Mar 10, 2024
c1ea01e
Xbox One auth is now working. Added a XBON* to XBONE transition on di…
arntsonl Mar 11, 2024
946e0ec
Merge branch 'OpenStickCommunity:main' into 20240217_inputauth_moved
arntsonl Mar 11, 2024
64d71ae
Required with new changes
arntsonl Mar 11, 2024
b6537ea
huh, this one was missed
arntsonl Mar 11, 2024
0827f6a
Updated our X-Input auth listener, we can now mount/unmount the dongle!
arntsonl Mar 11, 2024
1c154d6
Merge branch 'OpenStickCommunity:main' into 20240217_inputauth_moved
arntsonl Mar 11, 2024
d067c36
First start of X-Input Auth for passthrough
arntsonl Mar 13, 2024
2b01997
Patching out auth to get a PR going
arntsonl Mar 13, 2024
e303a28
Small www fix for x-input auth removal
arntsonl Mar 13, 2024
05793ec
Merge branch '20240217_inputauth_moved' into inputauth_update
arntsonl Mar 20, 2024
b7efe14
Merge pull request #11 from arntsonl/inputauth_update
arntsonl Mar 20, 2024
12b39a5
Fix to make this compile and moved keyboard host update over to listener
arntsonl Mar 20, 2024
8ed5828
This cleans up most of the remnants from ps passthrough, ps4 mode, an…
arntsonl Mar 20, 2024
9601458
Delete src/addons/display.cpp.bak
arntsonl Mar 21, 2024
f9ca848
So many tabs and spaces mixed together. Converted to spaces for now u…
arntsonl Mar 21, 2024
739f0c4
Memory issue with XGIP protocol reset, caused crashing in Xbox One
arntsonl Mar 22, 2024
2053d17
Added define LEDS_PRESS_COLOR_COOLDOWN_TIME for the LED cooldown time…
arntsonl Mar 22, 2024
37ea5dc
Gamepad Settings & Input Mode Settings rearrange
arntsonl Mar 22, 2024
3dfa778
Fixed a strange web-config reboot bug with XGIP protocol
arntsonl Mar 22, 2024
cb380ec
Reduced profile display to 2 seconds, added a check for display list …
arntsonl Mar 22, 2024
588793c
Xbox One would not auth because I missed "get_descriptor_string_cb" f…
arntsonl Mar 22, 2024
c687612
Rewrote Xbox One guide button logic to properly check for USB-send co…
arntsonl Mar 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,22 @@ src/drivers/mdmini/MDMiniDriver.cpp
src/drivers/neogeo/NeoGeoDriver.cpp
src/drivers/net/NetDriver.cpp
src/drivers/pcengine/PCEngineDriver.cpp
src/drivers/ps4/PS4Auth.cpp
src/drivers/ps4/PS4AuthUSBListener.cpp
src/drivers/ps4/PS4Driver.cpp
src/drivers/psclassic/PSClassicDriver.cpp
src/drivers/switch/SwitchDriver.cpp
src/drivers/xbone/XBOneAuth.cpp
src/drivers/xbone/XBOneAuthUSBListener.cpp
src/drivers/xbone/XBOneDriver.cpp
src/drivers/xboxog/xid/xid_driver.c
src/drivers/xboxog/xid/xid_gamepad.c
src/drivers/xboxog/xid/xid_remote.c
src/drivers/xboxog/xid/xid_steelbattalion.c
src/drivers/xboxog/xid/xid.c
src/drivers/xboxog/XboxOriginalDriver.cpp
src/drivers/xinput/XInputAuth.cpp
src/drivers/xinput/XInputAuthUSBListener.cpp
src/drivers/xinput/XInputDriver.cpp
src/interfaces/i2c/ssd1306/obd_ssd1306.cpp
src/interfaces/i2c/ssd1306/tiny_ssd1306.cpp
Expand Down Expand Up @@ -198,14 +204,13 @@ src/addons/focus_mode.cpp
src/addons/buzzerspeaker.cpp
src/addons/dualdirectional.cpp
src/addons/keyboard_host.cpp
src/addons/keyboard_host_listener.cpp
src/addons/i2canalog1219.cpp
src/addons/jslider.cpp
src/addons/display.cpp
src/addons/neopicoleds.cpp
src/addons/playernum.cpp
src/addons/playerleds.cpp
src/addons/ps4mode.cpp
src/addons/pspassthrough.cpp
src/addons/rotaryencoder.cpp
src/addons/reverse.cpp
src/addons/turbo.cpp
Expand All @@ -214,7 +219,6 @@ src/addons/wiiext.cpp
src/addons/input_macro.cpp
src/addons/snes_input.cpp
src/addons/tilt.cpp
src/addons/xbonepassthrough.cpp
src/addons/spi_analog_ads1256.cpp
${PROTO_OUTPUT_DIR}/enums.pb.c
${PROTO_OUTPUT_DIR}/config.pb.c
Expand Down
1 change: 1 addition & 0 deletions configs/BentoBox/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "BentoBox"

Expand Down
1 change: 1 addition & 0 deletions configs/FightboardV3/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Fightboard V3"

Expand Down
1 change: 1 addition & 0 deletions configs/FightboardV3Mirrored/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Fightboard V3 Mirrored"

Expand Down
1 change: 1 addition & 0 deletions configs/FlatboxRev4/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define FLATBOX_REV4_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Flatbox Rev. 4"

Expand Down
1 change: 1 addition & 0 deletions configs/FlatboxRev5/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define FLATBOX_REV5_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Flatbox Rev. 5"

Expand Down
1 change: 1 addition & 0 deletions configs/FlatboxRev5RGB/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define FLATBOX_REV5_RGB_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Flatbox Rev. 5 RGB"

Expand Down
1 change: 1 addition & 0 deletions configs/FlatboxRev5Southpaw/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define FLATBOX_REV5_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Flatbox Rev. 5 Southpaw"

Expand Down
7 changes: 3 additions & 4 deletions configs/Granola/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Granola Arcade"

Expand Down Expand Up @@ -63,13 +64,11 @@
#define KEY_BUTTON_FN -1 // Hotkey Function |

#define DEFAULT_INPUT_MODE_R1 INPUT_MODE_XBONE
#define DEFAULT_PS4CONTROLLER_TYPE PS4_ARCADESTICK
#define DEFAULT_INPUT_MODE_B4 INPUT_MODE_PS5
#define DEFAULT_PS5AUTHENTICATION_TYPE INPUT_MODE_AUTH_TYPE_USB

#define USB_PERIPHERAL_ENABLED 1
#define USB_PERIPHERAL_PIN_DPLUS 28
#define USB_PERIPHERAL_PIN_ORDER 0

#define PSPASSTHROUGH_ENABLED 1
#define XBONEPASSTHROUGH_ENABLED 1

#endif
17 changes: 8 additions & 9 deletions configs/Haute42/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Haute 42"

Expand Down Expand Up @@ -53,8 +54,13 @@
#define KEY_BUTTON_A2 HID_KEY_F2 // A2 | ~ | Capture | ~ | 14 | ~ |
#define KEY_BUTTON_FN -1 // Hotkey Function |

#define USB_PERIPHERAL_ENABLED 1
#define USB_PERIPHERAL_PIN_DPLUS 23
#define USB_PERIPHERAL_PIN_ORDER 0

#define DEFAULT_INPUT_MODE_R1 INPUT_MODE_XBONE
#define DEFAULT_PS4CONTROLLER_TYPE PS4_ARCADESTICK
#define DEFAULT_INPUT_MODE_B4 INPUT_MODE_PS5
#define DEFAULT_PS5AUTHENTICATION_TYPE INPUT_MODE_AUTH_TYPE_USB

#define TURBO_ENABLED 1
#define GPIO_PIN_14 GpioAction::BUTTON_PRESS_TURBO
Expand Down Expand Up @@ -95,15 +101,8 @@
#define GPIO_PIN_27 GpioAction::BUTTON_PRESS_UP
#define GPIO_PIN_26 GpioAction::BUTTON_PRESS_L3

#define USB_PERIPHERAL_ENABLED 1
#define USB_PERIPHERAL_PIN_DPLUS 23
#define USB_PERIPHERAL_PIN_ORDER 0

// Keyboard Host enabled by default
#define KEYBOARD_HOST_ENABLED 1
#define KEYBOARD_HOST_PIN_DPLUS 23

#define PSPASSTHROUGH_ENABLED 1
#define XBONEPASSTHROUGH_ENABLED 1

#define BOARD_LED_ENABLED 1
#define BOARD_LED_TYPE ON_BOARD_LED_MODE_MODE_INDICATOR
Expand Down
2 changes: 2 additions & 0 deletions configs/KB2040/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

#ifndef PICO_BOARD_CONFIG_H_
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "KB2040"

Expand Down
1 change: 1 addition & 0 deletions configs/KeyboardConverter/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Keyboard Converter"

Expand Down
1 change: 1 addition & 0 deletions configs/Liatris/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Liatris"

Expand Down
1 change: 1 addition & 0 deletions configs/Mavercade/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define MAVERCADE_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Mavercade"

Expand Down
10 changes: 5 additions & 5 deletions configs/OpenCore0/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Open_Core0"

Expand Down Expand Up @@ -65,9 +66,12 @@
#define GPIO_PIN_22 GpioAction::SUSTAIN_SOCD_MODE_SECOND_WIN
#define SLIDER_SOCD_SLOT_DEFAULT SOCD_MODE_NEUTRAL

#define DEFAULT_PS4CONTROLLER_TYPE PS4_ARCADESTICK
#define USB_PERIPHERAL_ENABLED 1
#define USB_PERIPHERAL_PIN_DPLUS 28

#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 BOARD_LEDS_PIN 8

Expand Down Expand Up @@ -115,9 +119,5 @@
#define FOCUS_MODE_PIN 21
#define FOCUS_MODE_BUTTON_LOCK_ENABLED 1

#define PSPASSTHROUGH_ENABLED 1
#define PSPASSTHROUGH_PIN_DPLUS 28

#define XBONEPASSTHROUGH_ENABLED 1

#endif
11 changes: 6 additions & 5 deletions configs/OpenCore0WASD/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Open_Core0 WASD"

Expand Down Expand Up @@ -53,9 +54,13 @@
#define KEY_BUTTON_A2 HID_KEY_F2 // A2 | ~ | Capture | ~ | 14 | ~ |
#define KEY_BUTTON_FN -1 // Hotkey Function |

#define DEFAULT_PS4CONTROLLER_TYPE PS4_ARCADESTICK

#define USB_PERIPHERAL_ENABLED 1
#define USB_PERIPHERAL_PIN_DPLUS 28

#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 TURBO_ENABLED 1
#define GPIO_PIN_27 GpioAction::BUTTON_PRESS_TURBO
Expand Down Expand Up @@ -112,9 +117,5 @@
#define FOCUS_MODE_PIN 22
#define FOCUS_MODE_BUTTON_LOCK_ENABLED 1

#define PSPASSTHROUGH_ENABLED 1
#define PSPASSTHROUGH_PIN_DPLUS 28

#define XBONEPASSTHROUGH_ENABLED 1

#endif
1 change: 1 addition & 0 deletions configs/Pico/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Pico"

Expand Down
1 change: 1 addition & 0 deletions configs/PicoAnn/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICOANN_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Pico Ann"

Expand Down
1 change: 1 addition & 0 deletions configs/PicoFightingBoard/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Pico Fighting Board"

Expand Down
1 change: 1 addition & 0 deletions configs/PicoW/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICOW_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Pico-W"

Expand Down
1 change: 1 addition & 0 deletions configs/RP2040AdvancedBreakoutBoard/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "RP2040 Advanced Breakout Board"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "RP2040 Advanced Breakout Board - USB Passthrough"

Expand Down Expand Up @@ -76,9 +77,11 @@
#define I2C0_PIN_SCL 1
#define DISPLAY_I2C_BLOCK i2c0

#define PSPASSTHROUGH_ENABLED 1
#define PSPASSTHROUGH_PIN_DPLUS 23
#define USB_PERIPHERAL_ENABLED 1
#define USB_PERIPHERAL_PIN_DPLUS 23

#define XBONEPASSTHROUGH_ENABLED 1
#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

#endif
1 change: 1 addition & 0 deletions configs/RP2040MiniBreakoutBoard/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "RP2040 Mini Breakout Board"

Expand Down
1 change: 1 addition & 0 deletions configs/RanaTadpole/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Rana Tadpole"

Expand Down
1 change: 1 addition & 0 deletions configs/ReflexCtrlSNES/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Reflex Ctrl SNES"

Expand Down
1 change: 1 addition & 0 deletions configs/ReflexEncodeV1.2/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Reflex Encode v1.2"

Expand Down
12 changes: 6 additions & 6 deletions configs/ReflexEncodeV2.0/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PICO_BOARD_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "Reflex Encode v2.0"

Expand Down Expand Up @@ -54,14 +55,13 @@
#define KEY_BUTTON_A2 HID_KEY_F2 // A2 | ~ | Capture | ~ | 14 | ~ |
#define KEY_BUTTON_FN -1 // Hotkey Function |

#define DEFAULT_PS4CONTROLLER_TYPE PS4_ARCADESTICK
#define DEFAULT_INPUT_MODE INPUT_MODE_PS4
#define PSPASSTHROUGH_ENABLED 1
#define PSPASSTHROUGH_PIN_DPLUS 14

#define XBONEPASSTHROUGH_ENABLED 1
#define USB_PERIPHERAL_ENABLED 1
#define USB_PERIPHERAL_PIN_DPLUS 14

#define DEFAULT_INPUT_MODE INPUT_MODE_PS5
#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 TURBO_ENABLED 1
#define GPIO_PIN_29 GpioAction::BUTTON_PRESS_TURBO
Expand Down
1 change: 1 addition & 0 deletions configs/SGFBridget/BoardConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define SGF_DEVICES_CONFIG_H_

#include "enums.pb.h"
#include "class/hid/hid.h"

#define BOARD_CONFIG_LABEL "SGF Bridget"

Expand Down
Loading