Validate MCP port expander logic

Add poll once on start to have accurate information on webpage

icbm.ino

@@ -17,6 +17,8 @@ void setup() {
     initializeSNMP();
 
     start = millis();
+
+    poll_port_expander();
 }
 
 

panel.hpp

@@ -36,7 +36,7 @@ String buildPanel(bool sib, bool plc, bool ups, unsigned long elapsed_secs) {
     else { page += "<span class=\"status-value status-ok\">OK</span>\n"; }
     page += "</div>\n";
     
-    page += "<h3>Last INT: ";
+    page += "<h3>Last Interrupt: ";
     page += elapsed_secs;
     page += " secs. ago";
     page += "</h3></div></body></html>";

pins.cpp

@@ -11,17 +11,16 @@ void IRAM_ATTR isr(){
 void initializeMCP()
 {
   pinMode(ISR_PIN, INPUT_PULLUP);
-  //attachInterrupt(digitalPinToInterrupt(ISR_PIN), isr, CHANGE);
-  attachInterrupt(digitalPinToInterrupt(TRIGGER_SIGNAL), isr, CHANGE);
+  attachInterrupt(digitalPinToInterrupt(ISR_PIN), isr, CHANGE);
 
   SPI.begin();
   MCP.begin();
 
   // Enable inputs and interrupts on pins 0-2
   MCP.pinMode8(0b00000111);
-  MCP.enableInterrupt(0, FALLING);
-  MCP.enableInterrupt(1, FALLING);
-  MCP.enableInterrupt(2, FALLING);
+  MCP.enableInterrupt(0, CHANGE);
+  MCP.enableInterrupt(1, CHANGE);
+  MCP.enableInterrupt(2, CHANGE);
   Serial.println("MCP23S08 Started");
 
 }
@@ -37,23 +36,23 @@ void isr_check_loop()
 
     Serial.print("Interrupt: ");
     uint8_t regval = MCP.getInterruptCaptureRegister();  //INTCAP
-    Serial.print(regval);
+    Serial.print(regval, BIN);
 
     uint8_t mask = 1 << 0;
-    if (!(regval & mask)) {
-      Serial.print("UPS");
+    if ((regval & mask)) {
+      Serial.print(" UPS");
       PINS.ups = true;
     }
 
     mask = 1 << 1;
     if (!(regval & mask)) {
-      Serial.print("PLC");
+      Serial.print(" PLC");
       PINS.plc = true;
     }
 
     mask = 1 << 2;
     if (!(regval & mask)) {
-      Serial.print("SIB");
+      Serial.print(" SIB");
       PINS.sib = true;
     }
 
@@ -62,6 +61,39 @@ void isr_check_loop()
   }
 }
 
+
+void poll_port_expander()
+{
+    PINS.sib = false;
+    PINS.plc = false;
+    PINS.ups = false;
+    PINS.last_triggered = millis();
+    int regval = MCP.read8();
+    
+    uint8_t mask = 1 << 0;
+    if ((regval & mask)) {
+      Serial.print(" UPS");
+      PINS.ups = true;
+    }
+
+    mask = 1 << 1;
+    if (!(regval & mask)) {
+      Serial.print(" PLC");
+      PINS.plc = true;
+    }
+
+    mask = 1 << 2;
+    if (!(regval & mask)) {
+      Serial.print(" SIB");
+      PINS.sib = true;
+    }
+
+    Serial.println();
+    
+
+}
+
+
 bool on = true;
 unsigned long toggle_start = 0;
 void toggle_status_led() {

pins.hpp

@@ -28,4 +28,5 @@ extern MCP23S08 MCP;
 void IRAM_ATTR isr();
 void initializeMCP();
 void isr_check_loop();
+void poll_port_expander();
 void toggle_status_led();