Separated start_network and connect_to_network

Author: ksiegall

Examples/webserver_example.py

@@ -10,11 +10,11 @@
 webserver.registerStopButton(lambda: drivetrain.set_effort(0, 0))
 
 # Binding functions to custom buttons
-webserver.add_button("test", lambda: print("test"))
-webserver.add_button("blink", lambda: board.led_blink(2))
+webserver.add_button("Test", lambda: print("test"))
+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))
-webserver.add_button("Servo_Down", lambda: servo_one.set_angle(0))
+webserver.add_button("Servo Up", lambda: servo_one.set_angle(90))
+webserver.add_button("Servo Down", lambda: servo_one.set_angle(0))
 
 # Logging static data to the webserver
 # webserver.log_data("test", "test")

XRPLib/webserver.py

@@ -31,15 +31,35 @@ def __init__(self):
         self.FUNCTION_SUFFIX = "endfunction"
         self.display_arrows = False
 
-    def start_server(self, robot_number:int):
+    def start_network(self, robot_number:int):
         """
-        Start the webserver. The network password is "remote.xrp"
-
-        :param robot_number: The number of the robot, used to generate the access point name
-        :type robot_number: int
+        Open an access point from the XRP board to be used as a captive host. The network password is "remote.xrp"
         """
         self.access_point = access_point(f"XRP_{robot_number}", "remote.xrp")
         self.ip = network.WLAN(network.AP_IF).ifconfig()[0]
+
+    def connect_to_network(self, ssid:str, password:str, timeout = 10):
+        """
+        Connect to a wifi network with the given ssid and password. 
+        If the connection fails, the board will disconnect from the network and return.
+        """
+        self.wlan = network.WLAN(network.STA_IF)
+        self.wlan.active(True) # configure board to connect to wifi
+        self.wlan.connect(ssid,password)
+        start_time = time.time()
+        while not self.wlan.isconnected():
+            print("Connecting to network, may take a second")
+            if time.time() > start_time+timeout:
+                print("Failed to connect to network, please try again")
+                self.wlan.disconnect()
+                return False
+            time.sleep(0.25)
+        self.ip = self.wlan.ifconfig()[0]
+
+    def start_server(self):
+        """
+        Begin the webserver on whatever network is configured, at the ip 'remote.xrp'
+        """
         logging.info(f"Starting DNS Server at {self.ip}")
         dns.run_catchall(self.ip)
         server.run()