Merge pull request #17 from jedie/develop

jedie · web-flow · commit 205ab375fffb · 2019-12-07T21:21:12.000+01:00
Develop
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Tested devices:
 * schedule multiple timers
 * OTA updates (currently without directory support)
 * turn the switch on/off by the web page or the device button
+* checkbox for each day of the week where timers are active (Currently only stored in RTC RAM!)
 * Reset the device by long pressing the button
 * supports multiple WIFI credentials
 
@@ -28,7 +29,7 @@ The device will do this on every boot:
 
 Things that will be implement in the near feature:
 
-* checkbox for each day of the week where timers are active
+* Store 'active weekdays' in filesystem and not only in RTC RAM
 * timer toggle flag to reverse: power is switched off during the specified periods
 * display local time to UTC offset via JavaScript
 * recalculate UTC timestamp on the page into local time via JavaScript
diff --git a/helpers/force_ota_update.py b/helpers/force_ota_update.py
@@ -6,8 +6,6 @@
 import gc
 import sys
 
-import machine
-import utime as time
 from rtc import update_rtc_dict
 
 if __name__ == '__main__':
@@ -16,8 +14,5 @@
 
     update_rtc_dict(data={'run': None})  # Save to RTC RAM for next boot
 
-    print('Hard reset device...')
-    time.sleep(1)
-    machine.reset()
-    time.sleep(1)
+    print('reset your device by pressing Ctrl-D to start OTA ;)')
     sys.exit()
diff --git a/helpers/force_web_server.py b/helpers/force_web_server.py
@@ -6,8 +6,6 @@
 import gc
 import sys
 
-import machine
-import utime as time
 from rtc import update_rtc_dict
 
 if __name__ == '__main__':
@@ -16,8 +14,5 @@
 
     update_rtc_dict(data={'run': 'web-server'})  # Save to RTC RAM for next boot
 
-    print('Hard reset device...')
-    time.sleep(1)
-    machine.reset()
-    time.sleep(1)
+    print('reset your device by pressing Ctrl-D to start web server ;)')
     sys.exit()
diff --git a/helpers/generate_weekday_inputs.py b/helpers/generate_weekday_inputs.py
@@ -0,0 +1,11 @@
+"""
+    dev script just for generate html for copy&paste ;)
+"""
+
+weekday_names = ('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday')
+
+for no, day in enumerate(weekday_names):
+    print(
+        f'<input type="checkbox" id="d{no}" name="d{no}" {{d{no}}}>'
+        f'<label for="d{no}">{day}</label>'
+    )
diff --git a/src/constants.py b/src/constants.py
@@ -12,3 +12,4 @@
 WIFI_TIMEOUT = const(20 * 1000)  # 20 sec
 
 POWER_TIMER_ACTIVE_KEY = 'active'
+POWER_TIMER_WEEKDAYS_KEY = 'days'
diff --git a/src/http_internals.html b/src/http_internals.html
@@ -15,6 +15,9 @@
 <fieldset><legend>Loaded sys.modules:</legend>
     {sys_modules}
 </fieldset>
+<fieldset><legend>Minimal modules list:</legend>
+    {minimal_modules}
+</fieldset>
 <p>
     <a href="/main/menu"><button class="button">Main Menu</button></a>
     <a href="/internals/clear"><button class="button">Clear RTC RAM</button></a>
diff --git a/src/http_internals.py b/src/http_internals.py
@@ -27,7 +27,8 @@ async def get_show(server, reader, writer, url):
                 'release': uname.release,
                 'mpy_version': uname.version,
 
-                'sys_modules': ', '.join(sys.modules.keys())
+                'sys_modules': ', '.join(sorted(sys.modules.keys())),
+                'minimal_modules': ', '.join(server.minimal_modules)
             },
             content_iterator=None
         ),
diff --git a/src/http_set_timer.html b/src/http_set_timer.html
@@ -2,6 +2,15 @@
     <form action="/set_timer/submit/">
         <textarea name="timers" rows="6" cols="13">{timers}</textarea>
         <p><small>(All times must be <strong>in UTC</strong>!)</small></p>
+        <p>
+            <input type="checkbox" id="d0" name="d0" {d0}><label for="d0">Monday</label>
+            <input type="checkbox" id="d1" name="d1" {d1}><label for="d1">Tuesday</label>
+            <input type="checkbox" id="d2" name="d2" {d2}><label for="d2">Wednesday</label>
+            <input type="checkbox" id="d3" name="d3" {d3}><label for="d3">Thursday</label>
+            <input type="checkbox" id="d4" name="d4" {d4}><label for="d4">Friday</label><br>
+            <input type="checkbox" id="d5" name="d5" {d5}><label for="d5">Saturday</label>
+            <input type="checkbox" id="d6" name="d6" {d6}><label for="d6">Sunday</label>
+        </p>
         Timer is: <select name="active">
             <option value="on" {on_selected}>ON</option>
             <option value="off" {off_selected}>OFF</option>
