CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-05-26 15:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

A lot of changes

Browse Source 
Added 3 more buttons, removed deselect and added time delta instead of time
This commit is contained in:
Igor Nurullaev
2019-09-03 19:41:46 +03:00
parent c15d540505
commit 949026f76b
3 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Server/app_routes/selfcheck.py
View File

@@ -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')
@@ -17,7 +18,7 @@ def selfcheck_selected():
'batt_voltage': copter.batt_voltage,
'cell_voltage': copter.cell_voltage,
'selfcheck': copter.selfcheck,
'time': copter.time,
'time': round(float(copter.time) - time(), 3),
'name': copter.name,
}
# data = {"anim_id": "No animation", "batt_voltage": 3.259999990463257, "cell_voltage": 1.0850000381469727,
@@ -39,9 +40,10 @@ def selfcheck_all():
'time': copter.time,
'name': copter.name,
})
# data = [{"anim_id": "No animation", "batt_voltage": 4.259999990463257, "cell_voltage": 4.0850000381469727,
# "ip": "192.168.43.31", "name": "CLever7", "selfcheck": "OK", "time": 4554723269.57106}]
# data *= 12
#return jsonify([{"anim_id": "No animation", "batt_voltage": 12.333000183105469, "cell_voltage": 4.111999988555908,
# "ip": "192.168.1.191", "name": "Clever8", "selfcheck": "OK", "time": 1554720157.469769},
# {"anim_id": "No animation", "batt_voltage": 12.244999885559082, "cell_voltage": 4.0879998207092285,
# "ip": "192.168.1.134", "name": "Clever7", "selfcheck": "OK", "time": 1554720082.641047}])
return jsonify(data)
@@ -67,3 +69,30 @@ def test_led_selected():
if copter.ip == ip:
copter.client.send_message("led_test")
return jsonify({'m': 'ok'})
@selfcheck_api.route('/reboot_fcu/selected', methods=['GET', 'POST'])
def reboot_fcu_selected():
ip = request.args.get("ip")
for copter in copters:
if copter.ip == ip:
copter.client.send_message("reboot_fcu")
return jsonify({'m': 'ok'})
@selfcheck_api.route('/calibrate_gyro/selected', methods=['GET', 'POST'])
def calibrate_gyro_selected():
ip = request.args.get("ip")
for copter in copters:
if copter.ip == ip:
copter.client.send_message("calibrate_gyro")
return jsonify({'m': 'ok'})
@selfcheck_api.route('/calibrate_level/selected', methods=['GET', 'POST'])
def calibrate_level_selected():
ip = request.args.get("ip")
for copter in copters:
if copter.ip == ip:
copter.client.send_message("calibrate_level")
return jsonify({'m': 'ok'})

13
Server/static/js/main.js
View File

@@ -87,7 +87,6 @@ function sendCommandToSelected(command) {
req.send();
element.deselect();
});
deselectAll();
spinner.style.display = 'none';
}, 20);
}
@@ -139,6 +138,18 @@ function resumeCopters() {
sendCommandToSelected('resume');
}
function restart_fcu() {
sendCommandToSelected('reboot_fcu');
}
function calibrate_gyro() {
sendCommandToSelected('calibrate_gyro');
}
function calibrate_level() {
sendCommandToSelected('calibrate_level');
}
function emLand() {
spinner.style.display = 'inline-block';
setTimeout(function () {

8
Server/templates/main.html
View File

@@ -73,7 +73,8 @@
<button type="button" class="btn btn-info btn-lg" onclick="testLedSelected()">Test led</button>
</div>
<div class="btn-group">
<input id="delay" class="form-control form-control-lg" type="number" onchange="setStartTime()" placeholder="Delay">
<input id="delay" class="form-control form-control-lg" type="number" onchange="setStartTime()"
placeholder="Delay">
<button type="button" class="btn btn-success btn-lg" onclick="startAnimation()">Start animation</button>
</div>
<div class="btn-group">
@@ -92,6 +93,11 @@
<button type="button" class="btn btn-outline-primary btn-lg" onclick="land()">Land</button>
<button type="button" class="btn btn-outline-primary btn-lg" onclick="disarm()">Disarm</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-outline-primary btn-lg" onclick="restart_fcu()">Restart FCU</button>
<button type="button" class="btn btn-outline-primary btn-lg" onclick="calibrate_gyro()">Calibrate gyro</button>
<button type="button" class="btn btn-outline-primary btn-lg" onclick="calibrate_level()">Calibrate level</button>
</div>
</div>
<div class="action-container"></div>
</div>