Merge pull request #18 from jedie/develop

Develop

Author: jedie

README.md

@@ -13,7 +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!)
+* checkbox for each day of the week where timers are active
 * Reset the device by long pressing the button
 * supports multiple WIFI credentials
 
@@ -29,7 +29,6 @@ The device will do this on every boot:
 
 Things that will be implement in the near feature:
 
-* 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

Screenshot_2019-12-02 Sonoff S20.png

@@ -0,0 +1,14 @@
+_TIMERS_FILENAME = 'timers.txt'
+_ACTIVE_DAYS_FILENAME = 'timer_days.txt'
+
+
+def print_files(file_name):
+    print('_' * 79)
+    print(file_name)
+    with open(file_name, 'r') as f:
+        print(f.read())
+    print('-' * 79)
+
+
+print_files(_TIMERS_FILENAME)
+print_files(_ACTIVE_DAYS_FILENAME)

helpers/print_timer_files.py

@@ -17,10 +17,11 @@ async def get_form(server, reader, writer, querystring, timers=None):
         '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
+
+    from times_utils import get_active_days
     active_days = get_active_days()
     del get_active_days
-    del sys.modules['power_timer_schedule']
+    del sys.modules['times_utils']
     gc.collect()
 
     for day_no in range(7):
@@ -45,22 +46,25 @@ async def get_submit(server, reader, writer, querystring):
     del sys.modules['urllib_parse']
     gc.collect()
 
-    from times_utils import parse_timers, save_timers
+    from times_utils import parse_timers, save_timers, save_active_days
     try:
         timers = parse_timers(get_parameters['timers'])
+        del parse_timers
 
         save_timers(timers)
         del save_timers
 
         power_timer_active = get_parameters['active'] == 'on'
 
+        save_active_days(tuple(sorted([
+            no for no in range(7)
+            if 'd%i' % no in get_parameters
+        ])))
+        del save_active_days
+
         from rtc import update_rtc_dict
         update_rtc_dict(data={
             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:
@@ -84,8 +88,6 @@ async def get_submit(server, reader, writer, querystring):
     server.power_timer.today_active = None
 
     server.power_timer.schedule_next_switch()
-
-    del sys.modules['times_utils']  # used in schedule_next_switch
     gc.collect()
 
     from http_utils import send_redirect

src/http_set_timer.py

@@ -16,7 +16,7 @@ def main():
 
     from wifi import WiFi
 
-    __version__ = 'v0.6.0'
+    __version__ = 'v0.6.1'
 
     # Init device button IRQ:
     Pins.button_pin.irq(Button().irq_handler)

src/main.py

@@ -6,20 +6,16 @@
 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?
     """
+    from times_utils import get_active_days
     active_days = get_active_days()
+    del get_active_days
+    del sys.modules['times_utils']
+    gc.collect()
+
     today = time.localtime()[6]
     return today in active_days
 

src/power_timer_schedule.py

@@ -1,6 +1,7 @@
 
 
 _TIMERS_FILENAME = 'timers.txt'
+_ACTIVE_DAYS_FILENAME = 'timer_days.txt'
 
 
 def parse_time(clock_time):
@@ -76,6 +77,24 @@ def restore_timers():
         yield ()
 
 
+def get_active_days():
+    try:
+        with open(_ACTIVE_DAYS_FILENAME, 'r') as f:
+            return tuple([int(d) for d in f.read().split(',')])
+    except OSError:
+        print('File not exists: %r' % _ACTIVE_DAYS_FILENAME)
+        return tuple(range(7))
+
+
+def save_active_days(active_days):
+    if tuple(get_active_days()) == active_days:
+        # Don't save if same active days already exists
+        return
+
+    with open(_ACTIVE_DAYS_FILENAME, 'w') as f:
+        f.write(','.join([str(d) for d in active_days]))
+
+
 def get_next_timer(current_time):
     """
     return next next switching point