clean up and ESP version

Author: mirkin

gurgleapps_webserver.py

@@ -42,28 +42,24 @@ def __init__(self, wifi_ssid, wifi_password, port=80, timeout=20, doc_root="/www
             print('waiting for connection...')
             time.sleep(1)
 
-        if self.wlan.status() != 3:
+        #if self.wlan.status() != 3:
+        if self.wlan.isconnected() == False:
             raise RuntimeError('network connection failed')
         else:
             print('connected')
             status = self.wlan.ifconfig()
             print('ip = ' + status[0])
         self.serving = True
         print('point your browser to http://', status[0])
-        try:
-            pass
-            # asyncio.run(self.start_server())
-        except OSError as e:
-            print(e)
-        finally:
-            asyncio.new_event_loop()
+        #asyncio.new_event_loop()
         print("exit constructor")
 
     async def start_server(self):
+        print("start_server")
         asyncio.create_task(asyncio.start_server(
             self.serve_request, "0.0.0.0", 80))
         while self.serving:
-            await asyncio.sleep(1)
+            await asyncio.sleep(0.1)
 
     def add_function_route(self, route, function):
         self.function_routes.append({"route": route, "function": function})

main_esp.py

@@ -0,0 +1,81 @@
+import config
+from gurgleapps_webserver import GurgleAppsWebserver
+import utime as time
+import uasyncio as asyncio
+from machine import Pin
+import ujson as json
+
+blink_off_time = 0.5
+blink_on_time = 0.5
+
+status = True
+led = Pin(2, Pin.OUT)
+
+async def example_func(request, response, param1, param2):
+    print("example_func")
+    print("param1: " + param1)
+    print("param2: " + param2)
+    response_string = json.dumps({ "param1": param1, "param2": param2, "post_data": request.post_data})
+    await response.send_json(response_string, 200)
+
+async def say_hello(request, response, name):
+    await response.send_html("Hello " + name + " hope you are well")
+
+async def send_status(request, response):
+    # send boolean status and number frequency
+    response_string = json.dumps({"status": status, "delay": (blink_off_time + blink_on_time) *0.5, "blink_on_time": blink_on_time, "blink_off_time": blink_off_time})
+    await response.send_json(response_string, 200)
+
+async def set_blink_pattern(request, response, on, off):
+    print("on: " + on)
+    print("off: " + off)
+    global blink_off_time, blink_on_time
+    blink_off_time = float(off)
+    blink_on_time = float(on)
+    await send_status(request, response)
+
+async def set_delay(request, response, new_delay):
+    print("new delay: " + new_delay)
+    global blink_off_time, blink_on_time
+    blink_off_time = float(new_delay)
+    blink_on_time = float(new_delay) 
+    await send_status(request, response)
+
+async def stop_flashing(request, response):
+    global status
+    status = False
+    await send_status(request, response)
+
+async def start_flashing(request, response):
+    global status
+    status = True
+    await send_status(request, response)
+
+async def main():
+    await server.start_server()
+
+async def background_task():
+    while True:
+        if status:
+            led.on()
+            await asyncio.sleep(blink_on_time)
+            led.off()
+            await asyncio.sleep(blink_off_time)
+        else:
+            led.off()
+            await asyncio.sleep(0.2)
+        
+
+async def run():
+    await asyncio.gather(main(), background_task())
+
+server = GurgleAppsWebserver(config.WIFI_SSID, config.WIFI_PASSWORD, port=80, timeout=30, doc_root="/www", log_level=2)
+server.add_function_route("/set-delay/<delay>", set_delay)
+server.add_function_route("/set-blink-pattern/<on_time>/<off_time>", set_blink_pattern)
+server.add_function_route("/stop", stop_flashing)
+server.add_function_route("/start", start_flashing)
+server.add_function_route("/status", send_status)
+server.add_function_route("/example/func/<param1>/<param2>", example_func)
+server.add_function_route("/hello/<name>", say_hello)
+
+asyncio.run(run())