diff --git a/src/http_set_timer.py b/src/http_set_timer.py
@@ -12,19 +12,27 @@ async def get_form(server, reader, writer, querystring, timers=None):
         del restore_timers
         del sys.modules['times_utils']
 
+    context = {
+        'timers': timers,
+        'on_selected': 'selected' if server.power_timer.active else '',
+        'off_selected': '' if server.power_timer.active else 'selected',
+    }
+    from power_timer_schedule import get_active_days
+    active_days = get_active_days()
+    del get_active_days
+    del sys.modules['power_timer_schedule']
     gc.collect()
-    from template import render
 
+    for day_no in range(7):
+        context['d%i' % day_no] = 'checked' if day_no in active_days else ''
+
+    from template import render
     await server.send_html_page(
         writer,
         filename='webswitch.html',
         content_iterator=render(
             filename='http_set_timer.html',
-            context={
-                'timers': timers,
-                'on_selected': 'selected' if server.power_timer.active else '',
-                'off_selected': '' if server.power_timer.active else 'selected',
-            },
+            context=context,
             content_iterator=None
         ),
     )
@@ -45,25 +53,36 @@ async def get_submit(server, reader, writer, querystring):
         del save_timers
 
         power_timer_active = get_parameters['active'] == 'on'
-        if power_timer_active:
-            server.power_timer.active = True
-        else:
-            server.power_timer.active = False
 
         from rtc import update_rtc_dict
         update_rtc_dict(data={
-            constants.POWER_TIMER_ACTIVE_KEY: power_timer_active
+            constants.POWER_TIMER_ACTIVE_KEY: power_timer_active,
+            constants.POWER_TIMER_WEEKDAYS_KEY: [
+                no for no in range(7)
+                if 'd%i' % no in get_parameters
+            ]
         })
         del update_rtc_dict
     except ValueError as e:
         server.message = 'Timers error: %s' % e
         await get_form(server, reader, writer, querystring, timers=get_parameters['timers'])
+        return
 
     del get_parameters
     del sys.modules['rtc']
     gc.collect()
 
     server.message = 'Timers saved.'
+
+    # Update power timer:
+    if power_timer_active:
+        server.power_timer.active = True
+    else:
+        server.power_timer.active = False
+
+    # Force set 'today_active' by schedule_next_switch() in update_power_timer():
+    server.power_timer.today_active = None
+
     server.power_timer.schedule_next_switch()
 
     del sys.modules['times_utils']  # used in schedule_next_switch
diff --git a/src/main.py b/src/main.py
@@ -1,64 +1,73 @@
+import time
 
+print('main.py')
+time.sleep(1)
 
-import gc
-import sys
-import time
 
-from button_handler import Button
-from pins import Pins
-from reset import ResetDevice
-from rtc import get_rtc_value, update_rtc_dict
-from wifi import WiFi
+def main():
+    import gc
+    gc.collect()
+
+    import sys
+    sys.modules.clear()
 
-print('main.py')
+    from button_handler import Button
+    from pins import Pins
 
-time.sleep(1)
+    from wifi import WiFi
 
-sys.modules.clear()
+    __version__ = 'v0.6.0'
 
-gc.collect()
+    # Init device button IRQ:
+    Pins.button_pin.irq(Button().irq_handler)
 
+    wifi = WiFi()
+    wifi.ensure_connection()
+    print('wifi: %s' % wifi)
 
-__version__ = 'v0.5.1'
+    _RTC_KEY_RUN = 'run'
+    _RUN_WEB_SERVER = 'web-server'
 
+    from rtc import get_rtc_value
+    if get_rtc_value(_RTC_KEY_RUN) == _RUN_WEB_SERVER:
+        print('start webserver')
 
-# Init device button IRQ:
-Pins.button_pin.irq(Button().irq_handler)
+        from rtc import update_rtc_dict
+        update_rtc_dict(data={_RTC_KEY_RUN: None})  # run OTA client on next boot
 
-wifi = WiFi()
-wifi.ensure_connection()
-print('wifi: %s' % wifi)
+        del update_rtc_dict
+        del get_rtc_value
+        del sys.modules['rtc']
+        gc.collect()
 
-_RTC_KEY_RUN = 'run'
-_RUN_WEB_SERVER = 'web-server'
+        from webswitch import WebServer  # noqa isort:skip
+        from watchdog import Watchdog  # noqa isort:skip
+        from power_timer import PowerTimer  # noqa isort:skip
 
+        power_timer = PowerTimer()
+        power_timer.schedule_next_switch()
 
