fix io_expander hal lib

Author: bmorcelli

lib/HAL/io_expander/io_expander.h

@@ -62,6 +62,21 @@ class io_expander : public IO_EXP_CLASS {
 private:
     bool _started = false;
 
+    static void clearInterruptBit(uint16_t &mask, int8_t pin) {
+        if (pin >= 0 && pin <= 15) {
+            mask = static_cast<uint16_t>(mask & ~(static_cast<uint16_t>(1u) << static_cast<uint8_t>(pin)));
+        }
+    }
+
+    bool interruptEnableGPIOWrapper(uint16_t mask) {
+#if defined(IO_EXPANDER_AW9523)
+        return interruptEnableGPIO(mask);
+#else
+        (void)mask;
+        return true;
+#endif
+    }
+
 public:
     io_expander() : IO_EXP_CLASS() {};
 
@@ -88,7 +103,7 @@ class io_expander : public IO_EXP_CLASS {
         button(IO_EXP_SEL);
 
         // IMPORTANT: Disable all interrupts at startup
-        interruptEnableGPIO(0x0000);
+        interruptEnableGPIOWrapper(0x0000);
 
         return _started;
     }
@@ -112,25 +127,25 @@ class io_expander : public IO_EXP_CLASS {
         if (pin >= 0 && pin <= 15) { setPinDirection(pin, INPUT); }
     }
 
-  bool enableGPIOInterrupts() {
-    if (!_started) return false;
+    bool enableGPIOInterrupts() {
+        if (!_started) return false;
 
-    // Start with ALL interrupts DISABLED (bits = 1 = disable)
-    uint16_t mask = 0xFFFF;
+        // Start with ALL interrupts DISABLED (bits = 1 = disable)
+        uint16_t mask = 0xFFFF;
 
-    // Clear bits (set to 0 = enable) for the input/button pins
-    if (IO_EXP_UP    >= 0 && IO_EXP_UP    <= 15) mask &= ~(1 << IO_EXP_UP);
-    if (IO_EXP_DOWN  >= 0 && IO_EXP_DOWN  <= 15) mask &= ~(1 << IO_EXP_DOWN);
-    if (IO_EXP_ESC   >= 0 && IO_EXP_ESC   <= 15) mask &= ~(1 << IO_EXP_ESC);
-    if (IO_EXP_LEFT  >= 0 && IO_EXP_LEFT  <= 15) mask &= ~(1 << IO_EXP_LEFT);
-    if (IO_EXP_RIGHT >= 0 && IO_EXP_RIGHT <= 15) mask &= ~(1 << IO_EXP_RIGHT);
-    if (IO_EXP_SEL   >= 0 && IO_EXP_SEL   <= 15) mask &= ~(1 << IO_EXP_SEL);
+        // Clear bits (set to 0 = enable) for the input/button pins
+        clearInterruptBit(mask, IO_EXP_UP);
+        clearInterruptBit(mask, IO_EXP_DOWN);
+        clearInterruptBit(mask, IO_EXP_ESC);
+        clearInterruptBit(mask, IO_EXP_LEFT);
+        clearInterruptBit(mask, IO_EXP_RIGHT);
+        clearInterruptBit(mask, IO_EXP_SEL);
 
-    return interruptEnableGPIO(mask);
-}
+        return interruptEnableGPIOWrapper(mask);
+    }
     // Optional: turn off all interrupts
     void disableGPIOInterrupts() {
-        if (_started) interruptEnableGPIO(0x0000);
+        if (_started) interruptEnableGPIOWrapper(0x0000);
     }
 };