diff --git a/run.py b/run.py index e2bedef..1d56231 100755 --- a/run.py +++ b/run.py @@ -113,7 +113,7 @@ def start_server_socket(): case "log": fprint("log message") if call == "send": - fprint("webapp: " + data) + fprint("webapp: " + str(data), sendqueue=to_server_queue) elif call == "request": fprint("") @@ -124,6 +124,15 @@ def start_server_socket(): elif call == "request": fprint("") + # Lucas' notes + # Add a ping pong :) response/handler + # Add a get cable response/handler + # this will tell the robot arm to move + # Call for turning off everything + + # TODO Helper for converting Python Dictionaries to JSON + # make function: pythonData --> { { "type": "...", "call": "...", "data": pythonData } } + case "cable_details": fprint("cable_details message") if call == "send": @@ -235,7 +244,7 @@ def setup_server(pool): if camera_ready is False: fprint("waiting for " + "Camera initilization" + " to complete...", sendqueue=to_server_queue) - camera = process_video.qr_reader(config["cameras"]["banner"]["ip"], config["cameras"]["banner"]["port"]) + # camera = process_video.qr_reader(config["cameras"]["banner"]["ip"], config["cameras"]["banner"]["port"]) fprint("Camera initialized.", sendqueue=to_server_queue) @@ -262,8 +271,8 @@ def mainloop_server(pool): killall() counter = counter + 1 - fprint("Looking for QR code...") - print(camera.read_qr(30)) + # fprint("Looking for QR code...") + # print(camera.read_qr(30)) def run_loading_app(): diff --git a/websocket_test.html b/websocket_test.html index 4cdca7a..0d2f319 100644 --- a/websocket_test.html +++ b/websocket_test.html @@ -1,9 +1,10 @@ +
Example JSON
+{ "type": "cable_map", "call": "request", "data": { } }
+Messages/Logs