From 45d63cbdd3e3bfd44a0454603a43e6f86b090a10 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Fri, 9 Aug 2019 10:21:21 +0700
Subject: [PATCH] Update WaterishOS-minimal2.0.ino

---
 .../WaterishOS-minimal2.0.ino                 | 51 +++----------------
 1 file changed, 8 insertions(+), 43 deletions(-)

diff --git a/WaterishOS-minimal2.0/WaterishOS-minimal2.0.ino b/WaterishOS-minimal2.0/WaterishOS-minimal2.0.ino
index bd248d2..9a28041 100644
--- a/WaterishOS-minimal2.0/WaterishOS-minimal2.0.ino
+++ b/WaterishOS-minimal2.0/WaterishOS-minimal2.0.ino
@@ -9,28 +9,19 @@ byte arduinoInterrupt=1;
 FlowMeter sensorA[6]= FlowMeter(1);
 FlowMeter sensorB[6]= FlowMeter(3);
 volatile boolean awakenByInterrupt = false;
-
-// Two pins at the MCP (Ports A/B where some buttons have been setup.)
-// Buttons connect the pin to grond, and pins are pulled up.
-byte mcpPinA=7;
-byte mcpPinB=15;
-
 void setup(){
   pinMode(1, FUNCTION_3); 
   pinMode(3, FUNCTION_3); 
-
   pinMode(1,INPUT);
   pinMode(3,INPUT);
-  mcp.begin();      // use default address 0
+  mcp.begin();
   mcp.setupInterrupts(true,false,LOW);
-  // configuration for a button on port A
-  mcp.pinMode(mcpPinA, INPUT);
- // mcp.pullUp(mcpPinA, HIGH);  // turn on a 100K pullup internally
-  mcp.setupInterruptPin(mcpPinA,RISING); 
-  mcp.pinMode(mcpPinB, INPUT);
- // mcp.pullUp(mcpPinB, HIGH);  // turn on a 100K pullup internall
-  mcp.setupInterruptPin(mcpPinB,RISING);
-
+  for(int i=0;i<=15;i++)
+  {
+    mcp.pinMode(i, INPUT);
+    mcp.setupInterruptPin(i,RISING);
+    }
+  }
   // We will setup a pin for flashing from the int routine
   pinMode(ledPin, OUTPUT);
 }
@@ -46,38 +37,12 @@ void handleInterrupt(){
   // Get more information from the MCP from the INT
   uint8_t pin=mcp.getLastInterruptPin();
   uint8_t val=mcp.getLastInterruptPinValue();
-  
-  // We will flash the led 1 or 2 times depending on the PIN that triggered the Interrupt
-  // 3 and 4 flases are supposed to be impossible conditions... just for debugging.
   for(int sid=0;sid<=5;sid++)sensorA[sid].count();
   for(int sid=6;sid<11;sid++)sensorA[sid-6].count();
-
-  // we have to wait for the interrupt condition to finish
-  // otherwise we might go to sleep with an ongoing condition and never wake up again.
-  // as, an action is required to clear the INT flag, and allow it to trigger again.
-  // see datasheet for datails.
-  while( ! (mcp.digitalRead(mcpPinB) && mcp.digitalRead(mcpPinA) ));
-  // and clean queued INT signal
   cleanInterrupts();
-}
 
 // handy for interrupts triggered by buttons
 // normally signal a few due to bouncing issues
-void cleanInterrupts(){
-  //EIFR=0x01;
-  awakenByInterrupt=false;
-}  
-/**
- * main routine: sleep the arduino, and wake up on Interrups.
- * the LowPower library, or similar is required for sleeping, but sleep is simulated here.
- * It is actually posible to get the MCP to draw only 1uA while in standby as the datasheet claims,
- * however there is no stadndby mode. Its all down to seting up each pin in a way that current does not flow.
- * and you can wait for interrupts while waiting.
- */
 void loop(){
-  attachInterrupt(arduinoInterrupt,intCallBack,FALLING);
-  while(!awakenByInterrupt);
-  // disable interrupts while handling them.
-  detachInterrupt(arduinoInterrupt);
-  if(awakenByInterrupt) handleInterrupt();
+  attachInterrupt(arduinoInterrupt,intCallBack,RISING);
 }