Compare commits

...

2 Commits

Author SHA1 Message Date
Brian S. Stephan a1a3ebbbac
requirements bumps
Signed-off-by: Brian S. Stephan <bss@incorporeal.org>
2024-04-08 09:07:50 -05:00
Brian S. Stephan 3e8209e2a5
update .proto snapshot for v0.7.8
this also clarifies the docs a bit regarding versions supported.

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>
2024-04-08 09:07:47 -05:00
12 changed files with 1520 additions and 1161 deletions

View File

@ -201,8 +201,15 @@ forcedSetupOptions {
The GP2040-CE configuration is still changing, so the tools are changing accordingly. This project doesn't currently make
a huge effort to be backwards compatible, so instead, refer to this:
* `gp2040ce-binary-tools >=v0.5.1` supports `GP2040-CE >=v0.7.5`.
* `gp2040ce-binary-tools <=v0.5.0` supported `GP2040-CE <v0.7.5`.
#### Flash Layouts
* `gp2040ce-binary-tools >=v0.6.0` supports both board and user configs still being developed in `GP2040-CE`.
* `gp2040ce-binary-tools >=v0.5.1` supported the increased user config size in `GP2040-CE >=v0.7.5`.
* `gp2040ce-binary-tools <=v0.5.0` supported the smaller user config size in `GP2040-CE <v0.7.5`.
#### Config Structures
The latest update of the configuration snapshot is from **v0.7.8-RC2**.
### Dumping the GP2040-CE board with picotool

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -20,6 +20,20 @@ enum ButtonLayout
BUTTON_LAYOUT_FIGHTBOARD_MIRRORED = 11;
BUTTON_LAYOUT_CUSTOMA = 12;
BUTTON_LAYOUT_OPENCORE0WASDA = 13;
BUTTON_LAYOUT_STICKLESS_13 = 14;
BUTTON_LAYOUT_STICKLESS_16 = 15;
BUTTON_LAYOUT_STICKLESS_14 = 16;
BUTTON_LAYOUT_DANCEPAD_DDR_LEFT = 17;
BUTTON_LAYOUT_DANCEPAD_DDR_SOLO = 18;
BUTTON_LAYOUT_DANCEPAD_PIU_LEFT = 19;
BUTTON_LAYOUT_POPN_A = 20;
BUTTON_LAYOUT_TAIKO_A = 21;
BUTTON_LAYOUT_BM_TURNTABLE_A = 22;
BUTTON_LAYOUT_BM_5KEY_A = 23;
BUTTON_LAYOUT_BM_7KEY_A = 24;
BUTTON_LAYOUT_GITADORA_FRET_A = 25;
BUTTON_LAYOUT_GITADORA_STRUM_A = 26;
BUTTON_LAYOUT_BOARD_DEFINED_A = 27;
}
enum ButtonLayoutRight
@ -45,6 +59,19 @@ enum ButtonLayoutRight
BUTTON_LAYOUT_CUSTOMB = 16;
BUTTON_LAYOUT_KEYBOARD8B = 17;
BUTTON_LAYOUT_OPENCORE0WASDB = 18;
BUTTON_LAYOUT_STICKLESS_13B = 19;
BUTTON_LAYOUT_STICKLESS_16B = 20;
BUTTON_LAYOUT_STICKLESS_14B = 21;
BUTTON_LAYOUT_DANCEPAD_DDR_RIGHT = 22;
BUTTON_LAYOUT_DANCEPAD_PIU_RIGHT = 23;
BUTTON_LAYOUT_POPN_B = 24;
BUTTON_LAYOUT_TAIKO_B = 25;
BUTTON_LAYOUT_BM_TURNTABLE_B = 26;
BUTTON_LAYOUT_BM_5KEY_B = 27;
BUTTON_LAYOUT_BM_7KEY_B = 28;
BUTTON_LAYOUT_GITADORA_FRET_B = 29;
BUTTON_LAYOUT_GITADORA_STRUM_B = 30;
BUTTON_LAYOUT_BOARD_DEFINED_B = 31;
}
enum SplashMode
@ -96,9 +123,20 @@ enum InputMode
INPUT_MODE_ASTRO = 10;
INPUT_MODE_PSCLASSIC = 11;
INPUT_MODE_XBOXORIGINAL = 12;
INPUT_MODE_PS5 = 13;
INPUT_MODE_CONFIG = 255;
}
enum InputModeAuthType
{
option (nanopb_enumopt).long_names = false;
INPUT_MODE_AUTH_TYPE_NONE = 0;
INPUT_MODE_AUTH_TYPE_KEYS = 1;
INPUT_MODE_AUTH_TYPE_USB = 2;
INPUT_MODE_AUTH_TYPE_I2C = 3;
}
enum DpadMode
{
option (nanopb_enumopt).long_names = false;
@ -169,6 +207,14 @@ enum GpioAction
SUSTAIN_SOCD_MODE_SECOND_WIN = 29;
SUSTAIN_SOCD_MODE_FIRST_WIN = 30;
SUSTAIN_SOCD_MODE_BYPASS = 31;
BUTTON_PRESS_TURBO = 32;
BUTTON_PRESS_MACRO = 33;
BUTTON_PRESS_MACRO_1 = 34;
BUTTON_PRESS_MACRO_2 = 35;
BUTTON_PRESS_MACRO_3 = 36;
BUTTON_PRESS_MACRO_4 = 37;
BUTTON_PRESS_MACRO_5 = 38;
BUTTON_PRESS_MACRO_6 = 39;
}
enum GamepadHotkey
@ -248,6 +294,16 @@ enum ForcedSetupMode
FORCED_SETUP_MODE_LOCK_BOTH = 3;
};
enum DualDirectionalCombinationMode
{
option (nanopb_enumopt).long_names = false;
MIXED_MODE = 0;
GAMEPAD_MODE = 1;
DUAL_MODE = 2;
NONE_MODE = 3;
}
enum PS4ControllerType
{
option (nanopb_enumopt).long_names = false;
@ -264,3 +320,44 @@ enum MacroType
ON_HOLD_REPEAT = 2;
ON_TOGGLE = 3;
};
enum GPElement
{
option (nanopb_enumopt).long_names = false;
GP_ELEMENT_WIDGET = 0;
GP_ELEMENT_SCREEN = 1;
GP_ELEMENT_BTN_BUTTON = 2;
GP_ELEMENT_DIR_BUTTON = 3;
GP_ELEMENT_PIN_BUTTON = 4;
GP_ELEMENT_LEVER = 5;
GP_ELEMENT_LABEL = 6;
GP_ELEMENT_SPRITE = 7;
GP_ELEMENT_SHAPE = 8;
};
enum GPShape_Type
{
option (nanopb_enumopt).long_names = false;
GP_SHAPE_ELLIPSE = 0;
GP_SHAPE_SQUARE = 1;
GP_SHAPE_DIAMOND = 2;
GP_SHAPE_POLYGON = 3;
GP_SHAPE_ARC = 4;
};
enum RotaryEncoderPinMode
{
option (nanopb_enumopt).long_names = false;
ENCODER_MODE_NONE = 0;
ENCODER_MODE_LEFT_ANALOG_X = 1;
ENCODER_MODE_LEFT_ANALOG_Y = 2;
ENCODER_MODE_RIGHT_ANALOG_X = 3;
ENCODER_MODE_RIGHT_ANALOG_Y = 4;
ENCODER_MODE_LEFT_TRIGGER = 5;
ENCODER_MODE_RIGHT_TRIGGER = 6;
ENCODER_MODE_DPAD_X = 7;
ENCODER_MODE_DPAD_Y = 8;
};

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --extra=dev --output-file=requirements/requirements-dev.txt pyproject.toml
# pip-compile --extra=dev --output-file=requirements/requirements-dev.txt
#
aiohttp==3.9.3
# via textual-dev
@ -12,7 +12,7 @@ attrs==23.2.0
# via aiohttp
bandit==1.7.8
# via gp2040ce-binary-tools (pyproject.toml)
build==1.1.1
build==1.2.1
# via pip-tools
cachetools==5.3.3
# via tox
@ -24,13 +24,13 @@ click==8.1.7
# textual-dev
colorama==0.4.6
# via tox
coverage[toml]==7.4.3
coverage[toml]==7.4.4
# via pytest-cov
decorator==5.1.1
# via gp2040ce-binary-tools (pyproject.toml)
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
@ -45,7 +45,7 @@ flake8==7.0.0
# gp2040ce-binary-tools (pyproject.toml)
flake8-blind-except==0.2.1
# via gp2040ce-binary-tools (pyproject.toml)
flake8-builtins==2.2.0
flake8-builtins==2.4.0
# via gp2040ce-binary-tools (pyproject.toml)
flake8-docstrings==1.7.0
# via gp2040ce-binary-tools (pyproject.toml)
@ -138,9 +138,9 @@ pytest==8.1.1
# gp2040ce-binary-tools (pyproject.toml)
# pytest-asyncio
# pytest-cov
pytest-asyncio==0.23.5.post1
pytest-asyncio==0.23.6
# via gp2040ce-binary-tools (pyproject.toml)
pytest-cov==4.1.0
pytest-cov==5.0.0
# via gp2040ce-binary-tools (pyproject.toml)
pyusb==1.2.1
# via gp2040ce-binary-tools (pyproject.toml)
@ -156,15 +156,15 @@ snowballstemmer==2.2.0
# via pydocstyle
stevedore==5.2.0
# via bandit
textual==0.52.1
textual==0.56.2
# via
# gp2040ce-binary-tools (pyproject.toml)
# textual-dev
textual-dev==1.5.1
# via gp2040ce-binary-tools (pyproject.toml)
tox==4.14.1
tox==4.14.2
# via gp2040ce-binary-tools (pyproject.toml)
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# mypy
# setuptools-scm

