Version 0.9, mostly works, REST API for changing settings is clunky

2020-08-30 01:54:29 +03:00
parent 799de0c306
commit 0cd8ee1219
5 changed files with 238 additions and 97 deletions
--- a/main.py
+++ b/main.py
@@ -1,42 +1,53 @@
-import network
-import json
-import time
-
-settings=json.loads(''.join(open('settings.json').readlines()))
-
-def netstop():
-    n=network.WLAN(network.STA_IF)
-    n.active(False)
-    n=network.WLAN(network.AP_IF)
-    n.active(False)
-    
-def STA():
-    sta=network.WLAN(network.STA_IF)
-    if sta.isconnected():
-        return True
-    sta.active(True)
-    if ('NetMask') in settings and 'DNS' in settings and 'Gateway' in settings and 'IP' in settings:
-        print("Static configuration active")
-        sta.ifconfig((settings["IP"],settings["NetMask"],settings["Gateway"],settings["DNS"]))
-    else:
-        print("DHCP active")
-    sta.connect(settings['ssid'],settings['password'])
-    timeout=0
-    while timeout < 60:
-        if sta.isconnected():
-            return True
-        else:
-            time.sleep(1)
-            timeout += 1
-            print("Time waiting: %s sec"%timeout)
-    sta.active(False)
-    return False
-
-def AP():
-    ap=network.WLAN(network.AP_IF)
-    ap.active(True)
-    ap.config(essid=settings['AP-ssid'],password=settings['AP-password'])
-    print("AP configured")
-
-import garage
-#garage.run()
+import network
+import json
+import time
+from machine import Pin
+import LED
+import garage
+
+#import settings
+settings=json.loads(''.join(open('settings.json').readlines()))
+
+def netstop():
+    n=network.WLAN(network.STA_IF)
+    n.active(False)
+    n=network.WLAN(network.AP_IF)
+    n.active(False)
+    
+def STA():
+    """Connects Board as Client to WiFi-Network. LED.Blinks 5 times short if successful"""
+    sta=network.WLAN(network.STA_IF)
+    if sta.isconnected():
+        LED.Blink(5)
+        return True
+    sta.active(True)
+    if ('NetMask') in settings and 'DNS' in settings and 'Gateway' in settings and 'IP' in settings:
+        print("Static configuration active")
+        sta.ifconfig((settings["IP"],settings["NetMask"],settings["Gateway"],settings["DNS"]))
+    else:
+        print("DHCP active")
+    sta.connect(settings['ssid'],settings['password'])
+    timeout=0
+    while timeout < 30:
+        if sta.isconnected():
+            LED.Morse('ip %s'%sta.ifconfig()[0],1)
+            return True
+        else:
+            LED.Blink(1,.05,.95)
+            timeout += 1
+            print("Time waiting: %s sec"%timeout)
+    sta.active(False)
+    return False
+
+def AP():
+    """Provides Access point with settings in settings.json. LED.Blinks 3 long, 3 short on success"""
+    ap=network.WLAN(network.AP_IF)
+    ap.active(True)
+    ap.config(essid=settings['AP-ssid'],password=settings['AP-password'])
+    print("AP configured")
+    LED.Morse ('AP')
+
+netstop() 
+if STA() != True:
+    AP()
+garage.run()