Skip to content

Commit b7469aa

Browse files
hankhank10hankhank10
committed
Tidying up
1 parent ea84895 commit b7469aa

File tree

12 files changed

+62
-781
lines changed

12 files changed

+62
-781
lines changed

‎format_tools.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎flask_dummy_server.py renamed to ‎glass_dummy_server.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#
2+
# This is a dummy server which does not connect to MSFS2020
3+
# It just serves up random data which allows testing of the front end without MSFS2020 running
4+
# If you want to connect to MSFS2020 then you are looking for glass_server.py
5+
6+
17
from flask import Flask, jsonify, render_template, request
28
from time import sleep
39
import random
@@ -18,7 +24,7 @@ def ajax_test():
1824

1925
@app.route ('/glass')
2026
def glass():
21-
return render_template("glass3.html")
27+
return render_template("glass.html")
2228

2329
@app.route('/ui')
2430
def output_ui_variables():

‎flask_server.py renamed to ‎glass_server.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,13 @@
241241
request_autopilot.add('FLY_BY_WIRE_SEC_FAILED', (b'FLY BY WIRE SEC FAILED', b'Bool'))
242242

243243

244-
@app.route ('/glass')
244+
def thousandify(x):
245+
return f"{x:,}"
246+
247+
248+
@app.route ('/')
245249
def glass():
246-
return render_template("glass3.html")
250+
return render_template("glass.html")
247251

248252

249253
def get_data(data_type):
@@ -294,7 +298,7 @@ def output_ui_variables():
294298
fuel_percentage = (data_dictionary.get("FUEL_TOTAL_QUANTITY") / data_dictionary.get("FUEL_TOTAL_CAPACITY")) * 100
295299
ui_friendly_dictionary["FUEL_PERCENTAGE"] = round(fuel_percentage)
296300
ui_friendly_dictionary["AIRSPEED_INDICATE"] = round(data_dictionary.get("AIRSPEED_INDICATE"))
297-
ui_friendly_dictionary["ALTITUDE"] = round(data_dictionary.get("ALTITUDE"))
301+
ui_friendly_dictionary["ALTITUDE"] = thousandify(round(data_dictionary.get("ALTITUDE")))
298302
ui_friendly_dictionary["FLAPS_HANDLE_PERCENT"] = round(data_dictionary["FLAPS_HANDLE_PERCENT"]*100)
299303

300304
if data_dictionary["GEAR_HANDLE_POSITION"] == 1:
@@ -308,11 +312,7 @@ def output_ui_variables():
308312
ui_friendly_dictionary["MAGNETIC_COMPASS"] = round(data_dictionary.get("MAGNETIC_COMPASS"))
309313
ui_friendly_dictionary["VERTICAL_SPEED"] = round(data_dictionary.get("VERTICAL_SPEED"))
310314

311-
if data_dictionary.get("AUTOPILOT_MASTER") == 0:
312-
ui_friendly_dictionary["AUTOPILOT_MASTER"] = False
313-
else:
314-
ui_friendly_dictionary["AUTOPILOT_MASTER"] = True
315-
315+
ui_friendly_dictionary["AUTOPILOT_MASTER"] = data_dictionary.get("AUTOPILOT_MASTER")
316316
ui_friendly_dictionary["AUTOPILOT_NAV_SELECTED"] = data_dictionary.get("AUTOPILOT_NAV_SELECTED")
317317
ui_friendly_dictionary["AUTOPILOT_WING_LEVELER"] = data_dictionary.get("AUTOPILOT_WING_LEVELER")
318318
ui_friendly_dictionary["AUTOPILOT_HEADING_LOCK"] = data_dictionary.get("AUTOPILOT_HEADING_LOCK")

‎reporter.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎static/img/plane8.png renamed to ‎static/img/plane.png

File renamed without changes.

‎templates/ajaxtest.html

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎templates/ajaxtest2.html

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎templates/ajaxtest3.html

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎templates/glass3.html renamed to ‎templates/glass.html

Lines changed: 47 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ <h3 class="card-title"><span id=airspeed>?</span></h3>
150150
<div class="card bg-light mb-3">
151151
<div class="card-body">
152152
<h7>Autopilot Master</h7><br><br>
153-
<input id="autopilot-master" class="form-check-input" type="checkbox" data-toggle="toggle" data-width="150" data-on="Engaged" data-off="Disengaged" data-onstyle="success" data-offstyle="danger" disabled>
153+
<input id="autopilot-master" class="form-check-input" type="checkbox" data-toggle="toggle" data-width="150" data-on="Engaged" data-off="Disengaged" data-onstyle="success" data-offstyle="danger">
154154
</div>
155155
</div>
156156
</div>
@@ -162,48 +162,48 @@ <h3 class="card-title"><span id=airspeed>?</span></h3>
162162
<table style="border-collapse:separate; border-spacing:0 5px;">
163163
<tr>
164164
<td width="120">Wing Leveler</td>
165-
<td width="100"><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
166-
<td></td>
167-
</tr>
168-
<tr>
169-
<td>NAV</td>
170-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
165+
<td width="100"><input id="autopilot-wing-leveler" class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
171166
<td></td>
172167
</tr>
173168

