New Add-On: Rotate Input + Tilt Input = Analog Modification Input

CMakeLists.txt

@@ -159,7 +159,7 @@ src/addons/input_macro.cpp
 src/addons/snes_input.cpp
 src/gamepad/GamepadDebouncer.cpp
 src/gamepad/GamepadDescriptors.cpp
-src/addons/tilt.cpp
+src/addons/analogmod.cpp
 ${PROTO_OUTPUT_DIR}/enums.pb.c
 ${PROTO_OUTPUT_DIR}/config.pb.c
 )

configs/Pico/BoardConfig.h

@@ -238,27 +238,41 @@
 #define DUAL_DIRECTIONAL_STICK_MODE DPAD_MODE_DIGITAL
 #define DUAL_DIRECTIONAL_COMBINE_MODE DUAL_COMBINE_MODE_MIXED
 
-// TILTAdd-on Options
+// ANALOGMOD Add-on Options
 #define PIN_TILT_1 -1
 #define TILT1_FACTOR_LEFT_X  35  //Default value for the TILT button to function.
-#define TILT1_FACTOR_LEFT_Y 35 //Default value for the TILT button to function.
+#define TILT1_FACTOR_LEFT_Y  35  //Default value for the TILT button to function.
 #define TILT1_FACTOR_RIGHT_X 35  //Default value for the TILT button to function.
-#define TILT1_FACTOR_RIGHT_Y 35 //Default value for the TILT button to function.
+#define TILT1_FACTOR_RIGHT_Y 35  //Default value for the TILT button to function.
 #define PIN_TILT_2 -1
 #define TILT2_FACTOR_LEFT_X  65  //Default value for the TILT button to function.
 #define TILT2_FACTOR_LEFT_Y  65  //Default value for the TILT button to function.
 #define TILT2_FACTOR_RIGHT_X 65  //Default value for the TILT button to function.
 #define TILT2_FACTOR_RIGHT_Y 65  //Default value for the TILT button to function.
-#define PIN_TILT_FUNCTION -1
-#define PIN_TILT_LEFT_ANALOG_UP -1
-#define PIN_TILT_LEFT_ANALOG_DOWN -1
-#define PIN_TILT_LEFT_ANALOG_LEFT -1
-#define PIN_TILT_LEFT_ANALOG_RIGHT -1
-#define PIN_TILT_RIGHT_ANALOG_UP -1
-#define PIN_TILT_RIGHT_ANALOG_DOWN -1
-#define PIN_TILT_RIGHT_ANALOG_LEFT -1
-#define PIN_TILT_RIGHT_ANALOG_RIGHT -1
-#define TILT_SOCD_MODE SOCD_MODE_NEUTRAL
+#define PIN_ANALOGMOD_LEFT_ANALOG_UP -1
+#define PIN_ANALOGMOD_LEFT_ANALOG_DOWN -1
+#define PIN_ANALOGMOD_LEFT_ANALOG_LEFT -1
+#define PIN_ANALOGMOD_LEFT_ANALOG_RIGHT -1
+#define PIN_ANALOGMOD_RIGHT_ANALOG_UP -1
+#define PIN_ANALOGMOD_RIGHT_ANALOG_DOWN -1
+#define PIN_ANALOGMOD_RIGHT_ANALOG_LEFT -1
+#define PIN_ANALOGMOD_RIGHT_ANALOG_RIGHT -1
+#define PIN_ROTATE_1 -1
+#define PIN_ROTATE_2 -1
+#define ROTATE1_FACTOR_LEFT  15  //Default value for the ROTATE button to function.
+#define ROTATE2_FACTOR_LEFT  345 //Default value for the ROTATE button to function.
+#define ROTATE3_FACTOR_LEFT  0   //Default value for the ROTATE button to function.
+#define ROTATE4_FACTOR_LEFT  0   //Default value for the ROTATE button to function.
+#define ROTATE5_FACTOR_LEFT  0   //Default value for the ROTATE button to function.
+#define ROTATE6_FACTOR_LEFT  0   //Default value for the ROTATE button to function.
+#define ROTATE1_FACTOR_RIGHT 15  //Default value for the ROTATE button to function.
+#define ROTATE2_FACTOR_RIGHT 345 //Default value for the ROTATE button to function.
+#define ROTATE3_FACTOR_RIGHT 0   //Default value for the ROTATE button to function.
+#define ROTATE4_FACTOR_RIGHT 0   //Default value for the ROTATE button to function.
+#define ROTATE5_FACTOR_RIGHT 0   //Default value for the ROTATE button to function.
+#define ROTATE6_FACTOR_RIGHT 0   //Default value for the ROTATE button to function.
+#define ANALOGMOD_LEFT_SOCD_MODE SOCD_MODE_NEUTRAL
+#define ANALOGMOD_RIGHT_SOCD_MODE SOCD_MODE_NEUTRAL
 
 // BOOTSEL Button Add-on setting
 #define BOOTSEL_BUTTON_MASK 0 // 0 means none, get other mask from GamepadState.h

