GPIO-based Input mode and profile select on boot (#1620)

* Add array of new GpioInputMapping type to GamepadOptions

* Add new branch to getBootAction which uses gpioInputModeMappings

* Use std::optional instead of negative value

* Move details of boot mode form out to separate funtion, start on gpio input form

* Move FormSelect to a separate component

* Outline form for gpio mapping

* Update test data

* Define useStore hook for input boot modes

* Rename boto mode fields. Add profile index to boot mode config

* Restoring settings page from main (switching to a brand new page instead)

* Moving config to separate Options object. Add pin masks for web config and usb mode (required)

* Move INPUT_MODES from settings page to Data/ file

* work on BootModeStore

* Stub out web api methods, add test data

* Create a React component for boot mode mapping

* Add profile select, general layout tweaks

* UI tweaks

* Add a toggle to switch between old and new boot mode mapping

* Use nanoid to give a unique key to boot-modes in list. Implement missing actions

* combine various add/remove pin funtions. Re-writes to make sure sets are updated immutably

* Refactoring components so there are fewer state subscriptions in the top-level BootModeMapping

* Split up PinSelect into two types to simplify zustand selectors. Fix deleting of pins

* Pull first 2 rows out into a component to memoize, organization.

* Check if usb peripheral is available in BootModeSelect

* Refactor BootModesStore to use string keys instead of indices

* Start replacing labels with useTranslation

* Start working on some validation for gpio pin mapping

* Renaming fields in config

* use InputMode enum instaed of int

* Renamed component

* Rename APIs, update test data

* Move BootModeMapping back to a Page

* WIP add a method of highlighting invalid selects

* Add nav item for boot modes. Link to page once GPIO mapping is enabled

* re-order CSS to fix issue with hover on invalid selects

* Work on validaton for required fields

* Further validation improvements, group actions together

* Disable boot mode page based on setting

* Fix typo

* Add BootModeOptions to Storage class

* Implement pin-checking logic at startup

* Add BootModeOptions to Config, change index to unsigned int

* Implement the boot mode options API

* Disable new boot-mode selection for now

* Fix typos in JSON keys

* Move enabled switch to Boot mode page. Clear errors after adding pin with capture button

* Add missing enabled field, fix save method

* Fix typos in JSON keys

* Fix issue with profile not being saved correctly

* Return profile number along with BootAction from getBootAction

* Move error messages out of BootModeStore. Use 1-indexed profile number from controller

* Update spaPaths, change profileIndex to profileNumber

* Update getBootAction signature

* Delete old getBootMode function for now

* Ignore prettier config

* Add function for setting pin mapping from boot mode options

* Define new struct for controlling boot actions. Reduce the amount of mapping between enums in switch statements

* Add missing method declaration

* Rename profileIndex to profileNumber. Change required masks to uint32_t (no need for -1)

* Reverting some upstream changes from post-0.7.12 that were left during rebase

* Fix config, broken during rebase

* Fixes to getBootAction implementation

* Make sure save button is accessible when Gpio mode-select disabled

* Add a "dirty" field to boot mode state to better handle saving

* Restore old getBootAction func

* Rework old getBootAction to work with new BootAction type

* Disable reserved pins in drop-down

* Fix bug with wrong inputMode being used

* Cast enabled to boolean (was showing up as 0 in web config)

* Add locale file. Add an explanation and alert-message

* Move more text to locale file

* Rename BootModeMappingPage.jsx to just BootModeMapping.jsx

* Add P5General to InputBootModes (lost in merge)

* Call old bootAction method, even if new mode is enabled

---------

Co-authored-by: Luke A <arntsonl@gmail.com>

Author: rmaccrimm

headers/addons/reverse.h

@@ -69,4 +69,4 @@ class ReverseInput : public GPAddon {
     uint8_t actionRight;
 };
 
-#endif // _Reverse_H_
+#endif // _Reverse_H_

headers/gp2040.h

@@ -43,29 +43,20 @@ class GP2040 {
     };
     RebootHotkeys rebootHotkeys;
 
-    enum class BootAction {
-        NONE,
-        ENTER_WEBCONFIG_MODE,
-        ENTER_USB_MODE,
-        SET_INPUT_MODE_SWITCH,
-        SET_INPUT_MODE_XINPUT,
-        SET_INPUT_MODE_KEYBOARD,
-        SET_INPUT_MODE_GENERIC,
-        SET_INPUT_MODE_PS3,
-        SET_INPUT_MODE_PS4,
-        SET_INPUT_MODE_PS5,
-        SET_INPUT_MODE_P5GENERAL,
-        SET_INPUT_MODE_XBONE,
-        SET_INPUT_MODE_NEOGEO,
-        SET_INPUT_MODE_MDMINI,
-        SET_INPUT_MODE_PCEMINI,
-        SET_INPUT_MODE_EGRET,
-        SET_INPUT_MODE_ASTRO,
-        SET_INPUT_MODE_PSCLASSIC,
-        SET_INPUT_MODE_XBOXORIGINAL,
-        SET_INPUT_MODE_SWITCH_PRO,
-    };
-    BootAction getBootAction();
+    enum class BootActionType {
+			ENTER_USB_MODE,
+			SET_INPUT_MODE
+		};
+
+		struct BootAction {
+			BootActionType type;
+			InputMode inputMode;
+			uint32_t profileNumber;
+		};
+
+		BootAction getGpioMappedBootAction();
+		BootAction getButtonMappedBootAction();
+
     void getReinitGamepad(Gamepad * gamepad);
 
     // GPIO manipulation for setup and profile reinit
@@ -76,9 +67,6 @@ class GP2040 {
     void checkRawState(const GamepadState& prevState, const GamepadState& currState);
     void checkProcessedState(const GamepadState& prevState, const GamepadState& currState);
 
-    // input mask, action
-    std::map<uint32_t, int32_t> bootActions;
-
     void checkSaveRebootState();
     bool saveRequested = false;
     bool forceSave = false;

headers/storagemanager.h

@@ -45,6 +45,7 @@ class Storage {
 	ProfileOptions& getProfileOptions() { return config.profileOptions; }
 	GpioMappingInfo* getProfilePinMappings() { return functionalPinMappings; }
 	PeripheralOptions& getPeripheralOptions() { return config.peripheralOptions; }
+	BootModeOptions& getBootModeOptions() { return config.bootModeOptions; }
 
 	void init();
 	bool save();
@@ -60,6 +61,7 @@ class Storage {
 	void nextProfile();
 	void previousProfile();
 	void setFunctionalPinMappings();
+	void setBootModeFunctionalPinMappings();
 	char* currentProfileLabel();
 
 	void ResetSettings(); 				// EEPROM Reset Feature

proto/config.proto

@@ -3,6 +3,20 @@ syntax = "proto2";
 import "nanopb.proto";
 import "enums.proto";
 
+message InputModeMapping {
+	// negative if mapping disabled
+    optional int32 pinMask = 1;
+    optional InputMode inputMode = 2;
+    optional uint32 profileNumber = 3;
+}
+
+message BootModeOptions {
+    optional bool enabled = 1;
+    optional uint32 webConfigPinMask = 2;
+    optional uint32 usbModePinMask = 3;
+    repeated InputModeMapping inputModeMappings = 4 [(nanopb).max_count = 8];
+}
+
 message GamepadOptions
 {
     optional InputMode inputMode = 1;
@@ -955,4 +969,5 @@ message Config
     optional GpioMappings gpioMappings = 13;
     optional MigrationHistory migrations = 14;
     optional PeripheralOptions peripheralOptions = 15;
+		optional BootModeOptions bootModeOptions = 16;
 }