LailaTheElf/rcrf-wifi
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Laila van Reenen 2024-08-08 20:44:59 +02:00
parent 1c90656508
commit 038c8752dd
Signed by: LailaTheElf
GPG Key ID: 1F4E6EE3E6DDF769
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground-station.py
View File

@ -59,9 +59,9 @@ async def echoClients(client):
async def takeControll(client, boat): async def takeControll(client, boat):
global boats global boats
print("DEBUG: " + client['id'] " takes controll of " + boat) print("DEBUG: " + client['id'] + " takes controll of " + boat)
if (client['boat'] is not None): if (client['boat'] is not None):
boat["state"] = BOAT_STATE_AVAILABLE client['boat']["state"] = BOAT_STATE_AVAILABLE
client["boat"] = None client["boat"] = None
for b in boats: for b in boats:
if (b['id'] == boat): if (b['id'] == boat):
@ -75,7 +75,7 @@ async def takeControll(client, boat):
print("WARN: takeControll: " + boat["name"] + " not available (" + str(client["id"]) + ")") print("WARN: takeControll: " + boat["name"] + " not available (" + str(client["id"]) + ")")
break break
else: else:
print("DEBUG: " boat " != " b['id']) print("DEBUG: " + boat + " != " + b['id'])
async def freeBoat(boat): async def freeBoat(boat):
global boats, clients global boats, clients

2
index.html
View File

@ -83,7 +83,7 @@
function selectBoat(e) function selectBoat(e)
{ {
connection.send(clientId + ';ctrl;', e.target.id.split('boat')[1]); connection.send(clientId + ';ctrl;' + e.target.id.split('boat')[1]);
console.log('ctrl:', e.target.id.split('boat')[1]); console.log('ctrl:', e.target.id.split('boat')[1]);
stickEl.style.display = 'block'; stickEl.style.display = 'block';
boatListEl.style.display = 'none'; boatListEl.style.display = 'none';