From 815779129a25ed5a5b2c9a7c17b8f11ee8812ef6 Mon Sep 17 00:00:00 2001
From: FReenen <git@finnvanreenen.nl>
Date: Thu, 8 Aug 2024 21:09:40 +0200
Subject: [PATCH] fix bugs

---
 ground-station.py | 6 +++---
 index.html        | 4 ++--
 rx_esp32/src/ws.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ground-station.py b/ground-station.py
index a4cefae..c352bff 100644
--- a/ground-station.py
+++ b/ground-station.py
@@ -68,11 +68,11 @@ async def takeControll(client, boat):
                 b["state"] = BOAT_STATE_INCTRL
                 print("take controll: " + str(client["id"]) + " -> " + b["name"])
                 client["boat"] = b
-                client['ws'].send("OK")
+                await client['ws'].send("OK")
                 return
             else:
                 break
-    client['ws'].send("FAIL")
+    await client['ws'].send("FAIL")
 
 async def freeBoat(boat):
     global boats, clients
@@ -128,7 +128,7 @@ async def onMessage(message, client):
                 print("WARN: controll cmd (" + client['id'] + ") to None: " + data[2])
             else:
                 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:
             print("WARN: invalid command (" + client['id'] + "): '" + data[1] + "'")
 
diff --git a/index.html b/index.html
index 39a6d64..66e31b9 100644
--- a/index.html
+++ b/index.html
@@ -90,8 +90,8 @@
         }
 
         function send(x,y,angle){
-            x = Math.round((x + 100) * 163.84);
-            y = Math.round((y + 100) * 163.84);
+            x = Math.round((x + 200) * 81.92);
+            y = Math.round((y + 200) * 81.92);
             var data = clientId + ";d;" + x.toString() + "," + y.toString();
             connection.send(data);
         }
diff --git a/rx_esp32/src/ws.c b/rx_esp32/src/ws.c
index 1f30720..3a01ceb 100644
--- a/rx_esp32/src/ws.c
+++ b/rx_esp32/src/ws.c
@@ -55,7 +55,7 @@ static void ws_event_handler(void* handler_args, esp_event_base_t base, int32_t
 			} 
 			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;
 				if (sizeLeft > WS_RX_BUFFER_LEN)
 				{