From 0c4c01169cd020f0928094ed51c9e8b16f92c980 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Wed, 4 Sep 2019 17:21:03 +0300 Subject: [PATCH] Add actual time waiting for selfcheck --- Server/app_routes/selfcheck.py | 2 +- Server/web_server_models.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Server/app_routes/selfcheck.py b/Server/app_routes/selfcheck.py index d2f82ea..056c299 100644 --- a/Server/app_routes/selfcheck.py +++ b/Server/app_routes/selfcheck.py @@ -36,7 +36,7 @@ def selfcheck_all(): 'cell_voltage': copter.cell_voltage, 'selfcheck': copter.selfcheck, 'ip': copter.ip, - 'time': round(float(copter.time) - time, 3), + 'time': round(float(copter.time) - time(), 3), 'name': copter.name, }) # return jsonify([{"anim_id": "No animation", "batt_voltage": 12.333000183105469, "cell_voltage": 4.111999988555908, diff --git a/Server/web_server_models.py b/Server/web_server_models.py index 5b7ebf2..e1e19c6 100644 --- a/Server/web_server_models.py +++ b/Server/web_server_models.py @@ -31,8 +31,10 @@ class WebCopter: self.client.get_response("batt_voltage", save, callback_args=(self, 'batt_voltage')) self.client.get_response("cell_voltage", save, callback_args=(self, 'cell_voltage')) self.client.get_response("selfcheck", save, callback_args=(self, 'selfcheck')) + t1 = self.time self.client.get_response("time", save, callback_args=(self, 'time')) - return time() + while t1 == self.time: + pass def save(m, self, param_name):