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 2025-08-14 20:51:28 +02:00
parent 6bf43409e4
commit 76fe86a3bc
Signed by: LailaTheElf
GPG Key ID: 8A3EF0226518C12D
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commander.html
View File

@ -198,10 +198,10 @@
function getBoatLog(e) function getBoatLog(e)
{ {
let cmd = prompt("enter command"); // let cmd = prompt("enter command");
let boat = getDataFomEl(e.target); let boat = getDataFomEl(e.target);
console.log("send cmd", boat, cmd); // console.log("send cmd", boat, cmd);
conn.send(passEl.value + ";sendcmd;" + boat['id'] + ";" + cmd); // conn.send(passEl.value + ";sendcmd;" + boat['id'] + ";" + cmd);
conn.send(passEl.value + ";sendcmd;" + boat['id'] + ";servotrim:0"); conn.send(passEl.value + ";sendcmd;" + boat['id'] + ";servotrim:0");
conn.send(passEl.value + ";sendcmd;" + boat['id'] + ";servotrim:1"); conn.send(passEl.value + ";sendcmd;" + boat['id'] + ";servotrim:1");

23
ground-station.py
View File

@ -130,15 +130,16 @@ async def getlog(client, data):
async def sendcmd(data): async def sendcmd(data):
"""send command to boat""" """send command to boat"""
for b in Boats: if len(data) > 3:
if b['id'] == data[2]: for b in Boats:
del data[0] if b['id'] == data[2]:
del data[1] del data[0]
del data[2] del data[1]
print(data) del data[2]
data = ";".join(data) print(data)
await sendToBoat(b, data + "\n") data = ";".join(data)
return await sendToBoat(b, data + "\n")
return
async def kick_client(clientId): async def kick_client(clientId):
"""kick a client""" """kick a client"""
@ -159,7 +160,7 @@ async def on_message(message, client):
data = message.replace('\n', '').split(';') data = message.replace('\n', '').split(';')
if data[0] != client["id"]: if data[0] != client["id"]:
print("invalid id: " + str(data[0]) + " != " + str(client["id"])) print("invalid id: " + str(data[0]) + " != " + str(client["id"]))
else: elif len(data) >= 2:
if data[1] == "boats": if data[1] == "boats":
await echo_boats(client) await echo_boats(client)
elif data[1] == "ctrl": elif data[1] == "ctrl":
@ -192,6 +193,8 @@ async def on_message(message, client):
print("WARN: invalid command (admin): '" + data[1] + "'") print("WARN: invalid command (admin): '" + data[1] + "'")
else: else:
print("WARN: invalid command (" + client['id'] + "): '" + data[1] + "'") print("WARN: invalid command (" + client['id'] + "): '" + data[1] + "'")
else:
print("WARN: to little arguments")
async def new_client(clientId, ws): async def new_client(clientId, ws):
"""handler for every new client connection""" """handler for every new client connection"""