174169
<tr>
175170
<td>Heading</td>
176-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
171+
<td><input class="form-check-input m-2" id="autopilot_heading_lock" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
177172
<td>[ ]</td>
178173
</tr>
179174
<tr>
180175
<td>Altitude</td>
181-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
176+
<td><input class="form-check-input m-2" id="autopilot_altitude_lock" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
182177
<td>[ ]</td>
183178
</tr>
184179
<tr>
185180
<td>Airspeed</td>
186-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
181+
<td><input class="form-check-input m-2" id="autopilot_airspeed_hold" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
187182
<td>[ ]</td>
188183
</tr>
189184
<tr>
190185
<td>Attitude</td>
191-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
186+
<td><input class="form-check-input m-2" id="autopilot_attitude_hold" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
192187
<td></td>
193188
</tr>
189+
<tr>
190+
<td>Pitch</td>
191+
<td><input class="form-check-input m-2" id="autopilot_pitch_hold" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
192+
<td>[ ]</td>
193+
</tr>
194194
<tr>
195195
<td>Backcourse</td>
196-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
196+
<td><input class="form-check-input m-2" id="autopilot_backcourse_hold" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
197197
<td></td>
198198
</tr>
199199
<tr>
200200
<td>Glideslope</td>
201-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
201+
<td><input class="form-check-input m-2" id="autopilot_glidescope_hold" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
202202
<td></td>
203203
</tr>
204204
<tr>
205205
<td>Approach</td>
206-
<td><input class="form-check-input m-2" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px" disabled></td>
206+
<td><input class="form-check-input m-2" id="autopilot_approach_hold" type="checkbox" data-toggle="toggle" data-width="75" data-on="On" data-off="Off" data-onstyle="success" data-offstyle="danger" data-height="10px"></td>
207207
<td></td>
208208
</tr>
209209
</table>
@@ -242,7 +242,7 @@ <h3 class="card-title"><span id=airspeed>?</span></h3>
242242

243243
// Icon options
244244
var iconOptions = {
245-
iconUrl: '/static/img/plane8.png',
245+
iconUrl: '/static/img/plane.png',
246246
iconSize: [35, 35]
247247
}
248248

@@ -275,6 +275,25 @@ <h3 class="card-title"><span id=airspeed>?</span></h3>
275275
let latitude;
276276
let longitude;
277277

278+
let autopilot_master;
279+
let autopilot_nav_selected;
280+
let autopilot_wing_leveler;
281+
let autopilot_heading_lock;
282+
let autopilot_heading_lock_dir;
283+
let autopilot_altitude_lock;
284+
let autopilot_altitude_lock_var;
285+
let autopilot_attitude_hold;
286+
let autopilot_glidescope_hold;
287+
let autopilot_approach_hold;
288+
let autopilot_backcourse_hold;
289+
let autopilot_vertical_hold;
290+
let autopilot_vertical_hold_var;
291+
let autopilot_pitch_hold;
292+
let autopilot_pitch_hold_ref;
293+
let autopilot_flight_director_active;
294+
let autopilot_airspeed_hold;
295+
let autopilot_airspeed_hold_var;
296+
278297
function getSimulatorData() {
279298
$.getJSON($SCRIPT_ROOT + '/ui', {}, function(data) {
280299
altitude = data.ALTITUDE;
@@ -297,7 +316,7 @@ <h3 class="card-title"><span id=airspeed>?</span></h3>
297316
autopilot_glidescope_hold = data.AUTOPILOT_GLIDESLOPE_HOLD;
298317
autopilot_approach_hold = data.AUTOPILOT_APPROACH_HOLD;
299318
autopilot_backcourse_hold = data.AUTOPILOT_BACKCOURSE_HOLD;
300-
autopulot_autopilot_vertical_hold = data.AUTOPILOT_VERTICAL_HOLD
319+
autopilot_vertical_hold = data.AUTOPILOT_VERTICAL_HOLD
301320
autopilot_vertical_hold_var = data.AUTOPILOT_VERTICAL_HOLD_VAR;
302321
autopilot_pitch_hold = data.AUTOPILOT_PITCH_HOLD
303322
autopilot_pitch_hold_ref = data.AUTOPILOT_PITCH_HOLD_REF;
@@ -314,7 +333,18 @@ <h3 class="card-title"><span id=airspeed>?</span></h3>
314333
$("#compass").text(compass);
315334
$("#vertical-speed").text(vertical_speed);
316335
$("#airspeed").text(airspeed);
317-
$("#autopilot-master").prop('checked', true);
336+
337+
$("#autopilot-master").prop('checked', autopilot_master).change()
338+
$("#autopilot_wing_leveler").prop('checked', autopilot_wing_leveler).change()
339+
$("#autopilot_heading_lock").prop('checked', autopilot_heading_lock).change()
340+
$("#autopilot_altitude_lock").prop('checked', autopilot_altitude_lock).change()
341+
$("#autopilot_airspeed_hold").prop('checked', autopilot_airspeed_hold).change()
342+
$("#autopilot_attitude_hold").prop('checked', autopilot_attitude_hold).change()
343+
$("#autopilot_pitch_hold").prop('checked', autopilot_attitude_hold).change()
344+
$("#autopilot_backcourse_hold").prop('checked', autopilot_backcourse_hold).change()
345+
$("#autopilot_glidescope_hold").prop('checked', autopilot_glidescope_hold).change()
346+
$("#autopilot_approach_hold").prop('checked', autopilot_approach_hold).change()
347+
318348

319349
$("#fuel-percentage").text(fuel_percentage);
320350
$("#fuel-percentage-bar").css("width", fuel_percentage+"%");

0 commit comments

Comments
 (0)