Added access point settings into secrets.json

Author: ksiegall

XRPLib/webserver.py

@@ -33,17 +33,39 @@ def __init__(self):
         self.FUNCTION_SUFFIX = "endfunction"
         self.display_arrows = False
 
-    def start_network(self, robot_id:int):
+    def start_network(self, ssid:str=None, robot_id:int= None, password:str=None):
         """
-        Open an access point from the XRP board to be used as a captive host. The network password is "remote.xrp"
+        Open an access point from the XRP board to be used as a captive host. The default network information can be set in secrets.json
+
+        :param ssid: The ssid of the access point, defaults to value from secrets.json
+        :type ssid: str, optional
+        :param robot_id: Replaces "{robot_id}" in ssid, defaults to value from secrets.json
+        :type robot_id: int, optional
+        :param password: The password of the access point, defaults to value from secrets.json
+        :type password: str, optional
         """
-        self.access_point = access_point(f"XRP_{robot_id}", "remote.xrp")
+        if ssid is None:
+            with open("../secrets.json") as secrets_file:
+                secrets = json.load(secrets_file)
+                ssid = secrets["ap_ssid"]
+                password = secrets["ap_password"]
+                if robot_id is None:
+                    robot_id = secrets["robot_id"]
+                ssid.replace("{robot_id}", robot_id)
+        self.access_point = access_point(ssid, password)
         self.ip = network.WLAN(network.AP_IF).ifconfig()[0]
 
     def connect_to_network(self, ssid:str=None, password:str=None, 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.
+
+        :param ssid: The ssid of the network, defaults to value from secrets.json
+        :type ssid: str, optional
+        :param password: The password of the network, defaults to value from secrets.json
+        :type password: str, optional
+        :param timeout: The amount of time to wait for the connection to succeed, defaults to 10
+        :type timeout: int, optional
         """
         self.wlan = network.WLAN(network.STA_IF)
         self.wlan.active(True) # configure board to connect to wifi

secrets.json

@@ -1,4 +1,7 @@
 {
     "wifi_ssid": "YOUR_WIFI_SSID",
-    "wifi_password": "YOUR_WIFI_PASSWORD"
+    "wifi_password": "YOUR_WIFI_PASSWORD",
+    "robot_id": 1,
+    "ap_ssid": "XRP {robot_id}",
+    "ap_password": "remote.xrp"
 }