From b56583277331824a470cab3efa476288044ef9d3 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 5 Jun 2023 16:06:19 +0200 Subject: [PATCH] try resetting connection on loss --- api/views/index.ejs | 2 +- src/camera/camera/camera_controller.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api/views/index.ejs b/api/views/index.ejs index b5aa0e27..7b041ba0 100644 --- a/api/views/index.ejs +++ b/api/views/index.ejs @@ -110,7 +110,7 @@ document.getElementById("cpuload").innerHTML = "CPU load: " + data.data.cpu_usage.toString().substring(0, 6).substring(2, 4) + "%"; document.getElementById("armed").innerHTML = "Armed: " + data.data.armed; document.getElementById("control_mode").innerHTML = "Control mode: " + data.data.control_mode; - document.getElementById("speed").innerHTML = "Current speed (m/s): x: " + data.data.speed[0] + " y: " + data.data.speed[1] + " z: " + data.data.speed[2]; + document.getElementById("speed").innerHTML = "Current speed (m/s): x: " + data.data.velocity[0] + " y: " + data.data.velocity[1] + " z: " + data.data.velocity[2]; document.getElementById("position").innerHTML = "Current position (m): x: " + data.data.position[0] + " y: " + data.data.position[1] + " z: " + data.data.position[2]; } else if (data.type == "FAILSAFE") { document.getElementById("failsafe").innerHTML = "Failsafe: ENABLED"; diff --git a/src/camera/camera/camera_controller.py b/src/camera/camera/camera_controller.py index f35316ff..99b5296f 100644 --- a/src/camera/camera/camera_controller.py +++ b/src/camera/camera/camera_controller.py @@ -58,7 +58,14 @@ class CameraController(Node): def setup_websocket(self): loop = asyncio.new_event_loop() - start_server = websockets.serve(self.websocket_video, "0.0.0.0", 9002,loop=loop) + connected = False + while not connected: + try: + start_server = websockets.serve(self.websocket_video, "0.0.0.0", 9002,loop=loop) + connected = True + except Exception as e: + self.get_logger().error("error " + str(e)) + connected = False loop.run_until_complete(start_server) loop.run_forever()