docs/_sidebar.md

@@ -32,7 +32,7 @@
   - [PS4 Mode](add-ons/ps4-mode.md)
   - [SNES Input](add-ons/snes-input.md)
   - [SOCD Selection Slider](add-ons/socd-selection-slider.md)
-  - [Tilt Input](add-ons/tilt-input.md)
+  - [Analog Modification Input](add-ons/analogmod.md)
   - [Turbo](add-ons/turbo.md)
   - [USB Host Based Add-ons](add-ons/usb-host-based-add-ons.md)
     - [PS Passthrough](add-ons/ps-passthrough.md)

docs/add-ons.md

@@ -5,6 +5,7 @@ This section is for custom add-ons that can be enabled to expand the functionali
 ## Available Add-ons
 
 - [Analog](add-ons/analog.md)
+- [Analog Modification Input](add-ons/analogmod.md)
 - [BOOTSEL Button Configuration](add-ons/bootsel-button.md)
 - [Buzzer Speaker](add-ons/buzzer-speaker.md)
 - [Dual Directional Input](add-ons/dual-direction-input.md)
@@ -18,9 +19,8 @@ This section is for custom add-ons that can be enabled to expand the functionali
 - [PS4 Mode](add-ons/ps4-mode.md)
 - [SNES Input](add-ons/snes-input.md)
 - [SOCD Selection Slider](add-ons/socd-selection-slider.md)
-- [Tilt Input](add-ons/tilt-input.md)
 - [Turbo](add-ons/turbo.md)
 - [USB Host Based Add-ons](add-ons/usb-host-based-add-ons.md)
   - [PS Passthrough](add-ons/ps-passthrough.md)
   - [Keyboard Host Configuration](add-ons/keyboard-host.md)
-- [Wii Extensions](add-ons/wii-extensions.md)
+- [Wii Extensions](add-ons/wii-extensions.md)

docs/add-ons/analogmod.md

