Unify pump and sensor code, allow openhub to write to config.json, also get rid of all interrupts! Hurray!

Author: ganonp

AnalogSensor.py

@@ -5,9 +5,9 @@
 class AnalogSensor:
 
     def __init__(self, data):
-        self.index = data["index"]
+        self.index = str(data["index"])
         self.serial_no = data["serial_no"]
-        self.gpio = data["gpio"]
+        self.gpio = int(data["gpio"])
         self.type = data["type"]
         self.window = 10
         self.current_size = 0.0

Pump.py

@@ -5,11 +5,11 @@
 class Pump:
 
     def __init__(self, data):
-        self.index = data["index"]
+        self.index = str(data["index"])
         self.serial_no = data["serial_no"]
-        self.en = Pin(data["en"], Pin.OUT)
-        self.gpio0 = Pin(data["gpio0"], Pin.OUT)
-        self.gpio1 = Pin(data["gpio1"], Pin.OUT)
+        self.en = Pin(int(data["en"]), Pin.OUT)
+        self.gpio0 = Pin(int(data["gpio0"]), Pin.OUT)
+        self.gpio1 = Pin(int(data["gpio1"]), Pin.OUT)
         self.gpio0.on()
         self.type = data["type"]
         self.pwm = PWM(self.en)
@@ -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
 

main.py

@@ -1,70 +1,84 @@
 import utime
 from machine import ADC, Pin, disable_irq, enable_irq
 from AnalogSensor import AnalogSensor
+from Pump import Pump
 import ujson
 import sys
 import select
 import micropython
 
 micropython.alloc_emergency_exception_buf(100)
 
-config = {}
-
-with open("""/config.json""") as data_file:
-    config = ujson.load(data_file)
-
-serial_no = config["serial_no"]
-num_sensors = config["no_channels"]
-
-analog_sensors = {}
-
-for v in config["channels"].values():
-    analog_sensor = AnalogSensor(v)
-    analog_sensors[str(analog_sensor.index)] = analog_sensor
-
 led = Pin(25, Pin.OUT)
 led.on()
 
-p1 = Pin(5, Pin.IN, pull=Pin.PULL_DOWN)
+with open("""/serial_no.json""") as serial_json_file:
+    serial_json = ujson.load(serial_json_file)
 
-# command = '12345'
-# channel = '-1'
+serial_no = serial_json["serial_no"]
 
 poll = select.poll()
 poll.register(sys.stdin, select.POLLIN)
-interrupt = False
 
+config = {}
 
-def interrupt_handler():
-    global interrupt
-    led.on()
-    interrupt = True
 
+def init():
+    global config, io_components
+    io_components = {}
 
-# lbo = p1.irq(handler=lambda pin: interrupt_handler(), trigger=Pin.IRQ_RISING)
+    try:
+
+        with open("""/config.json""") as data_file:
+            config = ujson.load(data_file)
+
+        for v in config["channels"]:
+            if v['type'] == 'sensor':
+                analog_sensor = AnalogSensor(v)
+                io_components[str(analog_sensor.index)] = analog_sensor
+            elif v['type'] == 'pump':
+                pump = Pump(v)
+                io_components[str(pump.index)] = pump
+    except Exception as e:
+        print(e)
+        config = {}
+
+    return io_components
 
 
 def loop():
-    global poll
+    global poll, io_components, led, serial_no
+    command = ''
     try:
         command = str(poll.poll(200)[0][0].read(4))
     except Exception as e:
         command = ''
     finally:
         if command == 'data':
             channel = str(poll.poll()[0][0].read(1))
-            print(analog_sensors[channel].response_dict)
-        if command == 'init':
-            print(config)
+            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()
 
-    for sensor in analog_sensors.values():
-        sensor.add_value()
-        sensor.update_response_dict()
-    led.toggle()
-    # utime.sleep(.3)
 
+io_components = init()
 
 while True:
     loop()
-
-# timer.init(period=500, mode=Timer.PERIODIC, callback=lambda k: loop())

serial_no.json

@@ -0,0 +1,2 @@
+{  "serial_no": "ecd3b04a-7c27-4553-a9f9-4de3f31065a0"
+}