program correction of unit limit and unit op90, op180

Author: pandiannano

m5stack/libs/unit/limit.py

@@ -1,5 +1,24 @@
+from machine import Pin
 from hardware import Button
 
+SWITCH = 1
+COUNTER = 2
 
-def LIMITUnit(port):
-    return Button(port[0])
+class LIMITUnit(Button):
+    def __init__(self, port, active_low=True, type=SWITCH):
+        self.count_value = 0
+        self.curr_status = 0
+        self.prev_status = 0 if active_low else 1
+        self.pin = Pin(port[0], Pin.IN, Pin.PULL_UP)
+        super().__init__(port[0], active_low=active_low)
+        if type != SWITCH:
+            self.pin.irq(handler=self._cb_irq, trigger=(Pin.IRQ_FALLING | Pin.IRQ_RISING))
+
+    def _cb_irq(self, arg):
+        self.curr_status = self.pin.value()
+        if self.curr_status != self.prev_status:
+            self.count_value += 1
+        self.prev_status = self.curr_status     
+
+    def count_reset(self):
+        self.count_value = 0

m5stack/libs/unit/op.py

@@ -1,22 +1,24 @@
 from machine import Pin
+from hardware import Button
 
 SWITCH = 1
 COUNTER = 2
 
-
-class OPUnit:
-    def __init__(self, port, type=SWITCH):
+class OPUnit(Button):
+    def __init__(self, port, active_low=True, type=SWITCH):
         self.count_value = 0
+        self.curr_status = 0
+        self.prev_status = 0 if active_low else 1
         self.pin = Pin(port[0], Pin.IN, Pin.PULL_UP)
+        super().__init__(port[0], active_low=active_low)
         if type != SWITCH:
-            self.pin.irq(handler=self._cb_irq, trigger=Pin.IRQ_RISING)
-
-    @property
-    def get_value(self):
-        return self.pin.value()
+            self.pin.irq(handler=self._cb_irq, trigger=(Pin.IRQ_FALLING | Pin.IRQ_RISING))
 
     def _cb_irq(self, arg):
-        self.count_value += 1
+        self.curr_status = self.pin.value()
+        if self.curr_status != self.prev_status:
+            self.count_value += 1
+        self.prev_status = self.curr_status     
 
     def count_reset(self):
         self.count_value = 0