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

Fix mission planner

This commit is contained in:
Scavanger 2024-04-24 09:56:27 -03:00
parent eb7eb4b8ab
commit 27ceaca69a
2 changed files with 5 additions and 4 deletions

View file

@ -3,6 +3,7 @@
const ol = require('openlayers'); const ol = require('openlayers');
const MWNP = require('./mwnp'); const MWNP = require('./mwnp');
const Waypoint = require('./waypoint');
const BitHelper = require('./bitHelper'); const BitHelper = require('./bitHelper');
let WaypointCollection = function () { let WaypointCollection = function () {

View file

@ -1202,15 +1202,15 @@ TABS.mission_control.initialize = function (callback) {
// If one is POI, draw orange line in-between and modulate dashline each time a new POI is defined // If one is POI, draw orange line in-between and modulate dashline each time a new POI is defined
else if (typeof oldPos !== 'undefined' && activatePoi == true && activateHead != true) { else if (typeof oldPos !== 'undefined' && activatePoi == true && activateHead != true) {
if ((poiList.length % 2) == 0) { if ((poiList.length % 2) == 0) {
paintLine(oldPos, coord, element.getNumber(), color='#ffb725', lineDash=5); paintLine(oldPos, coord, element.getNumber(), '#ffb725', 5);
} }
else { else {
paintLine(oldPos, coord, element.getNumber(), color='#ffb725'); paintLine(oldPos, coord, element.getNumber(), '#ffb725');
} }
} }
// If one is SET_HEAD, draw labelled line in-between with heading value // If one is SET_HEAD, draw labelled line in-between with heading value
else if (typeof oldPos !== 'undefined' && activatePoi != true && activateHead == true) { else if (typeof oldPos !== 'undefined' && activatePoi != true && activateHead == true) {
paintLine(oldPos, coord, element.getNumber(), color='#1497f1', lineDash=0, lineText=String(oldHeading)+"°"); paintLine(oldPos, coord, element.getNumber(), '#1497f1', 0, String(oldHeading)+"°");
} }
if (element.getEndMission() == 0xA5) { if (element.getEndMission() == 0xA5) {
@ -1227,7 +1227,7 @@ TABS.mission_control.initialize = function (callback) {
if (element.getAction() == MWNP.WPTYPE.JUMP) { if (element.getAction() == MWNP.WPTYPE.JUMP) {
let jumpWPIndex = multiMissionWPNum + element.getP1(); let jumpWPIndex = multiMissionWPNum + element.getP1();
let coord = ol.proj.fromLonLat([mission.getWaypoint(jumpWPIndex).getLonMap(), mission.getWaypoint(jumpWPIndex).getLatMap()]); let coord = ol.proj.fromLonLat([mission.getWaypoint(jumpWPIndex).getLonMap(), mission.getWaypoint(jumpWPIndex).getLatMap()]);
paintLine(oldPos, coord, element.getNumber(), color='#e935d6', lineDash=5, lineText="Repeat x"+(element.getP2() == -1 ? " infinite" : String(element.getP2())), selection=false, arrow=true); paintLine(oldPos, coord, element.getNumber(), '#e935d6', 5, "Repeat x"+(element.getP2() == -1 ? " infinite" : String(element.getP2())), false, true);
} }
// If classic WPs is defined with a heading = -1, change Boolean for POI to false. If it is defined with a value different from -1, activate Heading boolean // If classic WPs is defined with a heading = -1, change Boolean for POI to false. If it is defined with a value different from -1, activate Heading boolean
else if (element.getAction() == MWNP.WPTYPE.SET_HEAD) { else if (element.getAction() == MWNP.WPTYPE.SET_HEAD) {