Merge pull request #3 from jedie/develop

Develop

Author: jedie

src/main.py

@@ -11,10 +11,9 @@
     time.sleep(1)
 
 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 ntp import ntp_sync  # noqa isort:skip
+from leds import power_led  # noqa isort:skip
 
 print('watchdog:', watchdog)
 print('wifi:', wifi)

src/ntp.py

@@ -6,6 +6,7 @@
 import ntptime
 import utime as time
 from watchdog import watchdog
+from wifi import wifi  # noqa isort:skip
 
 rtc = machine.RTC()
 
@@ -39,6 +40,11 @@ def _timer_callback(self, timer):
     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('old UTC:', rtc.datetime())
         s = 1
         while True:

src/webswitch.py

@@ -44,7 +44,7 @@ def send_web_page(writer, message=''):
 
 @asyncio.coroutine
 def request_handler(reader, writer):
-    print('\nWait for request...')
+    print('\nWait for request on %s...' % wifi.station.ifconfig()[0])
     gc.collect()
 
     address = writer.get_extra_info('peername')
@@ -142,8 +142,13 @@ def request_handler(reader, writer):
 
 
 def main():
-    print('start webserver...')
-
+    s = 1
+    while not wifi.is_connected:
+        print('Wait for WiFi connection %s sec.' % s)
+        time.sleep(s)
+        s += 5
+        
+    print('Start webserver on %s...' % wifi.station.ifconfig()[0])
     loop = asyncio.get_event_loop()
 
     coro = asyncio.start_server(request_handler, '0.0.0.0', 80)