Merge pull request #4 from jedie/develop

Develop

Author: jedie

README.md

@@ -32,6 +32,7 @@ The device will do:
 Point you Webserver to the IP from the device.
 
 You can turn the switch on/off by the web page or the device button.
+Reset the device by long pressing the button.
 
 
 ## Screenshot

src/boot.py

@@ -3,19 +3,19 @@
 import esp
 import utime as time
 
+print('gc.collect()')
+gc.collect()
 
-for no in range(3, 0, -1):
+
+for no in range(2, 0, -1):
     print('%i boot.py wait...' % no)
     time.sleep(1)
 
 
 print('Check Firmware:')
 assert esp.check_fw() is True, "Firmware error?!?"
-esp.osdebug(None)       # turn off vendor O/S debugging messages
-
-
-print('gc.collect()')
-gc.collect()
+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/button_handler.py

@@ -0,0 +1,55 @@
+import gc
+import sys
+
+import machine
+import utime as time
+from leds import power_led, relay
+from pins import button_pin
+
+
+def get_debounced_value(pin):
+    """
+    get debounced value from pin by waiting for stable value
+    """
+    cur_value = pin.value()
+    stable = 0
+    while stable < 40:
+        if pin.value() == cur_value:
+            stable += 1
+        else:
+            stable = 0
+            cur_value = pin.value()
+        time.sleep_ms(1)
+    return cur_value
+
+
+class Button:
+    down_start = None
+
+    def irq_handler(self, pin):
+        power_led.off()
+        button_value = get_debounced_value(pin)
+        power_led.on()
+
+        print('button_value:', button_value)
+        if button_value == 0:
+            # button pressed
+            self.down_start = time.ticks_ms()
+        elif button_value == 1:
+            # button released
+            duration_ms = time.ticks_diff(time.ticks_ms(), self.down_start)
+            print('duration_ms:', duration_ms)
+            if duration_ms > 2000:
+                print('reset after long press...')
+                power_led.flash(sleep=0.1, count=20)
+                machine.reset()
+                sys.exit()
+
+            print('old state:', relay)
+            relay.toggle()
+            print('new state:', relay)
+
+        gc.collect()
+
+
+button_pin.irq(Button().irq_handler)

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,61 +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)
 
-
-def get_debounced_value(pin):
-    """get debounced value from pin by waiting for 20 msec for stable value"""
-    cur_value = pin.value()
-    stable = 0
-    while stable < 20:
-        if pin.value() == cur_value:
-            stable = stable + 1
-        else:
-            stable = 0
-            cur_value = pin.value()
-    time.sleep_ms(1)
-    return cur_value
-
-
-def button_pressed(pin):
-    print('button pressed...')
-    cur_button_value = get_debounced_value(pin)
-    if cur_button_value == 1:
-        if relay_pin.value() == 1:
-            print('turn off by button.')
-            relay_pin.value(0)
-        else:
-            print('turn on by button.')
-            relay_pin.value(1)
-
-        garbage_collection()
-
-
-button_pin = machine.Pin(0, machine.Pin.IN)
-button_pin.irq(button_pressed)
-
+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/ntp.py

@@ -5,7 +5,8 @@
 import machine
 import ntptime
 import utime as time
-from watchdog import watchdog
+
+from watchdog import watchdog  # noqa isort:skip
 from wifi import wifi  # noqa isort:skip
 
 rtc = machine.RTC()
@@ -30,21 +31,20 @@ def __init__(self):
             callback=self._timer_callback)
 
     def _timer_callback(self, timer):
-        print('NTP timer callback for:', timer)
         try:
             self._sync()
         except Exception as e:
             sys.print_exception(e)
             self.timer.deinit()
 
     def _sync(self):
-        print('Synchronize time from %r ...' % ntptime.host)
         gc.collect()
 
         if not wifi.is_connected:
             print('Skip NTP sync: not connectet to a WiFi!')
             return
-        
+
+        print('Synchronize time from %r ...' % ntptime.host)
         print('old UTC:', rtc.datetime())
         s = 1
         while True:

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/rtc_memory.py

@@ -0,0 +1,29 @@
+import gc
+
+import machine
+import ujson as json
+
+
+class RtcMemory:
+    def __init__(self):
+        rtc_memory = machine.RTC().memory()  # Restore from RTC RAM
+        if rtc_memory:
+            self.rtc_memory = json.loads(rtc_memory)
+        else:
+            self.rtc_memory = {}
+        gc.collect()
+
+    def save(self):
+        machine.RTC().memory(json.dumps(self.rtc_memory))
+        gc.collect()
+
+    def incr_rtc_count(self, key):
+        count = self.rtc_memory.get(key, 0) + 1
+        self.rtc_memory[key] = count
+        self.save()
+        return count
+
+
+if __name__ == '__main__':
+    count = RtcMemory().incr_rtc_count(key='test')
+    print('RTC memory test call count:', count)