Fix button handling

src/lib/button_handler.cpp

@@ -19,41 +19,52 @@ TickType_t lastDebounceTime = 0;
 void buttonTask(void *parameter) {
   while (1) {
     ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
-    std::lock_guard<std::mutex> lock(mcpMutex);
+    
-
     TickType_t currentTime = xTaskGetTickCount();
-
+    
     if ((currentTime - lastDebounceTime) >= debounceDelay) {
       lastDebounceTime = currentTime;
-
+      
+      std::lock_guard<std::mutex> lock(mcpMutex);
+      
       if (!digitalRead(MCP_INT_PIN)) {
-        uint pin = mcp1.getInterruptFlagRegister();
+        uint16_t intFlags = mcp1.getInterruptFlagRegister();
-
+        uint16_t intCap = mcp1.getInterruptCaptureRegister();
-        switch (pin) {
+                
-          case BTN_1:
+        // Check each button individually
-            toggleTimerActive();
+        if (intFlags & BTN_1) handleButton1();
-            break;
+        if (intFlags & BTN_2) handleButton2();
-          case BTN_2:
+        if (intFlags & BTN_3) handleButton3();
-            nextScreen();
+        if (intFlags & BTN_4) handleButton4();
-            break;
-          case BTN_3:
-            previousScreen();
-            break;
-          case BTN_4:
-            showSystemStatusScreen();
-            break;
-        }
       }
-      mcp1.getInterruptCaptureRegister();
-    } else {
     }
-    // Very ugly, but for some reason this is necessary
+    
+    // Clear interrupt state
     while (!digitalRead(MCP_INT_PIN)) {
+      std::lock_guard<std::mutex> lock(mcpMutex);
       mcp1.getInterruptCaptureRegister();
+      delay(1);  // Small delay to prevent tight loop
     }
   }
 }
 
+// Helper functions to handle each button
+void handleButton1() {
+  toggleTimerActive();
+}
+
+void handleButton2() {
+  nextScreen();
+}
+
+void handleButton3() {
+  previousScreen();
+}
+
+void handleButton4() {
+  showSystemStatusScreen();
+}
+
 void IRAM_ATTR handleButtonInterrupt() {
   BaseType_t xHigherPriorityTaskWoken = pdFALSE;
   xTaskNotifyFromISR(buttonTaskHandle, 0, eNoAction, &xHigherPriorityTaskWoken);
@@ -67,4 +78,5 @@ void setupButtonTask() {
               &buttonTaskHandle);  // Create the FreeRTOS task
   // Use interrupt instead of task
   attachInterrupt(MCP_INT_PIN, handleButtonInterrupt, CHANGE);
+  Serial.printf("Button task created\n");
 }

src/lib/button_handler.hpp

@@ -8,6 +8,13 @@
 
 extern TaskHandle_t buttonTaskHandle;
 
+// Task and setup functions
 void buttonTask(void *pvParameters);
 void IRAM_ATTR handleButtonInterrupt();
 void setupButtonTask();
+
+// Individual button handlers
+void handleButton1();
+void handleButton2();
+void handleButton3();
+void handleButton4();

src/lib/config.cpp

@@ -466,32 +466,34 @@ void setupHardware()
 
   Wire.begin(I2C_SDA_PIN, I2C_SCK_PIN, 400000);
 
-  if (!mcp1.begin())
+  if (!mcp1.begin()) {
-  {
     Serial.println(F("Error MCP23017 1"));
-
+  } else {
-    // while (1)
-    //         ;
-  }
-  else
-  {
     pinMode(MCP_INT_PIN, INPUT_PULLUP);
-//    mcp1.setupInterrupts(false, false, LOW);
+    
-    mcp1.enableControlRegister(MCP23x17_IOCR_ODR);
+    // Enable mirrored interrupts (both INTA and INTB pins signal any interrupt)
-
+    if (!mcp1.mirrorInterrupts(true)) {
-    mcp1.mirrorInterrupts(true);
+        Serial.println(F("Error setting up mirrored interrupts"));
-
-    for (int i = 0; i < 4; i++)
-    {
-      mcp1.pinMode1(i, INPUT_PULLUP);
-      mcp1.enableInterrupt(i, LOW);
     }
-#ifndef IS_BTCLOCK_V8
+
-    for (int i = 8; i <= 14; i++)
+    // Configure all 4 button pins as inputs with pullups and interrupts
-    {
+    for (int i = 0; i < 4; i++) {
-      mcp1.pinMode1(i, OUTPUT);
+        if (!mcp1.pinMode1(i, INPUT_PULLUP)) {
+            Serial.printf("Error setting pin %d to input pull up\n", i);
+        }
+        // Enable interrupt on CHANGE for each pin
+        if (!mcp1.enableInterrupt(i, CHANGE)) {
+            Serial.printf("Error enabling interrupt for pin %d\n", i);
+        }
     }
-#endif
+
+    // Set interrupt pins as open drain with active-low polarity
+    if (!mcp1.setInterruptPolarity(2)) { // 2 = Open drain
+        Serial.println(F("Error setting interrupt polarity"));
+    }
+
+    // Clear any pending interrupts
+    mcp1.getInterruptCaptureRegister();
   }
 
 #ifdef IS_HW_REV_B