From 04f87614e7eb81ece6e1a0fe4a8d2055976a2ed9 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Wed, 4 Sep 2019 19:02:04 +0300 Subject: [PATCH] Make some fixes --- Server/app_routes/selfcheck.py | 7 ++++--- Server/web_server_models.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Server/app_routes/selfcheck.py b/Server/app_routes/selfcheck.py index bee341f..7e34300 100644 --- a/Server/app_routes/selfcheck.py +++ b/Server/app_routes/selfcheck.py @@ -1,6 +1,7 @@ from flask import Blueprint, request, jsonify from web_server_models import copters, WebCopter from server import Client +from time import time selfcheck_api = Blueprint('selfcheck_api', __name__, template_folder='templates') @@ -11,13 +12,13 @@ def selfcheck_selected(): ip = request.args.get("ip") for copter in copters: if copter.ip == ip: - time = copter.refresh() + copter.refresh() data = { 'anim_id': copter.anim_id, 'batt_voltage': copter.batt_voltage, 'cell_voltage': copter.cell_voltage, 'selfcheck': copter.selfcheck, - 'time': round(float(copter.time) - time, 3), + 'time': round(float(copter.time) - time(), 3), 'name': copter.name, } # data = {"anim_id": "No animation", "batt_voltage": 3.259999990463257, "cell_voltage": 1.0850000381469727, @@ -29,7 +30,7 @@ def selfcheck_selected(): def selfcheck_all(): data = [] for copter in copters: - time = copter.refresh() + copter.refresh() data.append({ 'anim_id': copter.anim_id, 'batt_voltage': copter.batt_voltage, diff --git a/Server/web_server_models.py b/Server/web_server_models.py index 960d22f..72974bf 100644 --- a/Server/web_server_models.py +++ b/Server/web_server_models.py @@ -1,7 +1,8 @@ +from server import Client + copters = [] delay = 0 - def set_delay_manually(_delay): global delay delay = _delay