View File

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements/requirements.txt pyproject.toml
# pip-compile --output-file=requirements/requirements.txt
#
grpcio==1.62.1
# via grpcio-tools
@ -27,9 +27,9 @@ pyusb==1.2.1
# via gp2040ce-binary-tools (pyproject.toml)
rich==13.7.1
# via textual
textual==0.52.1
textual==0.56.2
# via gp2040ce-binary-tools (pyproject.toml)
typing-extensions==4.10.0
typing-extensions==4.11.0
# via textual
uc-micro-py==1.0.3
# via linkify-it-py

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -20,6 +20,20 @@ enum ButtonLayout
BUTTON_LAYOUT_FIGHTBOARD_MIRRORED = 11;
BUTTON_LAYOUT_CUSTOMA = 12;
BUTTON_LAYOUT_OPENCORE0WASDA = 13;
BUTTON_LAYOUT_STICKLESS_13 = 14;
BUTTON_LAYOUT_STICKLESS_16 = 15;
BUTTON_LAYOUT_STICKLESS_14 = 16;
BUTTON_LAYOUT_DANCEPAD_DDR_LEFT = 17;
BUTTON_LAYOUT_DANCEPAD_DDR_SOLO = 18;
BUTTON_LAYOUT_DANCEPAD_PIU_LEFT = 19;
BUTTON_LAYOUT_POPN_A = 20;
BUTTON_LAYOUT_TAIKO_A = 21;
BUTTON_LAYOUT_BM_TURNTABLE_A = 22;
BUTTON_LAYOUT_BM_5KEY_A = 23;
BUTTON_LAYOUT_BM_7KEY_A = 24;
BUTTON_LAYOUT_GITADORA_FRET_A = 25;
BUTTON_LAYOUT_GITADORA_STRUM_A = 26;
BUTTON_LAYOUT_BOARD_DEFINED_A = 27;
}
enum ButtonLayoutRight
@ -45,6 +59,19 @@ enum ButtonLayoutRight
BUTTON_LAYOUT_CUSTOMB = 16;
BUTTON_LAYOUT_KEYBOARD8B = 17;
BUTTON_LAYOUT_OPENCORE0WASDB = 18;
BUTTON_LAYOUT_STICKLESS_13B = 19;
BUTTON_LAYOUT_STICKLESS_16B = 20;
BUTTON_LAYOUT_STICKLESS_14B = 21;
BUTTON_LAYOUT_DANCEPAD_DDR_RIGHT = 22;
BUTTON_LAYOUT_DANCEPAD_PIU_RIGHT = 23;
BUTTON_LAYOUT_POPN_B = 24;
BUTTON_LAYOUT_TAIKO_B = 25;
BUTTON_LAYOUT_BM_TURNTABLE_B = 26;
BUTTON_LAYOUT_BM_5KEY_B = 27;
BUTTON_LAYOUT_BM_7KEY_B = 28;
BUTTON_LAYOUT_GITADORA_FRET_B = 29;
BUTTON_LAYOUT_GITADORA_STRUM_B = 30;
BUTTON_LAYOUT_BOARD_DEFINED_B = 31;
}
enum SplashMode
@ -96,9 +123,20 @@ enum InputMode
INPUT_MODE_ASTRO = 10;
INPUT_MODE_PSCLASSIC = 11;
INPUT_MODE_XBOXORIGINAL = 12;
INPUT_MODE_PS5 = 13;
INPUT_MODE_CONFIG = 255;
}
enum InputModeAuthType
{
option (nanopb_enumopt).long_names = false;
INPUT_MODE_AUTH_TYPE_NONE = 0;
INPUT_MODE_AUTH_TYPE_KEYS = 1;
INPUT_MODE_AUTH_TYPE_USB = 2;
INPUT_MODE_AUTH_TYPE_I2C = 3;
}
enum DpadMode
{
option (nanopb_enumopt).long_names = false;
@ -169,6 +207,14 @@ enum GpioAction
SUSTAIN_SOCD_MODE_SECOND_WIN = 29;
SUSTAIN_SOCD_MODE_FIRST_WIN = 30;
SUSTAIN_SOCD_MODE_BYPASS = 31;
BUTTON_PRESS_TURBO = 32;
BUTTON_PRESS_MACRO = 33;
BUTTON_PRESS_MACRO_1 = 34;
BUTTON_PRESS_MACRO_2 = 35;
BUTTON_PRESS_MACRO_3 = 36;
BUTTON_PRESS_MACRO_4 = 37;
BUTTON_PRESS_MACRO_5 = 38;
BUTTON_PRESS_MACRO_6 = 39;
}
enum GamepadHotkey
@ -248,6 +294,16 @@ enum ForcedSetupMode
FORCED_SETUP_MODE_LOCK_BOTH = 3;
};
enum DualDirectionalCombinationMode
{
option (nanopb_enumopt).long_names = false;
MIXED_MODE = 0;
GAMEPAD_MODE = 1;
DUAL_MODE = 2;
NONE_MODE = 3;
}
enum PS4ControllerType
{
option (nanopb_enumopt).long_names = false;
@ -264,3 +320,44 @@ enum MacroType
ON_HOLD_REPEAT = 2;
ON_TOGGLE = 3;
};
enum GPElement
{
option (nanopb_enumopt).long_names = false;
GP_ELEMENT_WIDGET = 0;
GP_ELEMENT_SCREEN = 1;
GP_ELEMENT_BTN_BUTTON = 2;
GP_ELEMENT_DIR_BUTTON = 3;
GP_ELEMENT_PIN_BUTTON = 4;
GP_ELEMENT_LEVER = 5;
GP_ELEMENT_LABEL = 6;
GP_ELEMENT_SPRITE = 7;
GP_ELEMENT_SHAPE = 8;
};
enum GPShape_Type
{
option (nanopb_enumopt).long_names = false;
GP_SHAPE_ELLIPSE = 0;
GP_SHAPE_SQUARE = 1;
GP_SHAPE_DIAMOND = 2;
GP_SHAPE_POLYGON = 3;
GP_SHAPE_ARC = 4;
};
enum RotaryEncoderPinMode
{
option (nanopb_enumopt).long_names = false;
ENCODER_MODE_NONE = 0;
ENCODER_MODE_LEFT_ANALOG_X = 1;
ENCODER_MODE_LEFT_ANALOG_Y = 2;
ENCODER_MODE_RIGHT_ANALOG_X = 3;
ENCODER_MODE_RIGHT_ANALOG_Y = 4;
ENCODER_MODE_LEFT_TRIGGER = 5;
ENCODER_MODE_RIGHT_TRIGGER = 6;
ENCODER_MODE_DPAD_X = 7;
ENCODER_MODE_DPAD_Y = 8;
};

