refactor led stuff

Author: jedie

src/boot.py

@@ -14,8 +14,8 @@
 
 print('Check Firmware:')
 assert esp.check_fw() is True, "Firmware error?!?"
-esp.osdebug(None) # turn off vendor O/S debugging messages
-esp.sleep_type(esp.SLEEP_NONE) # Don't go into sleep mode
+esp.osdebug(None)  # turn off vendor O/S debugging messages
+esp.sleep_type(esp.SLEEP_NONE)  # Don't go into sleep mode
 
 
-print('boot.py END')
+print('boot.py END')

src/leds.py

@@ -1,23 +1,22 @@
-import gc
-
-import machine
+import pins
 import utime as time
 
 
 class Led:
-    def __init__(self, no):
-        self.pin = machine.Pin(no, machine.Pin.OUT)
+    def __init__(self, name, pin, on, off):
+        self.name = name
+        self.pin = pin
+        self._on = on
+        self._off = off
 
     def on(self):
-        """ turn LED on """
-        self.pin.value(0)
+        self.pin.value(self._on)
 
     def off(self):
-        """ turn LED off """
-        self.pin.value(1)
+        self.pin.value(self._off)
 
     def toggle(self):
-        self.pin.value(0 if self.pin.value() else 1)
+        self.pin.value(self._off if self.pin.value() else self._on)
 
     def flash(self, sleep=0.01, count=5):
         self._flash(sleep, count)
@@ -29,38 +28,21 @@ def _flash(self, sleep, count):
             time.sleep(sleep)
         self.pin.value(old_value)
 
+    @property
+    def state(self):
+        if self._on:
+            return 'ON' if self.pin.value() else 'OFF'
+        else:
+            return 'OFF' if self.pin.value() else 'ON'
 
-class PowerLed(Led):
-    def __init__(self):
-        super().__init__(no=13)
-
-
-power_led = PowerLed()
-
-
-def test():
-    print('test starts...')
-    print('off')
-    power_led.off()
-    time.sleep(1)
-    print('on')
-    power_led.on()
-    time.sleep(1)
-    print('toggle 1')
-    power_led.toggle()
-    time.sleep(1)
-    print('toggle 2')
-    power_led.toggle()
-    time.sleep(1)
+    def __str__(self):
+        return '%s %s: %s' % (self.name, self.pin, self.state)
 
-    print('flash')
-    power_led.flash(sleep=0.1, count=5)
 
-    gc.collect()
-    print('test ends.')
+power_led = Led(name='power', pin=pins.power_led_pin, on=0, off=1)
+relay = Led(name='relay', pin=pins.relay_pin, on=1, off=0)
 
 
 if __name__ == '__main__':
-    print('LED test start...')
-    test()
-    print('LED test end')
+    print(relay)
+    print(power_led)

src/leds_test.py

@@ -0,0 +1,43 @@
+import utime as time
+from leds import power_led, relay
+
+
+def test():
+    print('test starts...')
+    print('off')
+    relay.off()
+    print(relay)
+    power_led.off()
+    print(power_led)
+
+    time.sleep(1)
+
+    print('on')
+    power_led.on()
+    print(power_led)
+
+    time.sleep(1)
+
+    print('toggle 1')
+    power_led.toggle()
+
+    time.sleep(1)
+
+    print('toggle 2')
+    power_led.toggle()
+
+    time.sleep(1)
+
+    print('flash')
+    power_led.flash(sleep=0.1, count=20)
+
+    relay.on()
+    print(relay)
+
+    print('test ends.')
+
+
+if __name__ == '__main__':
+    print('LED test start...')
+    test()
+    print('LED test end')

src/main.py

@@ -1,31 +1,30 @@
 import gc
 
-import machine
 import micropython
-import utime as time
 
 micropython.alloc_emergency_exception_buf(128)
 
-for no in range(3, 0, -1):
-    print('%i main.py wait...' % no)
-    time.sleep(1)
+# init own stuff:
 
 from watchdog import watchdog  # noqa isort:skip
 from wifi import wifi  # noqa isort:skip
 from ntp import ntp_sync  # noqa isort:skip
