Webserver stop function

Author: ksiegall

Examples/webserver_example.py

@@ -10,7 +10,7 @@
 webserver.registerStopButton(lambda: drivetrain.set_effort(0, 0))
 
 # Binding functions to custom buttons
-webserver.add_button("Test", lambda: print("test"))
+webserver.add_button("Close Server", lambda: webserver.stop_server())
 webserver.add_button("Blink", lambda: board.led_blink(2))
 webserver.add_button("LED Off", lambda: board.led_off())
 webserver.add_button("Servo Up", lambda: servo_one.set_angle(90))
@@ -44,3 +44,5 @@ def start_network_and_webserver():
     # Network ssid and password are stored in root/secrets.json
     webserver.start_network()
     webserver.start_server()
+
+start_network_and_webserver()

XRPLib/webserver.py

@@ -1,6 +1,6 @@
 from phew import server, template, logging, access_point, dns
 from phew.template import render_template
-from phew.server import redirect, stop
+from phew.server import redirect, stop, close
 import gc
 import network
 import time
@@ -59,7 +59,9 @@ def start_network(self, ssid:str=None, robot_id:int= None, password:str=None):
                 ssid = f"XRP_{robot_id}"
                 password = "remote.xrp"
         self.access_point = access_point(ssid, password)
-        self.ip = network.WLAN(network.AP_IF).ifconfig()[0]
+        logging.info(f"Starting Access Point \"{ssid}\"")
+        self.wlan = network.WLAN(network.AP_IF)
+        self.ip = self.wlan.ifconfig()[0]
 
     def connect_to_network(self, ssid:str=None, password:str=None, timeout = 10):
         """
@@ -112,6 +114,9 @@ def stop_server(self):
         """
         Shuts off the webserver and network and stops handling requests
         """
+        logging.enable_logging_types(logging.LOG_INFO)
+        logging.info("Stopping Webserver and Network Connections")
+        
         stop()
         self.wlan.active(False)
 
@@ -218,8 +223,8 @@ def _handleUserFunctionRequest(self, text) -> bool:
                 return False
             user_function()
             return True
-        except:
-            logging.error("User function "+text+" caused an exception")
+        except RuntimeError as xcpt:
+            logging.error("User function "+text+" caused an exception: "+str(xcpt))
             return False
 
     def _generateHTML(self):