View File

@ -308,7 +308,7 @@
},
"turboOptions": {
"enabled": false,
"buttonPin": -1,
"deprecatedButtonPin": -1,
"ledPin": -1,
"shotCount": 15,
"shmupDialPin": -1,
@ -644,14 +644,14 @@
},
"macroOptions": {
"enabled": false,
"pin": -1,
"deprecatedPin": -1,
"macroList": [
{
"macroType": "ON_PRESS",
"macroLabel": "",
"enabled": false,
"useMacroTriggerButton": false,
"macroTriggerPin": -1,
"deprecatedMacroTriggerPin": -1,
"macroTriggerButton": 0,
"exclusive": true,
"interruptible": true,
@ -662,7 +662,7 @@
"macroLabel": "",
"enabled": false,
"useMacroTriggerButton": false,
"macroTriggerPin": -1,
"deprecatedMacroTriggerPin": -1,
"macroTriggerButton": 0,
"exclusive": true,
"interruptible": true,
@ -673,7 +673,7 @@
"macroLabel": "",
"enabled": false,
"useMacroTriggerButton": false,
"macroTriggerPin": -1,
"deprecatedMacroTriggerPin": -1,
"macroTriggerButton": 0,
"exclusive": true,
"interruptible": true,
@ -684,7 +684,7 @@
"macroLabel": "",
"enabled": false,
"useMacroTriggerButton": false,
"macroTriggerPin": -1,
"deprecatedMacroTriggerPin": -1,
"macroTriggerButton": 0,
"exclusive": true,
"interruptible": true,
@ -695,7 +695,7 @@
"macroLabel": "",
"enabled": false,
"useMacroTriggerButton": false,
"macroTriggerPin": -1,
"deprecatedMacroTriggerPin": -1,
"macroTriggerButton": 0,
"exclusive": true,
"interruptible": true,
@ -706,7 +706,7 @@
"macroLabel": "",
"enabled": false,
"useMacroTriggerButton": false,
"macroTriggerPin": -1,
"deprecatedMacroTriggerPin": -1,
"macroTriggerButton": 0,
"exclusive": true,
"interruptible": true,