recreate turboPinMask when doing reinit() (when profiles are changed) (…

…#919) * recreate turboPinMask when doing reinit() (when profiles are changed) Fixes #918 * clear turboPinMask in case the new profile doesn't have it mapped
OpenStickCommunity · Mar 31, 2024 · d0678f5 · d0678f5
1 parent 91105bb
commit d0678f5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/headers/addons/turbo.h b/headers/addons/turbo.h
@@ -89,14 +89,14 @@
 class TurboInput : public GPAddon {
 public:
     virtual bool available();
-	virtual void setup();       // TURBO Button Setup
+    virtual void setup();       // TURBO Button Setup
+    virtual void reinit();
     virtual void preprocess() {}
-	virtual void process();     // TURBO Setting of buttons (Enable/Disable)
+    virtual void process();     // TURBO Setting of buttons (Enable/Disable)
     virtual std::string name() { return TurboName; }
 private:
     void updateInterval(uint8_t shotCount);
     void updateTurboShotCount(uint8_t turboShotCount);
-    Pin_t turboPin;             // Pin for Turbo from Gamepad/BoardConfig
     Mask_t turboPinMask;        // Pin mask for Turbo pin
     bool bDebState;             // Debounce TURBO Button State
     uint32_t uDebTime;          // Debounce TURBO Button Time

diff --git a/src/addons/turbo.cpp b/src/addons/turbo.cpp
@@ -30,7 +30,7 @@ bool TurboInput::available() {
     {
         if ( pinMappings[pin] == GpioAction::BUTTON_PRESS_TURBO ) {
             hasTurboAssigned = true;
-            turboPin = pin;
+            turboPinMask = 1 << pin;
             break;
         }
     }
@@ -90,10 +90,6 @@ void TurboInput::setup()
         turboButtonsMask = 0;
     }
 
-    if (isValidPin(turboPin)) {
-        turboPinMask = 1 << turboPin;
-    }
-
     lastButtons = 0;
     bDebState = false;
     uDebTime = now;
@@ -109,6 +105,22 @@ void TurboInput::setup()
     nextTimer = getMicro();
 }
 
+/**
+ * @brief Reset the turbo pin mask.
+ */
+void TurboInput::reinit()
+{
+    turboPinMask = 0;
+    GpioAction* pinMappings = Storage::getInstance().getProfilePinMappings();
+    for (Pin_t pin = 0; pin < (Pin_t)NUM_BANK0_GPIOS; pin++)
+    {
+        if ( pinMappings[pin] == GpioAction::BUTTON_PRESS_TURBO ) {
+            turboPinMask = 1 << pin;
+            break;
+        }
+    }
+}
+
 void TurboInput::process()
 {
     Gamepad * gamepad = Storage::getInstance().GetGamepad();