-if get_rtc_value(_RTC_KEY_RUN) == _RUN_WEB_SERVER:
-    print('start webserver')
-    update_rtc_dict(data={_RTC_KEY_RUN: None})  # run OTA client on next boot
-    from webswitch import WebServer  # noqa isort:skip
-    from watchdog import Watchdog  # noqa isort:skip
-    from power_timer import PowerTimer  # noqa isort:skip
+        gc.collect()
+        WebServer(
+            power_timer=power_timer,
+            watchdog=Watchdog(
+                wifi=wifi,
+                check_callback=power_timer.schedule_next_switch
+            ),
+            version=__version__
+        ).run()
+    else:
+        print('start OTA')
+        Pins.power_led.off()
+        from rtc import update_rtc_dict
+        update_rtc_dict(data={_RTC_KEY_RUN: _RUN_WEB_SERVER})  # run web server on next boot
+        from ota_client import OtaUpdate
 
-    power_timer = PowerTimer()
-    power_timer.schedule_next_switch()
+        gc.collect()
+        OtaUpdate().run()
 
-    gc.collect()
-    WebServer(
-        power_timer=power_timer,
-        watchdog=Watchdog(
-            wifi=wifi,
-            check_callback=power_timer.schedule_next_switch
-        ),
-        version=__version__
-    ).run()
-else:
-    print('start OTA')
-    Pins.power_led.off()
-    update_rtc_dict(data={_RTC_KEY_RUN: _RUN_WEB_SERVER})  # run web server on next boot
-    from ota_client import OtaUpdate
+    from reset import ResetDevice
+    ResetDevice(reason='unknown').reset()
 
-    gc.collect()
-    OtaUpdate().run()
 
-ResetDevice(reason='unknown').reset()
+main()
diff --git a/src/power_timer.py b/src/power_timer.py
@@ -11,6 +11,7 @@ class PowerTimer:
     next_time_ms = None
     turn_on = None  # turn power switch next time on or off ?
     active = None  # are timers activated ?
+    today_active = None  # Is the timer active this weekday ?
     timer = machine.Timer(-1)
 
     def schedule_next_switch(self):
@@ -38,12 +39,15 @@ def reset(self):
 
     def __str__(self):
         if not self.active:
-            return 'Power timer is not active.'
+            return 'Power timer is deactivated.'
 
         if self.next_time is not None and self.next_time_ms < 1:
             self.reset()
             return 'missed timer'
 
+        if not self.today_active:
+            return 'Power timer is not active today.'
+
         if self.turn_on is None:
             return 'No switch scheduled. (Last update: %s)' % self.last_update
         else:
diff --git a/src/power_timer_schedule.py b/src/power_timer_schedule.py
@@ -1,18 +1,44 @@
+import gc
+import sys
+
 import constants
 import machine
-from rtc import get_rtc_value, rtc_isoformat
-from times_utils import get_ms_until_next_timer
+import utime as time
+
+
+def get_active_days():
+    from rtc import get_rtc_value
+    active_days = get_rtc_value(key=constants.POWER_TIMER_WEEKDAYS_KEY, default=list(range(7)))
+    del get_rtc_value
+    del sys.modules['rtc']
+    gc.collect()
+    return active_days
+
+
+def active_today():
+    """
+    Is the timer active this weekday?
+    """
+    active_days = get_active_days()
+    today = time.localtime()[6]
+    return today in active_days
 
 
 def update_power_timer(power_timer):
     """
     Plan next switching point.
     """
+    from rtc import get_rtc_value, rtc_isoformat
+    from times_utils import get_ms_until_next_timer
+
     power_timer.timer.deinit()
 
     if power_timer.active is None:
         power_timer.active = get_rtc_value(key=constants.POWER_TIMER_ACTIVE_KEY, default=True)
 
+    if power_timer.today_active is None:
+        power_timer.today_active = active_today()
+
     power_timer.turn_on, power_timer.next_time, power_timer.next_time_ms = get_ms_until_next_timer(
         current_time=machine.RTC().datetime()[4:6]
     )
diff --git a/src/times_utils.py b/src/times_utils.py
@@ -1,7 +1,4 @@
-try:
-    import ure as re
-except ImportError:
-    import re
+
 
 _TIMERS_FILENAME = 'timers.txt'
 
@@ -31,6 +28,10 @@ def validate_times(times):
 
 
 def parse_timers(data):
+    try:
+        import ure as re
+    except ImportError:
+        import re
     regex = re.compile(r'^\D*(\d+:\d+)\D+(\d+:\d+)\D*$')
     data = data.strip()
 
diff --git a/src/watchdog_checks.py b/src/watchdog_checks.py
diff --git a/src/webswitch.py b/src/webswitch.py

Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@`
`12`	`12`	`WIFI_TIMEOUT = const(20 * 1000) # 20 sec`
`13`	`13`
`14`	`14`	`POWER_TIMER_ACTIVE_KEY = 'active'`
	`15`	`+POWER_TIMER_WEEKDAYS_KEY = 'days'`