@@ -0,0 +1,78 @@
+# Analog Modification Input
+
+![GP2040-CE Configuration - Add-Ons Tilt Input](../assets/images/gpc-add-ons-analogmod.png)
+
+## Dedicated Analog Stick Pins
+User can set dedicated analog stick pins to work with Tilt and Rotate features.
+If no dedicated analog stick pins are set, Tilt and Rotate features will function when DPad is used as Left or Right Analog.
+Otherwise, dedicated analog stick pins will have priority over DPad used as left or right analog sticks
+* `Analog Modification Left Analog Up Pin` - The GPIO pin used for the Up direction on the Left analog stick.
+* `Analog Modification Left Analog Down Pin` - The GPIO pin used for the Down direction on the Left analog stick.
+* `Analog Modification Left Analog Left Pin` - The GPIO pin used for the Left direction on the Left analog stick.
+* `Analog Modification Left Analog Right Pin` - The GPIO pin used for the Right direction on the Left analog stick.
+* `Analog Modification Right Analog Up Pin` - The GPIO pin used for the Up direction on the Right analog stick.
+* `Analog Modification Right Analog Down Pin` - The GPIO pin used for the Down direction on the Right analog stick.
+* `Analog Modification Right Analog Left Pin` - The GPIO pin used for the Left direction on the Right analog stick.
+* `Analog Modification Right Analog Right Pin` - The GPIO pin used for the Right direction on the Right analog stick.
+
+## Tilt
+Tilt 1 and Tilt 2 buttons, when pressed with directional buttons, adjust the analog values.
+Pressing Tilt 1 or 2 with a value of N results in an input that is N% of the maximum direction. (Min. 0, Max. 100)
+Pressing Tilt 1 and Tilt 2 simultaneously with LS or RS directional buttons will make them function as the D-Pad.
+
+* `Tilt 1 Pin` - The GPIO pin used for the Tilt 1.
+* `Tilt 2 Pin` - The GPIO pin used for the Tilt 2.
+* `Tilt 1 Factor Left X` - The percentage of the X-axis input for the Left Stick when pressing Tilt 1.
+* `Tilt 1 Factor Left Y` - The percentage of the Y-axis input for the Left Stick when pressing Tilt 1.
+* `Tilt 2 Factor Left X` - The percentage of the X-axis input for the Left Stick when pressing Tilt 2.
+* `Tilt 2 Factor Left Y` - The percentage of the Y-axis input for the Left Stick when pressing Tilt 2.
+* `Tilt 1 Factor Right X` - The percentage of the X-axis input for the Right Stick when pressing Tilt 1.
+* `Tilt 1 Factor Right Y` - The percentage of the Y-axis input for the Right Stick when pressing Tilt 1.
+* `Tilt 2 Factor Right X` - The percentage of the X-axis input for the Right Stick when pressing Tilt 2.
+* `Tilt 2 Factor Right Y` - The percentage of the Y-axis input for the Right Stick when pressing Tilt 2.
+
+## Rotate
+Rotate 1 and Rotate 2 buttons, when pressed with directional buttons, adjust the analog values.
+All Rotate functions will make analog sticks rotate clockwise by the set degree. (Min. 0, Max. 360)
+Pressing Rotate 1 and Rotate 2 simultaneously with LS or RS directional buttons will make them function as the D-Pad.
+* `Rotate 1 Pin` - The GPIO pin used for the Rotate 1.
+* `Rotate 2 Pin` - The GPIO pin used for the Rotate 2.
+* `Rotate 1 Degree Left` - Clockwise rotate degree for Left Stick when pressing Rotate 1
+* `Rotate 2 Degree Left` - Clockwise rotate degree for Left Stick when pressing Rotate 2
+* `Rotate 3 Degree Left` - Clockwise rotate degree for Left Stick when pressing Rotate 1 + Tilt 1
+* `Rotate 4 Degree Left` - Clockwise rotate degree for Left Stick when pressing Rotate 1 + Tilt 2
+* `Rotate 5 Degree Left` - Clockwise rotate degree for Left Stick when pressing Rotate 2 + Tilt 1
+* `Rotate 6 Degree Left` - Clockwise rotate degree for Left Stick when pressing Rotate 2 + Tilt 2
+* `Rotate 1 Degree Right` - Clockwise rotate degree for Right Stick when pressing Rotate 1
+* `Rotate 2 Degree Right` - Clockwise rotate degree for Right Stick when pressing Rotate 2
+* `Rotate 3 Degree Right` - Clockwise rotate degree for Right Stick when pressing Rotate 1 + Tilt 1
+* `Rotate 4 Degree Right` - Clockwise rotate degree for Right Stick when pressing Rotate 1 + Tilt 2
+* `Rotate 5 Degree Right` - Clockwise rotate degree for Right Stick when pressing Rotate 2 + Tilt 1
+* `Rotate 6 Degree Right` - Clockwise rotate degree for Right Stick when pressing Rotate 2 + Tilt 2
+
+## SOCD
+SOCD Cleaning Mode can be separately set for LS and RS. (Up Priority, Neutral, Last Win, First Win)
+* `Analog Mod Left Stick SOCD Mode` - Choose the SOCD Cleaning Mode for Left Stick.
+* `Analog Mod Right Stick SOCD Mode` - Choose the SOCD Cleaning Mode for Right Stick.
+
+## Summary of Analog Mod Add-On
+The table below provides a summary of all functions offered by Analog Mod.
+`X` = button is pressed; `-` = button is not pressed
+| Tilt1 | Tilt2 | Rotate1 | Rotate2 |   | LS Behavior | RS Behavior |
+|:-----:|:-----:|:-------:|:-------:|:-:|:-----------:|:-----------:|
+|   X   |   -   |    -    |    -    | ⇨ |    Tilt1    |    Tilt1    |
+|   -   |   X   |    -    |    -    | ⇨ |    Tilt2    |    Tilt2    |
+|   -   |   -   |    X    |    -    | ⇨ |   Rotate1   |   Rotate1   |
+|   -   |   -   |    -    |    X    | ⇨ |   Rotate2   |   Rotate2   |
+|   X   |   X   |    -    |    -    | ⇨ |    D-Pad    |    D-Pad    |
+|   -   |   -   |    X    |    X    | ⇨ |    D-Pad    |    D-Pad    |
+|   X   |   -   |    X    |    -    | ⇨ |   Rotate3   |   Rotate3   |
+|   -   |   X   |    X    |    -    | ⇨ |   Rotate4   |   Rotate4   |
+|   X   |   -   |    -    |    X    | ⇨ |   Rotate5   |   Rotate5   |
+|   -   |   X   |    -    |    X    | ⇨ |   Rotate6   |   Rotate6   |
+|   X   |   X   |    X    |    -    | ⇨ |      LS     |      RS     |
+|   X   |   X   |    -    |    X    | ⇨ |      LS     |      RS     |
+|   X   |   -   |    X    |    X    | ⇨ |      LS     |      RS     |
+|   -   |   X   |    X    |    X    | ⇨ |      LS     |      RS     |
+|   X   |   X   |    X    |    X    | ⇨ |      LS     |      RS     |
+|   -   |   -   |    -    |    -    | ⇨ |      LS     |      RS     |