Working webserver in both modes

Author: ksiegall

Examples/webserver_example.py

@@ -33,4 +33,12 @@ def log_time_and_range():
 timer = Timer(-1)
 timer.init(freq=4, mode=Timer.PERIODIC, callback=lambda t: log_time_and_range())
 
-webserver.start_server(1)
+def connect_and_start_webserver(ssid, password, robot_id):
+    # Connect to the network and start the webserver in bridge mode
+    webserver.connect_to_network(ssid, password, robot_id)
+    webserver.start_server()
+
+def start_network_and_webserver(robot_id):
+    # Start the webserver in access point mode
+    webserver.start_network(robot_id)
+    webserver.start_server()

XRPLib/webserver.py

@@ -20,7 +20,6 @@ def __init__(self):
         """
 
         gc.threshold(50000) # garbage collection
-        self.DOMAIN = "remote.xrp"
         self.logged_data = {}
         self.buttons = {"forwardButton":    lambda: logging.debug("Button not initialized"),
                         "backButton":   lambda: logging.debug("Button not initialized"),
@@ -58,7 +57,9 @@ def connect_to_network(self, ssid:str, password:str, robot_id:int, timeout = 10)
 
     def start_server(self):
         """
-        Begin the webserver on whatever network is configured, at the ip 'remote.xrp'
+        Begin the webserver in either access point or bridge mode. The IP is printed to the console.
+
+        Preconditions: Either start_network or connect_to_network must be called before this method.
         """
         logging.info(f"Starting DNS Server at {self.ip}")
         dns.run_catchall(self.ip)