1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-25 17:25:14 +03:00

Merge pull request #2137 from breadoven/abo_mission_control_altitude_fix

Mission control WP altitude crash fix
This commit is contained in:
breadoven 2024-07-06 13:54:15 +01:00 committed by GitHub
commit 79dc312afa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -449,7 +449,7 @@ TABS.mission_control.initialize = function (callback) {
saveSettings(); saveSettings();
settings = missionPlannerSettings; settings = missionPlannerSettings;
} }
refreshSettings(); refreshSettings();
} }
function saveSettings() { function saveSettings() {
@ -1709,7 +1709,7 @@ TABS.mission_control.initialize = function (callback) {
// * @param {Object=} opt_options Control options. // * @param {Object=} opt_options Control options.
// */ // */
app.PlannerMultiMissionControl = function (opt_options) { app.PlannerMultiMissionControl = function (opt_options) {
var options = opt_options || {}; var options = opt_options || {};
var button = document.createElement('button'); var button = document.createElement('button');
@ -2214,7 +2214,7 @@ TABS.mission_control.initialize = function (callback) {
// Update Alt display in meters on ALT field keypress up // Update Alt display in meters on ALT field keypress up
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
$('#pointAlt').on('keyup', () => { $('#pointAlt').on('keyup', () => {
let altitudeMeters = app.ConvertCentimetersToMeters($(this).val()); let altitudeMeters = app.ConvertCentimetersToMeters($('#pointAlt').val());
$('#altitudeInMeters').text(` ${altitudeMeters}m`); $('#altitudeInMeters').text(` ${altitudeMeters}m`);
}); });
@ -2397,7 +2397,7 @@ TABS.mission_control.initialize = function (callback) {
$('#pointP3Alt').on('change', function (event) { $('#pointP3Alt').on('change', function (event) {
if (selectedMarker) { if (selectedMarker) {
var P3Value = selectedMarker.getP3(); var P3Value = selectedMarker.getP3();
if (disableMarkerEdit) { if (disableMarkerEdit) {
changeSwitchery($('#pointP3Alt'), TABS.mission_control.isBitSet(P3Value, MWNP.P3.ALT_TYPE)); changeSwitchery($('#pointP3Alt'), TABS.mission_control.isBitSet(P3Value, MWNP.P3.ALT_TYPE));
} }
@ -2491,7 +2491,7 @@ TABS.mission_control.initialize = function (callback) {
var P3Value = TABS.mission_control.setBit(selectedMarker.getP3(), MWNP.P3.USER_ACTION_1, $('#pointP3UserAction1').prop("checked")); var P3Value = TABS.mission_control.setBit(selectedMarker.getP3(), MWNP.P3.USER_ACTION_1, $('#pointP3UserAction1').prop("checked"));
selectedMarker.setP3(P3Value); selectedMarker.setP3(P3Value);
mission.updateWaypoint(selectedMarker); mission.updateWaypoint(selectedMarker);
mission.update(singleMissionActive()); mission.update(singleMissionActive());
redrawLayer(); redrawLayer();
@ -2518,7 +2518,7 @@ TABS.mission_control.initialize = function (callback) {
if (disableMarkerEdit) { if (disableMarkerEdit) {
changeSwitchery($('#pointP3UserAction3'), TABS.mission_control.isBitSet(selectedMarker.getP3(), MWNP.P3.USER_ACTION_3)); changeSwitchery($('#pointP3UserAction3'), TABS.mission_control.isBitSet(selectedMarker.getP3(), MWNP.P3.USER_ACTION_3));
} }
var P3Value = TABS.mission_control.setBit(selectedMarker.getP3(), MWNP.P3.USER_ACTION_3, $('#pointP3UserAction3').prop("checked")); var P3Value = TABS.mission_control.setBit(selectedMarker.getP3(), MWNP.P3.USER_ACTION_3, $('#pointP3UserAction3').prop("checked"));
selectedMarker.setP3(P3Value); selectedMarker.setP3(P3Value);
@ -2533,7 +2533,7 @@ TABS.mission_control.initialize = function (callback) {
if (disableMarkerEdit) { if (disableMarkerEdit) {
changeSwitchery($('#pointP3UserAction4'), TABS.mission_control.isBitSet(selectedMarker.getP3(), MWNP.P3.USER_ACTION_4)); changeSwitchery($('#pointP3UserAction4'), TABS.mission_control.isBitSet(selectedMarker.getP3(), MWNP.P3.USER_ACTION_4));
} }
var P3Value = TABS.mission_control.setBit(selectedMarker.getP3(), MWNP.P3.USER_ACTION_4, $('#pointP3UserAction4').prop("checked")); var P3Value = TABS.mission_control.setBit(selectedMarker.getP3(), MWNP.P3.USER_ACTION_4, $('#pointP3UserAction4').prop("checked"));
selectedMarker.setP3(P3Value); selectedMarker.setP3(P3Value);