Fixed out of sync issues. Added relay code.

Author: ganonp

Pump/Pump.py

@@ -20,10 +20,11 @@ def __init__(self, data):
                               "state": "off"}
 
     def set_state(self, state):
-        if state == "on":
-            self.turn_on()
-        elif state == "off":
-            self.turn_off()
+        if self.state != state:
+            if state == "on":
+                self.turn_on()
+            elif state == "off":
+                self.turn_off()
 
         return self.response_dict
 

Relay.py

@@ -0,0 +1,38 @@
+from machine import Pin
+import ujson
+
+
+class Relay:
+
+    def __init__(self, data):
+        self.index = str(data["index"])
+        self.serial_no = data["serial_no"]
+        self.gpio = Pin(int(data["gpio"]), Pin.OUT)
+        self.gpio.off()
+        self.type = data["type"]
+        self.state = "off"
+
+        self.response_dict = {"serial_no": str(self.serial_no), "index": str(self.index), "type": self.type,
+                              "state": "off"}
+
+    def set_state(self, state):
+        if self.state != state:
+            if state == "on":
+                self.turn_on()
+            elif state == "off":
+                self.turn_off()
+
+        return self.response_dict
+
+    def turn_on(self):
+        self.gpio.on()
+        self.state = "on"
+        self.update_response_dict("on")
+
+    def turn_off(self):
+        self.gpio.off()
+        self.state = "off"
+        self.update_response_dict("off")
+
+    def update_response_dict(self, state):
+        self.response_dict["state"] = state

config.json

@@ -1,27 +1,3 @@
 {
-  "name": "Water Level",
-  "serial_no": "04142a53-39c8-4612-8642-f1536dd29e5c",
-  "pi_gpio_interrupt": 2,
-  "pi_pin_interrupt": 3,
-  "no_channels": 3,
-  "channels": {
-    "0": {
-      "serial_no": "17336c2e-e610-421f-a7b2-79bcc7c0779e",
-      "type": "etape",
-      "index": 0,
-      "gpio": 26
-    },
-    "1": {
-      "serial_no": "cfb01d39-8571-4532-afcd-29068ccfdc09",
-      "type": "optical",
-      "index": 1,
-      "gpio": 27
-    },
-    "2": {
-      "serial_no": "8a4f4ce1-11d1-48dc-8907-9a0f46de743e",
-      "type": "optical",
-      "index": 2,
-      "gpio": 28
-    }
-  }
+  "serial_no": "8a33fafb-5012-40f3-be1b-e450741ecd14"
 }

main.py

@@ -1,12 +1,13 @@
-import utime
-from machine import ADC, Pin, disable_irq, enable_irq
+from machine import ADC, Pin
 from AnalogSensor import AnalogSensor
 from Pump import Pump
 import ujson
 import sys
 import select
 import micropython
 
+from Relay import Relay
+
 micropython.alloc_emergency_exception_buf(100)
 
 led = Pin(25, Pin.OUT)
@@ -39,6 +40,9 @@ def init():
             elif v['type'] == 'pump':
                 pump = Pump(v)
                 io_components[str(pump.index)] = pump
+            elif v['type'] == 'relay':
+                relay = Relay(v)
+                io_components[str(relay.index)] = relay
     except Exception as e:
         print(e)
         config = {}
@@ -50,32 +54,39 @@ def loop():
     global poll, io_components, led, serial_no
     command = ''
     try:
-        command = str(poll.poll(200)[0][0].read(4))
+        command = (str(poll.poll(200)[0][0].readline())).strip()
+        command_json = ujson.loads(command)
     except Exception as e:
-        command = ''
+        command_json = {}
     finally:
-        if command == 'data':
-            channel = str(poll.poll()[0][0].read(1))
-            print(io_components[str(channel)].response_dict)
-        elif command == 'init':
-            print(serial_no)
-            new_config = (str(poll.poll()[0][0].readline())).strip()
-            try:
-                with open("""/config.json""", 'w') as data_file:
-                    ujson.dump(ujson.loads(new_config), data_file)
-            except Exception as e:
-                print(e)
-            io_components = init()
-        elif command == 'stat':
-            channel = str(poll.poll()[0][0].read(1))
-            state = (str(poll.poll()[0][0].readline())).strip()
-            print(str(io_components[channel].set_state(state)))
-
-        for sensor in io_components.values():
-            if sensor.type == 'sensor':
-                sensor.add_value()
-                sensor.update_response_dict()
-        led.toggle()
+        try:
+            if 'command' in command_json.keys():
+                command = command_json['command']
+                if command == 'data':
+                    channel = command_json['channel']
+                    print(io_components[str(channel)].response_dict)
+                elif command == 'serial':
+                    print(serial_no)
+                elif command == 'init':
+                    new_config = command_json['config']
+                    try:
+                        with open("""/config.json""", 'w') as data_file:
+                            ujson.dump(new_config, data_file)
+                    except Exception as e:
+                        print(e)
+                    io_components = init()
+                elif command == 'state':
+                    channel = command_json['channel']
+                    state = command_json['state']
+                    print(str(io_components[channel].set_state(state)))
+        except Exception as e:
+            print(e)
+        finally:
+            for sensor in io_components.values():
+                if sensor.type == 'sensor':
+                    sensor.add_value()
+                    sensor.update_response_dict()
+            led.toggle()
 
 
 io_components = init()

serial_no.json

@@ -1,2 +1,2 @@
-{  "serial_no": "ecd3b04a-7c27-4553-a9f9-4de3f31065a0"
+{  "serial_no": "8a33fafb-5012-40f3-be1b-e450741ecd14"
 }