-from leds import power_led  # noqa isort:skip
+from leds import power_led, relay  # noqa isort:skip
 import button_handler  # noqa isort:skip
 
 print('watchdog:', watchdog)
 print('wifi:', wifi)
 print('ntp_sync:', ntp_sync)
 print('power_led:', power_led)
+print('relay:', relay)
 
-
+print('main.py wait with power led flash...')
+power_led.flash(sleep=0.1, count=20)
 
 print('gc.collect()')
 gc.collect()
 
 
+# Start the Webserver:
 from webswitch import main  # noqa isort:skip
 main()

src/pins.py

@@ -0,0 +1,5 @@
+import machine
+
+power_led_pin = machine.Pin(13, machine.Pin.OUT)
+relay_pin = machine.Pin(12, machine.Pin.OUT)  # relay + red led
+button_pin = machine.Pin(0, machine.Pin.IN)

src/webswitch.py

@@ -10,9 +10,9 @@
 from ntp import ntp_sync
 from watchdog import watchdog
 from wifi import wifi
+from leds import power_led, relay
 
 rtc = machine.RTC()
-relay_pin = machine.Pin(12, machine.Pin.OUT, value=0)  # turn replay off
 button_pin = machine.Pin(0, machine.Pin.IN)
 
 
@@ -21,14 +21,9 @@ def send_web_page(writer, message=''):
     yield from writer.awrite('Content-type: text/html; charset=utf-8\r\n')
     yield from writer.awrite('Connection: close\r\n\r\n')
 
-    if relay_pin.value() == 1:
-        state = 'ON'
-    else:
-        state = 'OFF'
-
     with open('webswitch.html', 'r') as f:
         yield from writer.awrite(f.read().format(
-            state=state,
+            state=relay.state,
             message=message,
 
             wifi=wifi,
@@ -42,8 +37,9 @@ def send_web_page(writer, message=''):
     gc.collect()
 
 
-@asyncio.coroutine
-def request_handler(reader, writer):
+async def request_handler(reader, writer):
+    power_led.off()
+
     print('\nWait for request on %s...' % wifi.station.ifconfig()[0])
     gc.collect()
 
@@ -84,17 +80,17 @@ def request_handler(reader, writer):
             not_found = False
 
         elif url == '/?power=on':
-            relay_pin.value(1)
+            relay.on()
             yield from send_web_page(writer, message='power on')
             not_found = False
 
         elif url == '/?power=off':
-            relay_pin.value(0)
+            relay.off()
             yield from send_web_page(writer, message='power off')
             not_found = False
 
         elif url == '/?soft_reset':
-            relay_pin.value(0)
+            relay.off()
             yield from send_web_page(
                 writer,
                 message=(
@@ -106,7 +102,7 @@ def request_handler(reader, writer):
             not_found = False
 
         elif url == '/?hard_reset':
-            relay_pin.value(0)
+            relay.off()
             yield from send_web_page(
                 writer,
                 message=(
@@ -124,24 +120,25 @@ def request_handler(reader, writer):
     gc.collect()
 
     if hard_reset:
-        for no in range(3, 0, -1):
-            print('Hard reset device %i wait...' % no)
-            time.sleep(1)
+        print('Hard reset device wait with flash LED...')
+        power_led.flash(sleep=0.1, count=20)
         print('Hard reset device...')
         machine.reset()
         sys.exit()
 
     if soft_reset:
-        for no in range(3, 0, -1):
-            print('Soft reset device %i wait...' % no)
-            time.sleep(1)
+        print('Soft reset device wait with flash LED...')
+        power_led.flash(sleep=0.1, count=20)
         print('Soft reset device...')
         sys.exit()
 
     watchdog.feed()
+    power_led.on()
 
 
 def main():
+    power_led.off()
+
     s = 1
     while not wifi.is_connected:
         print('Wait for WiFi connection %s sec.' % s)