Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-17 13:25:22 +03:00
Code Wiki Activity

fixes

Browse source
This commit is contained in:
breadoven 2021-11-15 22:14:59 +00:00
parent 389e292e49
commit 82865ba1e5
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/waypointCollection.js
View file

@ -5,7 +5,7 @@ let WaypointCollection = function () {
let self = {},
data = [],
maxWaypoints = 60,
maxWaypoints = 120,
isValidMission = 0,
countBusyPoints = 0,
version = 0,
@ -81,7 +81,7 @@ let WaypointCollection = function () {
self.reinit = function () {
data = [];
maxWaypoints = 60;
maxWaypoints = 120;
isValidMission = 0;
countBusyPoints = 0;
version = 0;

27
tabs/mission_control.js
View file

@ -784,12 +784,14 @@ TABS.mission_control.initialize = function (callback) {
totalmultimissionWPs = multimission.get().length + mission.get().length;
$("#updateMultimissionButton").removeClass('disabled');
$("#setActiveMissionButton").removeClass('disabled');
$('#missionPlanerElevation').show();
} else {
$('#missionDistance').text('N/A');
totalmultimissionWPs = mission.get().length;
$("#editMission").show();
$("#updateMultimissionButton").addClass('disabled');
$("#setActiveMissionButton").addClass('disabled');
$('#missionPlanerElevation').hide();
setMultimissionEditControl(true);
}
$('#multimissionInfo').text(multimissionCount + ' missions (' + totalmultimissionWPs + '/' + mission.getMaxWaypoints() + ' WPs)');
@ -804,6 +806,7 @@ TABS.mission_control.initialize = function (callback) {
$("#addMultimissionButton").addClass('disabled');
$("#setActiveMissionButton").addClass('disabled');
}
updateTotalInfo();
}
// /* checks if single mission loaded on map */
@ -886,14 +889,18 @@ TABS.mission_control.initialize = function (callback) {
mission.get()[i].setNumber(i);
i++;
});
mission.setMaxWaypoints(multimission.getMaxWaypoints());
multimission.get().splice(startWPCount, (endWPCount - startWPCount + 1)) // cut current active map mission from MM
mission.update();
updateMultimissionState();
selectedMarker = null;
clearEditForm();
setView(14);
refreshLayers();
updateTotalInfo();
plotElevation();
}
/* single mission selection using WP Edit panel button */
@ -2166,7 +2173,6 @@ TABS.mission_control.initialize = function (callback) {
$('#editMission').on('click', function () {
mapSelectEditMultimission(selectedMarker.getNumber());
updateMultimissionState();
});
/////////////////////////////////////////////
@ -2267,13 +2273,12 @@ TABS.mission_control.initialize = function (callback) {
missions += element.getEndMission() == 0xA5 ? 1 : 0;
});
if (missions == 1) updateAllMultimission();
editMultimission();
} else {
updateAllMultimission();
updateMultimissionState();
return;
}
updateMultimissionState();
editMultimission();
});
$('#addMultimissionButton').on('click', function () {
@ -2680,6 +2685,7 @@ TABS.mission_control.initialize = function (callback) {
mission.setMaxWaypoints(MISSION_PLANER.getMaxWaypoints());
mission.setValidMission(MISSION_PLANER.getValidMission());
mission.setCountBusyPoints(MISSION_PLANER.getCountBusyPoints());
multimission.setMaxWaypoints(mission.getMaxWaypoints());
updateTotalInfo();
mission.reinit();
mission.copy(MISSION_PLANER);
@ -2699,7 +2705,10 @@ TABS.mission_control.initialize = function (callback) {
function updateTotalInfo() {
if (CONFIGURATOR.connectionValid) {
let availableWPs = mission.getMaxWaypoints() - mission.getCountBusyPoints();
let availableWPs = mission.getMaxWaypoints() - mission.get().length;
if (multimissionCount && singleMissionActive()) {
availableWPs = availableWPs - multimission.get().length;
}
$('#availablePoints').text(availableWPs + '/' + mission.getMaxWaypoints());
$('#missionValid').html(mission.getValidMission() ? chrome.i18n.getMessage('armingCheckPass') : chrome.i18n.getMessage('armingCheckFail'));
}
@ -2813,6 +2822,12 @@ TABS.mission_control.initialize = function (callback) {
color: '#1f77b4',
},
};
/* Show multi mission number in plot title when single mission displayed
* Not updated when ALL multi missions displayed since plot disabled */
let missionNumber = '';
if (multimissionCount) {
missionNumber = ' ' + ($('#multimissionOptionList').val());
}
var layout = {showlegend: true,
legend: {
"orientation": "h",
@ -2820,7 +2835,7 @@ TABS.mission_control.initialize = function (callback) {
y: 1.3,
x: 0.5
},
title: 'Mission Elevation Profile',
title: 'Mission' + missionNumber + ' Elevation Profile',
xaxis: {
title: 'Distance (m)'
},

2
tabs/osd.js
View file

@ -916,7 +916,7 @@ OSD.constants = {
name: 'MISSION INFO',
id: 129,
min_version: '4.0.0',
preview: 'M1/6>27WP'
preview: 'M1/6>101WP'
},
{
name: 'VERSION',