Skip to content

Commit 2598618

Browse files
committed
Try/except, allows for defaults without secrets file
1 parent 620f544 commit 2598618

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

XRPLib/webserver.py

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,19 @@ def start_network(self, ssid:str=None, robot_id:int= None, password:str=None):
4545
:type password: str, optional
4646
"""
4747
if ssid is None:
48-
with open("../../secrets.json") as secrets_file:
49-
secrets = json.load(secrets_file)
50-
ssid = secrets["ap_ssid"]
51-
password = secrets["ap_password"]
52-
if robot_id is None:
53-
robot_id = secrets["robot_id"]
48+
try:
49+
with open("../../secrets.json") as secrets_file:
50+
secrets = json.load(secrets_file)
51+
ssid = secrets["ap_ssid"]
52+
password = secrets["ap_password"]
53+
if robot_id is None:
54+
robot_id = secrets["robot_id"]
5455
ssid = ssid.replace("{robot_id}", str(robot_id))
56+
except OSError:
57+
if robot_id is None:
58+
robot_id = 1
59+
ssid = f"XRP_{robot_id}"
60+
password = "remote.xrp"
5561
self.access_point = access_point(ssid, password)
5662
self.ip = network.WLAN(network.AP_IF).ifconfig()[0]
5763

@@ -70,10 +76,14 @@ def connect_to_network(self, ssid:str=None, password:str=None, timeout = 10):
7076
self.wlan = network.WLAN(network.STA_IF)
7177
self.wlan.active(True) # configure board to connect to wifi
7278
if ssid is None:
73-
with open("../../secrets.json") as secrets_file:
74-
secrets = json.load(secrets_file)
75-
ssid = secrets["wifi_ssid"]
76-
password = secrets["wifi_password"]
79+
try:
80+
with open("../../secrets.json") as secrets_file:
81+
secrets = json.load(secrets_file)
82+
ssid = secrets["wifi_ssid"]
83+
password = secrets["wifi_password"]
84+
except OSError:
85+
print("secrets.json not found or improperly formatted")
86+
return False
7787
self.wlan.connect(ssid,password)
7888
start_time = time.time()
7989
while not self.wlan.isconnected():

0 commit comments

Comments
 (0)