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 21:09:40 +02:00
parent 463843bf8b
commit 815779129a
Signed by: LailaTheElf
GPG Key ID: 1F4E6EE3E6DDF769
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground-station.py
View File

@ -68,11 +68,11 @@ async def takeControll(client, boat):
b["state"] = BOAT_STATE_INCTRL b["state"] = BOAT_STATE_INCTRL
print("take controll: " + str(client["id"]) + " -> " + b["name"]) print("take controll: " + str(client["id"]) + " -> " + b["name"])
client["boat"] = b client["boat"] = b
client['ws'].send("OK") await client['ws'].send("OK")
return return
else: else:
break break
client['ws'].send("FAIL") await client['ws'].send("FAIL")
async def freeBoat(boat): async def freeBoat(boat):
global boats, clients global boats, clients
@ -128,7 +128,7 @@ async def onMessage(message, client):
print("WARN: controll cmd (" + client['id'] + ") to None: " + data[2]) print("WARN: controll cmd (" + client['id'] + ") to None: " + data[2])
else: else:
print("INFO: controll cmd (" + client['id'] + ") to " + client['boat']['name'] + ": " + data[2]) print("INFO: controll cmd (" + client['id'] + ") to " + client['boat']['name'] + ": " + data[2])
client['boat']['ws'].send("d:" + data[2]) await client['boat']['ws'].send("d:" + data[2])
else: else:
print("WARN: invalid command (" + client['id'] + "): '" + data[1] + "'") print("WARN: invalid command (" + client['id'] + "): '" + data[1] + "'")

4
index.html
View File

@ -90,8 +90,8 @@
} }
function send(x,y,angle){ function send(x,y,angle){
x = Math.round((x + 100) * 163.84); x = Math.round((x + 200) * 81.92);
y = Math.round((y + 100) * 163.84); y = Math.round((y + 200) * 81.92);
var data = clientId + ";d;" + x.toString() + "," + y.toString(); var data = clientId + ";d;" + x.toString() + "," + y.toString();
connection.send(data); connection.send(data);
} }

2
rx_esp32/src/ws.c
View File

@ -55,7 +55,7 @@ static void ws_event_handler(void* handler_args, esp_event_base_t base, int32_t
} }
else else
{ {
LOG_D("ws_event_handler: data recieved (opcode: %d, size: %d): %.*s", data->op_code, data->data_len, data->data_len, (char*) data->data_ptr); LOG_D("ws_event_handler: data recieved (opcode: %02x, size: %d): '%.*s'", data->op_code, data->data_len, data->data_len, (char*) data->data_ptr);
uint16_t sizeLeft = WS_RX_BUFFER_LEN + client->rxBuffer_rp - client->rxBuffer_wp; uint16_t sizeLeft = WS_RX_BUFFER_LEN + client->rxBuffer_rp - client->rxBuffer_wp;
if (sizeLeft > WS_RX_BUFFER_LEN) if (sizeLeft > WS_RX_BUFFER_LEN)
{ {