From 28e7694545ba54108f62d81b83bf95e43e3cf0fd Mon Sep 17 00:00:00 2001 From: Mashintime Date: Thu, 23 Nov 2023 01:01:29 -0500 Subject: [PATCH] Fix websockets not sending data --- modem/server.py | 7 ++++++- modem/websocket_manager.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modem/server.py b/modem/server.py index 79e40d8e..4960372f 100644 --- a/modem/server.py +++ b/modem/server.py @@ -184,7 +184,7 @@ def post_modem_stop(): @app.route('/version', methods=['GET']) def get_modem_version(): - return api_response({"version": 0}) + return api_response({"version": app.MODEM_VERSION}) @app.route('/modem/send_arq_raw', methods=['POST']) def post_modem_send_raw(): @@ -218,8 +218,13 @@ def sock_events(sock): @sock.route('/fft') def sock_fft(sock): + if len(wsm.fft_client_list) == 0: + app.modem_service.put("fft:true") + print("Streaming data to FFT socket since a client is connected") wsm.handle_connection(sock, wsm.fft_client_list, app.modem_fft) @sock.route('/states') def sock_states(sock): wsm.handle_connection(sock, wsm.states_client_list, app.state_queue) + +wsm.startThreads(app) \ No newline at end of file diff --git a/modem/websocket_manager.py b/modem/websocket_manager.py index 330a8391..3a6926b4 100644 --- a/modem/websocket_manager.py +++ b/modem/websocket_manager.py @@ -41,7 +41,7 @@ def transmit_sock_data_worker(client_list, event_queue): client_list.remove(client) # start a worker thread for every socket endpoint -def startThreads(events_worker, d): +def startThreads(app): events_thread = threading.Thread(target=transmit_sock_data_worker, daemon=True, args=(events_client_list, app.modem_events)) events_thread.start()