Merge pull request #2 from jedie/develop

merge Develop

Author: jedie

src/constants.py

@@ -1,8 +1,8 @@
-WATCHDOG_CHECK_PERIOD = const(30 * 1000)  # 30 sec
-WATCHDOG_TIMEOUT = const(25 * 1000) # 25 sec
+WATCHDOG_CHECK_PERIOD = const(50 * 1000)  # 50 sec
+WATCHDOG_TIMEOUT = const(40 * 1000) # 40 sec
 
-WIFI_TIMER = const(20 * 1000)  # 20 sec
-NTP_TIMER = const(5 * 60 * 1000)  # 5 min
+WIFI_TIMER = const(30 * 1000)  # 30 sec
+NTP_TIMER = const(15 * 60 * 1000)  # 15 min
 
 assert WATCHDOG_TIMEOUT > WIFI_TIMER
 assert WATCHDOG_CHECK_PERIOD > WATCHDOG_TIMEOUT

src/main.py

@@ -1,29 +1,62 @@
 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)
 
-import micropython
-
-micropython.alloc_emergency_exception_buf(128)
+from watchdog import watchdog  # noqa isort:skip
+from leds import power_led  # noqa isort:skip
+from ntp import ntp_sync  # noqa isort:skip
+from wifi import wifi  # noqa isort:skip
 
-from leds import power_led
-from ntp import ntp_sync
-from watchdog import watchdog
-from webswitch import main
-from wifi import wifi
 
+print('watchdog:', watchdog)
 print('wifi:', wifi)
 print('ntp_sync:', ntp_sync)
 print('power_led:', power_led)
-print('watchdog:', watchdog)
+
+
+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('gc.collect()')
 gc.collect()
 
 
+from webswitch import main  # noqa isort:skip
 main()

src/ntp.py

@@ -7,7 +7,6 @@
 import utime as time
 from watchdog import watchdog
 
-
 rtc = machine.RTC()
 
 
@@ -57,10 +56,14 @@ def _sync(self):
                 watchdog.feed()
                 return
 
-    def __repr__(self):
-        return '<NtpSync last refresh: %s - success count: %i - error count: %i' % (
+    def __str__(self):
+        return 'NtpSync last refresh: %s - success count: %i - error count: %i' % (
             self.last_refresh, self.success_count, self.error_count
         )
 
 
 ntp_sync = NtpSync()
+
+
+if __name__ == '__main__':
+    print(ntp_sync)

src/watchdog.py

@@ -57,9 +57,9 @@ def feed(self):
     def deinit(self):
         self.timer.deinit()
 
-    def __repr__(self):
+    def __str__(self):
         return (
-            '<Watchdog timeout: %s'
+            'Watchdog timeout: %s'
             ' - last diff: %s'
             ' - last refresh: %s'
             ' - timer count: %s'
@@ -72,29 +72,5 @@ def __repr__(self):
 watchdog = Watchdog()
 
 
-def test(watchdog):
-    print('test start...')
-    watchdog.deinit()  # deinit global watchdog
-
-    # Create new one with shorter timeout:
-    watchdog = Watchdog(
-        check_period=3 * 1000,  # 2 sec
-        timeout=2 * 1000,  # 1 sec
-    )  
-    print(watchdog)
-    for _ in range(10):
-        print('.', end='')
-        time.sleep(0.5)
-        watchdog.feed()
-    print('\nfeed end\n')
-
-    print(watchdog)
-
-    while True:
-        print(watchdog)
-        time.sleep(0.5)
-
-
 if __name__ == '__main__':
-    test(watchdog)  # will reset the device !
-    print('test end.')  # should never happen
+    print(watchdog)

src/watchdog_test.py

@@ -0,0 +1,31 @@
+
+import utime as time
+from watchdog import Watchdog, watchdog
+
+
+def test(watchdog):
+    print('test start...')
+    watchdog.deinit()  # deinit global watchdog
+
+    # Create new one with shorter timeout:
+    watchdog = Watchdog(
+        check_period=3 * 1000,  # 2 sec
+        timeout=2 * 1000,  # 1 sec
+    )
+    print(watchdog)
+    for _ in range(10):
+        print('.', end='')
+        time.sleep(0.5)
+        watchdog.feed()
+    print('\nfeed end\n')
+
+    print(watchdog)
+
+    while True:
+        print(watchdog)
+        time.sleep(0.5)
+
+
+if __name__ == '__main__':
+    test(watchdog)  # will reset the device !
+    print('test end.')  # should never happen

src/webswitch.css

@@ -0,0 +1,19 @@
+html{
+    font-family: Georgia, serif;
+    text-align: center;
+    font-size: 1.5em;
+}
+.button{
+    background-color: #e7bd3b;
+    border: none;
+    border-radius: 4px; color: #fff;
+    padding: 16px 40px;
+    cursor: pointer;
+}
+.button2{
+    background-color: #4286f4;
+}
+small {
+    font-family: "Courier New", Courier, monospace;
+    font-size: 0.5em;
+}

src/webswitch.html

@@ -0,0 +1,30 @@
+<html>
+<head>
+    <title>Sonoff S20 - ESP Web Server</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="webswitch.css" type="text/css">
+</head>
+<body>
+    <h1>Sonoff S20 - ESP Web Server</h1>
+    <p>state: <strong>{state}</strong></p>
+    <p>{message}</p>
+    <p>
+        <a href="/?power=on"><button class="button">ON</button></a>
+        <a href="/?power=off"><button class="button button2">OFF</button></a>
+    </p>
+    <p>
+        <a href="/?soft_reset"><button class="button">Soft reset Device</button></a>
+        <a href="/?hard_reset"><button class="button">Hard reset Device</button></a>
+    </p>
+    <p><small>
+        {wifi}<br>
+        {ntp_sync}<br>
+        {watchdog}
+    </small></p>
+    <p><small>
+        {alloc}bytes of heap RAM that are allocated<br>
+        {free}bytes of available heap RAM<br>
+        Server time in UTC: {utc}
+    </small></p>
+</body>
+</html>