-
+
@@ -97,18 +153,65 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+ |
+
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+
diff --git a/tabs/mission_control.js b/tabs/mission_control.js
index 05d76c07..3f3a9b23 100644
--- a/tabs/mission_control.js
+++ b/tabs/mission_control.js
@@ -1,20 +1,57 @@
'use strict';
+////////////////////////////////////
+//
+// global Parameters definition
+//
+////////////////////////////////////
+
+
// MultiWii NAV Protocol
var MWNP = MWNP || {};
// WayPoint type
MWNP.WPTYPE = {
- WAYPOINT: 1,
- PH_UNLIM: 2,
- PH_TIME: 3,
- RTH: 4,
- SET_POI: 5,
- JUMP: 6,
- SET_HEAD: 7,
- LAND: 8
+ WAYPOINT: 1,
+ POSHOLD_UNLIM: 2,
+ POSHOLD_TIME: 3,
+ RTH: 4,
+ SET_POI: 5,
+ JUMP: 6,
+ SET_HEAD: 7,
+ LAND: 8
};
+// Reverse WayPoint type dictionary
+function swap(dict) {
+ let rev_dict = {};
+ for (let key in dict) {
+ rev_dict[dict[key]] = key;
+ }
+ return rev_dict;
+}
+
+MWNP.WPTYPE.REV = swap(MWNP.WPTYPE);
+
+// Dictionary of Parameter1,2,3 definition depending on type of action selected (refer to MWNP.WPTYPE)
+var dictOfLabelParameterPoint = {
+ 1: {parameter1: 'Speed (cm/s)', parameter2: '', parameter3: ''},
+ 2: {parameter1: '', parameter2: '', parameter3: ''},
+ 3: {parameter1: 'Wait time (s)', parameter2: 'Speed (cm/s)', parameter3: ''},
+ 4: {parameter1: 'Force land (non zero)', parameter2: '', parameter3: ''},
+ 5: {parameter1: '', parameter2: '', parameter3: ''},
+ 6: {parameter1: 'Target WP number', parameter2: 'Number of repeat (-1: infinite)', parameter3: ''},
+ 7: {parameter1: 'Heading (deg)', parameter2: '', parameter3: ''},
+ 8: {parameter1: '', parameter2: '', parameter3: ''}
+};
+
+var waypointOptions = ['JUMP','SET_HEAD','RTH'];
+
+////////////////////////////////////
+//
+// Tab mission control block
+//
+////////////////////////////////////
TABS.mission_control = {};
TABS.mission_control.isYmapLoad = false;
@@ -43,7 +80,9 @@ TABS.mission_control.initialize = function (callback) {
if (CONFIGURATOR.connectionValid) {
var loadChainer = new MSPChainerClass();
loadChainer.setChain([
- mspHelper.getMissionInfo
+ mspHelper.getMissionInfo,
+ //mspHelper.loadWaypoints,
+ //mspHelper.loadSafehomes
]);
loadChainer.setExitPoint(loadHtml);
loadChainer.execute();
@@ -53,13 +92,6 @@ TABS.mission_control.initialize = function (callback) {
loadHtml();
}
- function updateTotalInfo() {
- if (CONFIGURATOR.connectionValid) {
- $('#availablePoints').text(MISSION_PLANER.countBusyPoints + '/' + MISSION_PLANER.maxWaypoints);
- $('#missionValid').html(MISSION_PLANER.isValidMission ? chrome.i18n.getMessage('armingCheckPass') : chrome.i18n.getMessage('armingCheckFail'));
- }
- }
-
function loadHtml() {
GUI.load("./tabs/mission_control.html", process_html);
}
@@ -76,6 +108,11 @@ TABS.mission_control.initialize = function (callback) {
$('#saveEepromMissionButton').hide();
isOffline = true;
}
+
+ $safehomesTable = $('.safehomesTable');
+ $safehomesTableBody = $('#safehomesTableBody');
+ $waypointOptionsTable = $('.waypointOptionsTable');
+ $waypointOptionsTableBody = $('#waypointOptionsTableBody');
if (typeof require !== "undefined") {
loadSettings();
@@ -96,7 +133,7 @@ TABS.mission_control.initialize = function (callback) {
}
function get_altitude_data() {
- MSP.send_message(MSPCodes.MSP_ALTITUDE, false, false, get_attitude_data);
+ MSP.send_message(MSPCodes.MSP_ALTITUDE, false, false, get_attitude_data);
}
@@ -299,28 +336,72 @@ TABS.mission_control.initialize = function (callback) {
GUI.content_ready(callback);
}
- var markers = [];
- var lines = [];
+ ///////////////////////////////////////////////
+ //
+ // define & init parameters
+ //
+ ///////////////////////////////////////////////
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // define & init parameters for Map Layer
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ var markers = []; // Layer for Waypoints
+ var lines = []; // Layer for lines between waypoints
+ var safehomeMarkers =[]; // layer for Safehome points
+
var map;
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // define & init parameters for Selected Marker
+ //////////////////////////////////////////////////////////////////////////////////////////////
var selectedMarker = null;
- var pointForSend = 0;
- var settings = { speed: 0, alt: 5000 };
+ var selectedFeature = null;
+ var tempMarker = null;
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // define & init parameters for default Settings
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ var settings = { speed: 0, alt: 5000, safeRadiusSH : 50};
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // define & init Waypoints parameters
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ var mission = new WaypointCollection();
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // define & init Safehome parameters
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ //var SAFEHOMES = new SafehomeCollection(); // TO COMMENT FOR RELEASE : DECOMMENT FOR DEBUG
+ //SAFEHOMES.inflate(); // TO COMMENT FOR RELEASE : DECOMMENT FOR DEBUG
+ //var safehomeRangeRadius = 200; //meters
+ //var safehomeSafeRadius = 50; //meters
+
+ /////////////////////////////////////////////
+ //
+ // Reinit Jquery Form
+ //
+ /////////////////////////////////////////////
function clearEditForm() {
$('#pointLat').val('');
$('#pointLon').val('');
$('#pointAlt').val('');
- $('#pointSpeed').val('');
- $('[name=pointNumber]').val('');
+ $('#pointP1').val('');
+ $('#pointP2').val('');
+ $('#pointP3').val('');
+ $('#missionDistance').text(0);
$('#MPeditPoint').fadeOut(300);
}
-
+
+ /////////////////////////////////////////////
+ //
+ // Manage Settings
+ //
+ /////////////////////////////////////////////
function loadSettings() {
chrome.storage.local.get('missionPlanerSettings', function (result) {
if (result.missionPlanerSettings) {
settings = result.missionPlanerSettings;
}
-
refreshSettings();
});
}
@@ -330,27 +411,318 @@ TABS.mission_control.initialize = function (callback) {
}
function refreshSettings() {
- $('#MPdefaultPointAlt').val(settings.alt);
- $('#MPdefaultPointSpeed').val(settings.speed);
+ $('#MPdefaultPointAlt').val(String(settings.alt));
+ $('#MPdefaultPointSpeed').val(String(settings.speed));
+ $('#MPdefaultSafeRangeSH').val(String(settings.safeRadiusSH));
+ }
+
+ function closeSettingsPanel() {
+ $('#missionPlanerSettings').hide();
+ }
+
+ /////////////////////////////////////////////
+ //
+ // Manage Safehome
+ //
+ /////////////////////////////////////////////
+ function closeSafehomePanel() {
+ $('#missionPlanerSafehome').hide();
+ cleanSafehomeLayers();
+ }
+
+ function renderSafehomesTable() {
+ /*
+ * Process safehome table UI
+ */
+ let safehomes = SAFEHOMES.get();
+ $safehomesTableBody.find("*").remove();
+ for (let safehomeIndex in safehomes) {
+ if (safehomes.hasOwnProperty(safehomeIndex)) {
+ const safehome = safehomes[safehomeIndex];
+
+ $safehomesTableBody.append('\
+
\
+ | \
+ | \
+ | \
+ | \
+ | \
+ | \
+
\
+ ');
+
+ const $row = $safehomesTableBody.find('tr:last');
+
+
+ $row.find(".safehome-number").text(safehome.getNumber()+1);
+
+ $row.find(".safehome-enabled-value").prop('checked',safehome.isUsed()).change(function () {
+ safehome.setEnabled((($(this).prop('checked')) ? 1 : 0));
+ SAFEHOMES.updateSafehome(safehome);
+ cleanSafehomeLayers();
+ renderSafehomesOnMap();
+ });
+
+ $row.find(".safehome-lon").val(safehome.getLonMap()).change(function () {
+ safehome.setLon(Math.round(Number($(this).val()) * 10000000));
+ SAFEHOMES.updateSafehome(safehome);
+ cleanSafehomeLayers();
+ renderSafehomesOnMap();
+ });
+
+ $row.find(".safehome-lat").val(safehome.getLatMap()).change(function () {
+ safehome.setLat(Math.round(Number($(this).val()) * 10000000));
+ SAFEHOMES.updateSafehome(safehome);
+ cleanSafehomeLayers();
+ renderSafehomesOnMap();
+ });
+
+ $row.find("[data-role='safehome-center']").attr("data-index", safehomeIndex);
+ }
+ }
+ GUI.switchery();
+ localize();
+ }
+
+
+ function renderSafehomesOnMap() {
+ /*
+ * Process safehome on Map
+ */
+ SAFEHOMES.get().forEach(function (safehome) {
+ map.addLayer(addSafeHomeMarker(safehome));
+ });
+ }
+
+ function cleanSafehomeLayers() {
+ for (var i in safehomeMarkers) {
+ map.removeLayer(safehomeMarkers[i]);
+ }
+ safehomeMarkers = [];
+ }
+
+ function getSafehomeIcon(safehome) {
+ /*
+ * Process Safehome Icon
+ */
+ return new ol.style.Style({
+ image: new ol.style.Icon(({
+ anchor: [0.5, 1],
+ opacity: 1,
+ scale: 0.5,
+ src: '../images/icons/cf_icon_safehome' + (safehome.isUsed() ? '_used' : '')+ '.png'
+ })),
+ text: new ol.style.Text(({
+ text: String(Number(safehome.getNumber())+1),
+ font: '12px sans-serif',
+ offsetY: -15,
+ offsetX: -2,
+ fill: new ol.style.Fill({
+ color: '#FFFFFF'
+ }),
+ stroke: new ol.style.Stroke({
+ color: '#FFFFFF'
+ }),
+ }))
+ });
+ }
+
+ function addSafeHomeMarker(safehome) {
+ /*
+ * add safehome on Map
+ */
+ let coord = ol.proj.fromLonLat([safehome.getLonMap(), safehome.getLatMap()]);
+ var iconFeature = new ol.Feature({
+ geometry: new ol.geom.Point(coord),
+ name: 'safehome'
+ });
+
+ //iconFeature.setStyle(getSafehomeIcon(safehome, safehome.isUsed()));
+
+ let circleStyle = new ol.style.Style({
+ stroke: new ol.style.Stroke({
+ color: 'rgba(255, 163, 46, 1)',
+ width: 3,
+ lineDash : [10]
+ }),
+ // fill: new ol.style.Fill({
+ // color: 'rgba(251, 225, 155, 0.1)'
+ // })
+ });
+
+ let circleSafeStyle = new ol.style.Style({
+ stroke: new ol.style.Stroke({
+ color: 'rgba(136, 204, 62, 1)',
+ width: 3,
+ lineDash : [10]
+ }),
+ /* fill: new ol.style.Fill({
+ color: 'rgba(136, 204, 62, 0.1)'
+ }) */
+ });
+
+ var vectorLayer = new ol.layer.Vector({
+ source: new ol.source.Vector({
+ features: [iconFeature]
+ }),
+ style : function(iconFeature) {
+ let styles = [getSafehomeIcon(safehome)];
+ if (safehome.isUsed()) {
+ //circleStyle.setGeometry(new ol.geom.Circle(iconFeature.getGeometry().getCoordinates(), safehomeRangeRadius));
+ circleSafeStyle.setGeometry(new ol.geom.Circle(iconFeature.getGeometry().getCoordinates(), getProjectedRadius(Number(settings.safeRadiusSH))));
+ styles.push(circleSafeStyle);
+ }
+ return styles;
+ }
+ });
+
+ vectorLayer.kind = "safehome";
+ vectorLayer.number = safehome.getNumber();
+ vectorLayer.selection = false;
+
+ safehomeMarkers.push(vectorLayer);
+
+ return vectorLayer;
}
- function repaint() {
- var oldPos;
- for (var i in lines) {
- map.removeLayer(lines[i]);
- }
- lines = [];
+ function getProjectedRadius(radius) {
+ let projection = map.getView().getProjection();
+ let resolutionAtEquator = map.getView().getResolution();
+ let resolutionRate = resolutionAtEquator / ol.proj.getPointResolution(projection, resolutionAtEquator, map.getView().getCenter());
+ let radiusProjected = (radius / ol.proj.METERS_PER_UNIT.m) * resolutionRate;
+ return radiusProjected;
+ }
+ /////////////////////////////////////////////
+ //
+ // Manage Waypoint
+ //
+ /////////////////////////////////////////////
+
+ function removeAllWaypoints() {
+ mission.reinit();
+ cleanLayers();
+ clearEditForm();
+ updateTotalInfo();
+ }
+
+ function addWaypointMarker(waypoint, isEdit=false) {
+
+ let coord = ol.proj.fromLonLat([waypoint.getLonMap(), waypoint.getLatMap()]);
+ var iconFeature = new ol.Feature({
+ geometry: new ol.geom.Point(coord),
+ name: 'Null Island',
+ population: 4000,
+ rainfall: 500
+ });
+ iconFeature.setStyle(getWaypointIcon(waypoint, isEdit));
+ var vectorSource = new ol.source.Vector({
+ features: [iconFeature]
+ });
+
+ var vectorLayer = new ol.layer.Vector({
+ source: vectorSource
+ });
+
+ vectorLayer.kind = "waypoint";
+ vectorLayer.number = waypoint.getNumber();
+ vectorLayer.layerNumber = waypoint.getLayerNumber();
+
+ markers.push(vectorLayer);
+
+ return vectorLayer;
+ }
+
+ function getWaypointIcon(waypoint, isEdit) {
+ var dictofPointIcon = {
+ 1: 'WP',
+ 2: 'PH',
+ 3: 'PH',
+ 5: 'POI',
+ 8: 'LDG'
+ };
+
+ return new ol.style.Style({
+ image: new ol.style.Icon(({
+ anchor: [0.5, 1],
+ opacity: 1,
+ scale: 0.5,
+ src: '../images/icons/cf_icon_position' + (dictofPointIcon[waypoint.getAction()] != '' ? '_'+dictofPointIcon[waypoint.getAction()] : '') + (isEdit ? '_edit' : '')+ '.png'
+ })),
+ text: new ol.style.Text(({
+ text: String(Number(waypoint.getLayerNumber()+1)),
+ font: '12px sans-serif',
+ offsetY: -15,
+ offsetX: -2,
+ fill: new ol.style.Fill({
+ color: '#FFFFFF'
+ }),
+ stroke: new ol.style.Stroke({
+ color: '#FFFFFF'
+ }),
+ }))
+ });
+ }
+
+
+ function repaintLine4Waypoints(mission) {
+ let oldPos,
+ oldAction,
+ poiList = [],
+ oldHeading;
+ let activatePoi = false;
+ let activateHead = false;
$('#missionDistance').text(0);
-
- map.getLayers().forEach(function (t) {
- //feature.getGeometry().getType()
- if (t instanceof ol.layer.Vector && typeof t.alt !== 'undefined') {
- var geometry = t.getSource().getFeatures()[0].getGeometry();
- if (typeof oldPos !== 'undefined') {
- paintLine(oldPos, geometry.getCoordinates());
+ cleanLines();
+ mission.get().forEach(function (element) {
+ if (!element.isAttached()) {
+ let coord = ol.proj.fromLonLat([element.getLonMap(), element.getLatMap()]);
+ if (element.getAction() == 5) {
+ // If action is Set_POI, increment counter of POI
+ poiList.push(element.getNumber());
+ activatePoi = true;
+ activateHead = false;
+ }
+ else {
+ // If classic WPs, draw standard line in-between
+ if (typeof oldPos !== 'undefined' && activatePoi != true && activateHead != true){
+ paintLine(oldPos, coord, element.getNumber());
+ }
+ // 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) {
+ if ((poiList.length % 2) == 0) {
+ paintLine(oldPos, coord, element.getNumber(), color='#ffb725', lineDash=5);
+ }
+ else {
+ paintLine(oldPos, coord, element.getNumber(), color='#ffb725');
+ }
+ }
+ // If one is SET_HEAD, draw labelled line in-between with heading value
+ else if (typeof oldPos !== 'undefined' && activatePoi != true && activateHead == true) {
+ paintLine(oldPos, coord, element.getNumber(), color='#1497f1', lineDash=0, lineText=String(oldHeading)+"°");
+ }
+ oldPos = coord;
+ }
+ }
+ else if (element.isAttached()) {
+ if (element.getAction() == MWNP.WPTYPE.JUMP) {
+ let coord = ol.proj.fromLonLat([mission.getWaypoint(element.getP1()).getLonMap(), mission.getWaypoint(element.getP1()).getLatMap()]);
+ paintLine(oldPos, coord, element.getNumber(), color='#e935d6', lineDash=5, lineText="Repeat x"+(element.getP2() == -1 ? " infinite" : String(element.getP2())), selection=false);
+ }
+ // 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) {
+ if (element.getP1() == -1) {
+ activatePoi = false;
+ activateHead = false;
+ oldHeading = 'undefined'
+ }
+ else if (typeof element.getP1() != 'undefined' && element.getP1() != -1) {
+ activatePoi = false;
+ activateHead = true;
+ oldHeading = String(element.getP1());
+ }
}
-
- oldPos = geometry.getCoordinates();
}
});
//reset text position
@@ -358,8 +730,8 @@ TABS.mission_control.initialize = function (callback) {
textGeom.setCoordinates(map.getCoordinateFromPixel([0,0]));
}
}
-
- function paintLine(pos1, pos2) {
+
+ function paintLine(pos1, pos2, pos2ID, color='#1497f1', lineDash=0, lineText="", selection=true) {
var line = new ol.geom.LineString([pos1, pos2]);
var feature = new ol.Feature({
@@ -367,9 +739,19 @@ TABS.mission_control.initialize = function (callback) {
});
feature.setStyle(new ol.style.Style({
stroke: new ol.style.Stroke({
- color: '#1497f1',
- width: 3
- })
+ color: color,
+ width: 3,
+ lineDash: [lineDash]
+ }),
+ text: new ol.style.Text({
+ text: lineText,
+ font: '14px sans-serif',
+ placement : 'line',
+ textBaseline: 'ideographic',
+ stroke: new ol.style.Stroke({
+ color: color
+ }),
+ }),
}));
var vectorSource = new ol.source.Vector({
@@ -380,6 +762,11 @@ TABS.mission_control.initialize = function (callback) {
source: vectorSource
});
+
+ vectorLayer.kind = "line";
+ vectorLayer.selection = selection;
+ vectorLayer.number = pos2ID;
+
lines.push(vectorLayer);
var length = ol.Sphere.getLength(line) + parseFloat($('#missionDistance').text());
@@ -387,58 +774,164 @@ TABS.mission_control.initialize = function (callback) {
map.addLayer(vectorLayer);
}
-
- function getPointIcon(isEdit) {
- return new ol.style.Style({
- image: new ol.style.Icon(({
- anchor: [0.5, 1],
- opacity: 1,
- scale: 0.5,
- src: '../images/icons/cf_icon_position' + (isEdit ? '_edit' : '') + '.png'
- }))
- /*
- text: new ol.style.Text({
- text: '10',
- offsetX: -1,
- offsetY: -30,
- overflow: true,
- scale: 2,
- fill: new ol.style.Fill({ color: 'black' })
- })
- */
- });
+
+ function cleanLayers() {
+ for (var i in lines) {
+ map.removeLayer(lines[i]);
+ }
+ lines = [];
+
+ for (var i in markers) {
+ map.removeLayer(markers[i]);
+ }
+ markers = [];
}
-
- function addMarker(_pos, _alt, _action, _speed) {
- var iconFeature = new ol.Feature({
- geometry: new ol.geom.Point(_pos),
- name: 'Null Island',
- population: 4000,
- rainfall: 500
- });
-
- iconFeature.setStyle(getPointIcon());
-
- var vectorSource = new ol.source.Vector({
- features: [iconFeature]
- });
-
- var vectorLayer = new ol.layer.Vector({
- source: vectorSource
- });
-
- vectorLayer.alt = _alt;
- vectorLayer.number = markers.length;
- vectorLayer.action = _action;
- vectorLayer.speedValue = _speed;
-
- markers.push(vectorLayer);
-
- return vectorLayer;
+
+ function cleanLines() {
+ for (var i in lines) {
+ map.removeLayer(lines[i]);
+ }
+ lines = [];
}
+
+ function redrawLayers() {
+ if (!mission.isEmpty()) {
+ mission.get().forEach(function (element) {
+ if (!element.isAttached()) {
+ map.addLayer(addWaypointMarker(element));
+ }
+ });
+ }
+ repaintLine4Waypoints(mission);
+ }
+
+ function redrawLayer() {
+ if (selectedFeature && selectedMarker) {
+ selectedFeature.setStyle(getWaypointIcon(selectedMarker, true));
+ }
+ repaintLine4Waypoints(mission);
+ }
+
+
+ function renderWaypointOptionsTable(waypoint) {
+ /*
+ * Process Waypoint Options table UI
+ */
+ $waypointOptionsTableBody.empty();
+ mission.getAttachedFromWaypoint(waypoint).forEach(function (element) {
+ $waypointOptionsTableBody.append('\
+
\
+ | \
+ | \
+ | \
+ | \
+ | \
+ | \
+
\
+ ');
+ const $row = $waypointOptionsTableBody.find('tr:last');
+
+ for (var i = 1; i <= 3; i++) {
+ if (dictOfLabelParameterPoint[element.getAction()]['parameter'+String(i)] != '') {
+ $row.find(".waypointOptions-p"+String(i)).prop("disabled", false);
+ }
+ else {
+ $row.find(".waypointOptions-p"+String(i)).prop("disabled", true);
+ }
+ }
+
+ GUI.fillSelect($row.find(".waypointOptions-action"), waypointOptions, waypointOptions.indexOf(MWNP.WPTYPE.REV[element.getAction()]));
+
+ $row.find(".waypointOptions-action").val(waypointOptions.indexOf(MWNP.WPTYPE.REV[element.getAction()])).change(function () {
+ element.setAction(MWNP.WPTYPE[waypointOptions[$(this).val()]]);
+ for (var i = 1; i <= 3; i++) {
+ if (dictOfLabelParameterPoint[element.getAction()]['parameter'+String(i)] != '') {
+ $row.find(".waypointOptions-p"+String(i)).prop("disabled", false);
+ }
+ else {
+ $row.find(".waypointOptions-p"+String(i)).prop("disabled", true);
+ }
+ }
+ mission.updateWaypoint(element);
+ cleanLines();
+ redrawLayer();
+ });
+
+ $row.find(".waypointOptions-number").text(element.getAttachedNumber()+1);
+
+
+ $row.find(".waypointOptions-p1").val((MWNP.WPTYPE.REV[element.getAction()] == "JUMP" ? element.getP1()+1 : element.getP1())).change(function () {
+ if (MWNP.WPTYPE.REV[element.getAction()] == "SET_HEAD") {
+ if ($(this).val() >= 360 || ($(this).val() < 0 && $(this).val() != -1))
+ {
+ $(this).val(-1);
+ alert(chrome.i18n.getMessage('MissionPlannerHeadSettingsCheck'));
+ }
+ }
+ else if (MWNP.WPTYPE.REV[element.getAction()] == "RTH") {
+ if ($(this).val() != 0 && $(this).val() != 1)
+ {
+ $(this).val(0);
+ alert(chrome.i18n.getMessage('MissionPlannerRTHSettingsCheck'));
+ }
+ }
+ else if (MWNP.WPTYPE.REV[element.getAction()] == "JUMP") {
+ if ($(this).val() > mission.getNonAttachedList().length || $(this).val() < 1)
+ {
+ $(this).val(1);
+ alert(chrome.i18n.getMessage('MissionPlannerJumpSettingsCheck'));
+ }
+ else if (mission.getPoiList().length != 0 && mission.getPoiList()) {
+ console.log("mission.getPoiList() ",mission.getPoiList());
+ console.log(mission.convertJumpNumberToWaypoint(Number($(this).val())-1));
+ if (mission.getPoiList().includes(mission.convertJumpNumberToWaypoint(Number($(this).val())-1))) {
+ $(this).val(1);
+ alert(chrome.i18n.getMessage('MissionPlannerJump3SettingsCheck'));
+ }
+ }
+ }
+ element.setP1((MWNP.WPTYPE.REV[element.getAction()] == "JUMP" ? mission.convertJumpNumberToWaypoint(Number($(this).val())-1) : Number($(this).val())));
+ mission.updateWaypoint(element);
+ cleanLines();
+ redrawLayer();
+ });
+
+ $row.find(".waypointOptions-p2").val(element.getP2()).change(function () {
+ if (MWNP.WPTYPE.REV[element.getAction()] == "JUMP") {
+ if ($(this).val() > 10 || ($(this).val() < 0 && $(this).val() != -1))
+ {
+ $(this).val(0);
+ alert(chrome.i18n.getMessage('MissionPlannerJump2SettingsCheck'));
+ }
+ }
+ element.setP2(Number($(this).val()));
+ mission.updateWaypoint(element);
+ cleanLines();
+ redrawLayer();
+ });
+
+ $row.find("[data-role='waypointOptions-delete']").attr("data-index", element.getAttachedNumber()+1);
+
+ });
+ GUI.switchery();
+ localize();
+ return waypoint;
+ }
+
+ /////////////////////////////////////////////
+ //
+ // Manage Map construction
+ //
+ /////////////////////////////////////////////
function initMap() {
var app = {};
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // Drag behavior definition
+ //////////////////////////////////////////////////////////////////////////////////////////////
/**
* @constructor
@@ -497,7 +990,6 @@ TABS.mission_control.initialize = function (callback) {
button.style = 'background: url(\'../images/CF_settings_white.svg\') no-repeat 1px -1px;background-color: rgba(0,60,136,.5);';
var handleShowSettings = function () {
- $('#MPeditPoint, #missionPalnerTotalInfo').hide();
$('#missionPlanerSettings').fadeIn(300);
};
@@ -516,7 +1008,45 @@ TABS.mission_control.initialize = function (callback) {
};
ol.inherits(app.PlannerSettingsControl, ol.control.Control);
+
+
+ /**
+ * @constructor
+ * @extends {ol.control.Control}
+ * @param {Object=} opt_options Control options.
+ */
+ app.PlannerSafehomeControl = function (opt_options) {
+ var options = opt_options || {};
+ var button = document.createElement('button');
+ button.innerHTML = ' ';
+ button.style = 'background: url(\'../images/icons/cf_icon_safehome_white.svg\') no-repeat 1px -1px;background-color: rgba(0,60,136,.5);';
+
+ var handleShowSafehome = function () {
+ $('#missionPlanerSafehome').fadeIn(300);
+ //SAFEHOMES.flush();
+ //mspHelper.loadSafehomes();
+ cleanSafehomeLayers();
+ renderSafehomesTable();
+ renderSafehomesOnMap();
+ };
+
+ button.addEventListener('click', handleShowSafehome, false);
+ button.addEventListener('touchstart', handleShowSafehome, false);
+
+ var element = document.createElement('div');
+ element.className = 'mission-control-safehome ol-unselectable ol-control';
+ element.appendChild(button);
+ element.title = 'MP Safehome';
+
+ ol.control.Control.call(this, {
+ element: element,
+ target: options.target
+ });
+
+ };
+ ol.inherits(app.PlannerSafehomeControl, ol.control.Control);
+
/**
* @param {ol.MapBrowserEvent} evt Map browser event.
* @return {boolean} `true` to start the drag sequence.
@@ -528,10 +1058,15 @@ TABS.mission_control.initialize = function (callback) {
function (feature, layer) {
return feature;
});
+ tempMarker = map.forEachFeatureAtPixel(evt.pixel,
+ function (feature, layer) {
+ return layer;
+ });
if (feature) {
this.coordinate_ = evt.coordinate;
this.feature_ = feature;
+ this.layer_ = tempMarker;
}
return !!feature;
@@ -553,11 +1088,31 @@ TABS.mission_control.initialize = function (callback) {
var geometry = /** @type {ol.geom.SimpleGeometry} */
(this.feature_.getGeometry());
- geometry.translate(deltaX, deltaY);
+ if (tempMarker.kind == "waypoint" ||tempMarker.kind == "safehome") {
+ geometry.translate(deltaX, deltaY);
+ this.coordinate_[0] = evt.coordinate[0];
+ this.coordinate_[1] = evt.coordinate[1];
+ }
- this.coordinate_[0] = evt.coordinate[0];
- this.coordinate_[1] = evt.coordinate[1];
- repaint();
+ let coord = ol.proj.toLonLat(geometry.getCoordinates());
+ if (tempMarker.kind == "waypoint") {
+ let tempWp = mission.getWaypoint(tempMarker.number);
+ tempWp.setLon(Math.round(coord[0] * 10000000));
+ tempWp.setLat(Math.round(coord[1] * 10000000));
+ $('#pointLon').val(Math.round(coord[0] * 10000000) / 10000000);
+ $('#pointLat').val(Math.round(coord[1] * 10000000) / 10000000);
+ mission.updateWaypoint(tempWp);
+ repaintLine4Waypoints(mission);
+ }
+ else if (tempMarker.kind == "safehome") {
+ let tempSH = SAFEHOMES.getSafehome(tempMarker.number);
+ tempSH.setLon(Math.round(coord[0] * 10000000));
+ tempSH.setLat(Math.round(coord[1] * 10000000));
+ SAFEHOMES.updateSafehome(tempSH);
+ $safehomesTableBody.find('tr:nth-child('+String(tempMarker.number+1)+') > td > .safehome-lon').val(Math.round(coord[0] * 10000000) / 10000000);
+ $safehomesTableBody.find('tr:nth-child('+String(tempMarker.number+1)+') > td > .safehome-lat').val(Math.round(coord[1] * 10000000) / 10000000);
+ }
+
};
/**
@@ -571,7 +1126,7 @@ TABS.mission_control.initialize = function (callback) {
return feature;
});
var element = evt.map.getTargetElement();
- if (feature) {
+ if (feature && feature.name != "circleFeature" && feature.name != "circleSafeFeature") {
if (element.style.cursor != this.cursor_) {
this.previousCursor_ = element.style.cursor;
element.style.cursor = this.cursor_;
@@ -605,22 +1160,36 @@ TABS.mission_control.initialize = function (callback) {
maxZoom: 19
});
} else if ( globalSettings.mapProviderType == 'mapproxy' ) {
- mapLayer = new ol.source.TileWMS({
- url: globalSettings.proxyURL,
+ mapLayer = new ol.source.TileWMS({
+ url: globalSettings.proxyURL,
params: {'LAYERS':globalSettings.proxyLayer}
- })
+ })
} else {
mapLayer = new ol.source.OSM();
}
+
+ if (CONFIGURATOR.connectionValid) {
+ control_list = [
+ new app.PlannerSettingsControl(),
+ new app.PlannerSafehomeControl()
+ ]
+ }
+ else {
+ control_list = [
+ new app.PlannerSettingsControl(),
+ //new app.PlannerSafehomeControl() // TO COMMENT FOR RELEASE : DECOMMENT FOR DEBUG
+ ]
+ }
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // Map object definition
+ //////////////////////////////////////////////////////////////////////////////////////////////
map = new ol.Map({
controls: ol.control.defaults({
attributionOptions: {
collapsible: false
}
- }).extend([
- new app.PlannerSettingsControl()
- ]),
+ }).extend(control_list),
interactions: ol.interaction.defaults().extend([new app.Drag()]),
layers: [
new ol.layer.Tile({
@@ -634,78 +1203,115 @@ TABS.mission_control.initialize = function (callback) {
})
});
+ //////////////////////////////////////////////////////////////////////////
// Set the attribute link to open on an external browser window, so
// it doesn't interfere with the configurator.
+ //////////////////////////////////////////////////////////////////////////
setTimeout(function() {
$('.ol-attribution a').attr('target', '_blank');
}, 100);
-
+ //////////////////////////////////////////////////////////////////////////
// save map view settings when user moves it
+ //////////////////////////////////////////////////////////////////////////
map.on('moveend', function (evt) {
chrome.storage.local.set({'missionPlanerLastValues': {
center: ol.proj.toLonLat(map.getView().getCenter()),
zoom: map.getView().getZoom()
}});
});
-
+ //////////////////////////////////////////////////////////////////////////
// load map view settings on startup
+ //////////////////////////////////////////////////////////////////////////
chrome.storage.local.get('missionPlanerLastValues', function (result) {
if (result.missionPlanerLastValues && result.missionPlanerLastValues.center) {
map.getView().setCenter(ol.proj.fromLonLat(result.missionPlanerLastValues.center));
map.getView().setZoom(result.missionPlanerLastValues.zoom);
}
});
-
+ //////////////////////////////////////////////////////////////////////////
+ // Map on-click behavior definition
+ //////////////////////////////////////////////////////////////////////////
map.on('click', function (evt) {
- if (selectedMarker != null) {
+ if (selectedMarker != null && selectedFeature != null) {
try {
- selectedMarker.getSource().getFeatures()[0].setStyle(getPointIcon());
+ selectedFeature.setStyle(getWaypointIcon(selectedMarker, false));
selectedMarker = null;
+ selectedFeature = null;
+ tempMarker = null;
clearEditForm();
} catch (e) {
- GUI.log(e);
+ console.log(e);
+ GUI.log("Previous selection was not a WAYPOINT!");
}
}
-
- var selectedFeature = map.forEachFeatureAtPixel(evt.pixel,
+ selectedFeature = map.forEachFeatureAtPixel(evt.pixel,
function (feature, layer) {
return feature;
});
- var tempMarker = map.forEachFeatureAtPixel(evt.pixel,
+ tempMarker = map.forEachFeatureAtPixel(evt.pixel,
function (feature, layer) {
return layer;
});
- if (selectedFeature)
- {
- for (var i in markers)
- {
- if (markers[i] == tempMarker)
- {
- selectedMarker = tempMarker;
+ if (selectedFeature && tempMarker.kind == "waypoint") {
+ selectedMarker = mission.getWaypoint(tempMarker.number);
+ var geometry = selectedFeature.getGeometry();
+ var coord = ol.proj.toLonLat(geometry.getCoordinates());
- var geometry = selectedFeature.getGeometry();
- var coord = ol.proj.toLonLat(geometry.getCoordinates());
+ selectedFeature.setStyle(getWaypointIcon(selectedMarker, true));
- selectedFeature.setStyle(getPointIcon(true));
+ var altitudeMeters = app.ConvertCentimetersToMeters(selectedMarker.getAlt());
- var altitudeMeters = app.ConvertCentimetersToMeters(selectedMarker.alt);
-
- $('#altitudeInMeters').text(` ${altitudeMeters}m`);
- $('#pointLon').val(Math.round(coord[0] * 10000000) / 10000000);
- $('#pointLat').val(Math.round(coord[1] * 10000000) / 10000000);
- $('#pointAlt').val(selectedMarker.alt);
- $('#pointType').val(selectedMarker.action);
- $('#pointSpeed').val(selectedMarker.speedValue);
- $('#MPeditPoint').fadeIn(300);
+ $('#altitudeInMeters').text(` ${altitudeMeters}m`);
+ $('#pointLon').val(Math.round(coord[0] * 10000000) / 10000000);
+ $('#pointLat').val(Math.round(coord[1] * 10000000) / 10000000);
+ $('#pointAlt').val(selectedMarker.getAlt());
+ $('#pointType').val(selectedMarker.getAction());
+ // Change SpeedValue to Parameter1, 2, 3
+ $('#pointP1').val(selectedMarker.getP1());
+ $('#pointP2').val(selectedMarker.getP2());
+ $('#pointP3').val(selectedMarker.getP3());
+ // Selection box update depending on choice of type of waypoint
+ for (var j in dictOfLabelParameterPoint[selectedMarker.getAction()]) {
+ if (dictOfLabelParameterPoint[selectedMarker.getAction()][j] != '') {
+ $('#pointP'+String(j).slice(-1)+'class').fadeIn(300);
+ $('label[for=pointP'+String(j).slice(-1)+']').html(dictOfLabelParameterPoint[selectedMarker.getAction()][j]);
}
+ else {$('#pointP'+String(j).slice(-1)+'class').fadeOut(300);}
}
- } else {
- map.addLayer(addMarker(evt.coordinate, settings.alt, MWNP.WPTYPE.WAYPOINT, settings.speed));
- repaint();
+ selectedMarker = renderWaypointOptionsTable(selectedMarker);
+ $('#MPeditPoint').fadeIn(300);
+ redrawLayer();
}
+ else if (selectedFeature && tempMarker.kind == "line" && tempMarker.selection) {
+ let tempWpCoord = ol.proj.toLonLat(evt.coordinate);
+ let tempWp = new Waypoint(tempMarker.number, MWNP.WPTYPE.WAYPOINT, Math.round(tempWpCoord[1] * 10000000), Math.round(tempWpCoord[0] * 10000000), alt=Number(settings.alt), p1=Number(settings.speed));
+ mission.insertWaypoint(tempWp, tempMarker.number);
+ mission.update();
+ cleanLayers();
+ redrawLayers();
+ }
+ else if (selectedFeature && tempMarker.kind == "safehome" && tempMarker.selection) {
+ selectedMarker = SAFEHOMES.getSafehome(tempMarker.number);
+ var geometry = selectedFeature.getGeometry();
+ var coord = ol.proj.toLonLat(geometry.getCoordinates());
+ $safehomesTableBody.find('tr:nth-child('+String(tempMarker.number+1)+') > td > .safehome-enabled-value').val(selectedMarker.isUsed());
+ $safehomesTableBody.find('tr:nth-child('+String(tempMarker.number+1)+') > td > .safehome-lon').val(Math.round(coord[0] * 10000000) / 10000000);
+ $safehomesTableBody.find('tr:nth-child('+String(tempMarker.number+1)+') > td > .safehome-lat').val(Math.round(coord[1] * 10000000) / 10000000);
+ }
+ else {
+ let tempWpCoord = ol.proj.toLonLat(evt.coordinate);
+ let tempWp = new Waypoint(mission.get().length, MWNP.WPTYPE.WAYPOINT, Math.round(tempWpCoord[1] * 10000000), Math.round(tempWpCoord[0] * 10000000), alt=Number(settings.alt), p1=Number(settings.speed));
+ mission.put(tempWp);
+ mission.update();
+ cleanLayers();
+ redrawLayers();
+ }
+ //mission.missionDisplayDebug();
});
+ //////////////////////////////////////////////////////////////////////////
// change mouse cursor when over marker
+ //////////////////////////////////////////////////////////////////////////
$(map.getViewport()).on('mousemove', function (e) {
var pixel = map.getEventPixel(e.originalEvent);
var hit = map.forEachFeatureAtPixel(pixel, function (feature, layer) {
@@ -718,64 +1324,262 @@ TABS.mission_control.initialize = function (callback) {
}
});
+ //////////////////////////////////////////////////////////////////////////
// handle map size on container resize
+ //////////////////////////////////////////////////////////////////////////
setInterval(function () {
let width = $("#missionMap canvas").width(), height = $("#missionMap canvas").height();
if ((map.width_ != width) || (map.height_ != height)) map.updateSize();
map.width_ = width; map.height_ = height;
}, 200);
+ //////////////////////////////////////////////////////////////////////////
+ // Update Alt display in meters on ALT field keypress up
+ //////////////////////////////////////////////////////////////////////////
$('#pointAlt').keyup(function(){
let altitudeMeters = app.ConvertCentimetersToMeters($(this).val());
$('#altitudeInMeters').text(` ${altitudeMeters}m`);
});
-
+
+ /////////////////////////////////////////////
+ // Callback to show/hide menu boxes
+ /////////////////////////////////////////////
+ $('#showHideActionButton').on('click', function () {
+ var src = ($(this).children().attr('class') === 'ic_hide')
+ ? 'ic_show'
+ : 'ic_hide';
+ $(this).children().attr('class', src);
+ if ($(this).children().attr('class') === 'ic_hide') {
+ $('#ActionContent').fadeIn(300);
+ }
+ else {
+ $('#ActionContent').fadeOut(300);
+ }
+ });
+
+ $('#showHideInfoButton').on('click', function () {
+ var src = ($(this).children().attr('class') === 'ic_hide')
+ ? 'ic_show'
+ : 'ic_hide';
+ $(this).children().attr('class', src);
+ if ($(this).children().attr('class') === 'ic_hide') {
+ $('#InfoContent').fadeIn(300);
+ }
+ else {
+ $('#InfoContent').fadeOut(300);
+ }
+ });
+
+ $('#showHideSafehomeButton').on('click', function () {
+ var src = ($(this).children().attr('class') === 'ic_hide')
+ ? 'ic_show'
+ : 'ic_hide';
+ $(this).children().attr('class', src);
+ if ($(this).children().attr('class') === 'ic_hide') {
+ $('#SafehomeContent').fadeIn(300);
+ }
+ else {
+ $('#SafehomeContent').fadeOut(300);
+ }
+ });
+
+ $('#showHideWPeditButton').on('click', function () {
+ var src = ($(this).children().attr('class') === 'ic_hide')
+ ? 'ic_show'
+ : 'ic_hide';
+ $(this).children().attr('class', src);
+ if ($(this).children().attr('class') === 'ic_hide') {
+ $('#WPeditContent').fadeIn(300);
+ }
+ else {
+ $('#WPeditContent').fadeOut(300);
+ }
+ });
+
+ /////////////////////////////////////////////
+ // Callback for Waypoint edition
+ /////////////////////////////////////////////
+ $('#pointType').change(function () {
+ if (selectedMarker) {
+ selectedMarker.setAction($('#pointType').val());
+ if ([MWNP.WPTYPE.SET_POI,MWNP.WPTYPE.PH_UNLIM,MWNP.WPTYPE.LAND].includes(selectedMarker.getAction())) {
+ selectedMarker.setP1(0.0);
+ selectedMarker.setP2(0.0);
+ selectedMarker.setP3(0.0);
+ }
+ mission.updateWaypoint(selectedMarker);
+ mission.update();
+ redrawLayer();
+ }
+ });
+
+ $('#pointLat').on('keypress', function (event) {
+ if (selectedMarker && event.which == 13) {
+ selectedMarker.setLat(Math.round(Number($('#pointLat').val()) * 10000000));
+ mission.updateWaypoint(selectedMarker);
+ mission.update();
+ redrawLayer();
+ }
+ });
+
+ $('#pointLon').on('keypress', function (event) {
+ if (selectedMarker && event.which == 13) {
+ selectedMarker.setLon(Math.round(Number($('#pointLon').val()) * 10000000));
+ mission.updateWaypoint(selectedMarker);
+ mission.update();
+ redrawLayer();
+ }
+ });
+
+ $('#pointAlt').on('keypress', function (event) {
+ if (selectedMarker && event.which == 13) {
+ selectedMarker.setAlt(Number($('#pointAlt').val()));
+ mission.updateWaypoint(selectedMarker);
+ mission.update();
+ redrawLayer();
+ }
+ });
+
+ $('#pointP1').on('keypress', function (event) {
+ if (selectedMarker && event.which == 13) {
+ selectedMarker.setP1(Number($('#pointP1').val()));
+ mission.updateWaypoint(selectedMarker);
+ mission.update();
+ redrawLayer();
+ }
+ });
+
+ $('#pointP2').on('keypress', function (event) {
+ if (selectedMarker && event.which == 13) {
+ selectedMarker.setP2(Number($('#pointP2').val()));
+ mission.updateWaypoint(selectedMarker);
+ mission.update();
+ redrawLayer();
+ }
+ });
+
+ $('#pointP3').on('keypress', function (event) {
+ if (selectedMarker && event.which == 13) {
+ selectedMarker.setP3(Number($('#pointP3').val()));
+ mission.updateWaypoint(selectedMarker);
+ mission.update();
+ redrawLayer();
+ }
+ });
+
+ /////////////////////////////////////////////
+ // Callback for Waypoint Options Table
+ /////////////////////////////////////////////
+ $waypointOptionsTableBody.on('click', "[data-role='waypointOptions-delete']", function (event) {
+ if (selectedMarker) {
+ mission.dropAttachedFromWaypoint(selectedMarker, $(event.currentTarget).attr("data-index")-1);
+ renderWaypointOptionsTable(selectedMarker);
+ //cleanLines();
+ cleanLayers();
+ redrawLayers();
+ selectedFeature = markers[selectedMarker.getLayerNumber()].getSource().getFeatures()[0];
+ selectedFeature.setStyle(getWaypointIcon(selectedMarker, true));
+ }
+ });
+
+ $("[data-role='waypointOptions-add']").click(function () {
+ if (selectedMarker) {
+ mission.addAttachedFromWaypoint(selectedMarker);
+ renderWaypointOptionsTable(selectedMarker);
+ //cleanLines();
+ cleanLayers();
+ redrawLayers();
+ selectedFeature = markers[selectedMarker.getLayerNumber()].getSource().getFeatures()[0];
+ selectedFeature.setStyle(getWaypointIcon(selectedMarker, true));
+ }
+ });
+
+ /////////////////////////////////////////////
+ // Callback for SAFEHOMES Table
+ /////////////////////////////////////////////
+ $safehomesTableBody.on('click', "[data-role='safehome-center']", function (event) {
+ let mapCenter = map.getView().getCenter();
+ let tmpSH = SAFEHOMES.getSafehome($(event.currentTarget).attr("data-index"));
+ tmpSH.setLon(Math.round(ol.proj.toLonLat(mapCenter)[0] * 1e7));
+ tmpSH.setLat(Math.round(ol.proj.toLonLat(mapCenter)[1] * 1e7));
+ SAFEHOMES.updateSafehome(tmpSH);
+ renderSafehomesTable();
+ cleanSafehomeLayers();
+ renderSafehomesOnMap();
+ });
+
+ $('#cancelSafehome').on('click', function () {
+ closeSafehomePanel();
+ });
+
+ $('#loadEepromSafehomeButton').on('click', function () {
+ $(this).addClass('disabled');
+ GUI.log('Start of getting Safehome points');
+ mspHelper.loadSafehomes();
+ setTimeout(function(){
+ renderSafehomesTable();
+ cleanSafehomeLayers();
+ renderSafehomesOnMap();
+ GUI.log('End of getting Safehome points');
+ $('#loadEepromSafehomeButton').removeClass('disabled');
+ }, 500);
+
+ });
+
+ $('#saveEepromSafehomeButton').on('click', function () {
+ $(this).addClass('disabled');
+ GUI.log('Start of sending Safehome points');
+ mspHelper.saveSafehomes();
+ GUI.log('End of sending Safehome points');
+ $('#saveEepromSafehomeButton').removeClass('disabled');
+ });
+
+ /////////////////////////////////////////////
+ // Callback for Remove buttons
+ /////////////////////////////////////////////
$('#removeAllPoints').on('click', function () {
if (markers.length && confirm(chrome.i18n.getMessage('confirm_delete_all_points'))) {
- removeAllPoints();
+ removeAllWaypoints();
}
});
$('#removePoint').on('click', function () {
if (selectedMarker) {
-
- var tmp = [];
- for (var i in markers) {
- if (markers[i] !== selectedMarker && typeof markers[i].action !== "undefined") {
- tmp.push(markers[i]);
+ if (mission.isJumpTargetAttached(selectedMarker)) {
+ alert(chrome.i18n.getMessage('MissionPlannerJumpTargetRemoval'));
+ }
+ else if (mission.getAttachedFromWaypoint(selectedMarker) && mission.getAttachedFromWaypoint(selectedMarker).length != 0) {
+ if (confirm(chrome.i18n.getMessage('confirm_delete_point_with_options'))) {
+ mission.getAttachedFromWaypoint(selectedMarker).forEach(function (element) {
+ mission.dropWaypoint(element);
+ mission.update();
+ });
+ mission.dropWaypoint(selectedMarker);
+ selectedMarker = null;
+ mission.update();
+ clearEditForm();
+ cleanLayers();
+ redrawLayers();
}
}
- map.removeLayer(selectedMarker);
- markers = tmp;
- selectedMarker = null;
-
- clearEditForm();
- repaint();
+ else {
+ mission.dropWaypoint(selectedMarker);
+ selectedMarker = null;
+ mission.update();
+ clearEditForm();
+ cleanLayers();
+ redrawLayers();
+ }
}
});
-
- $('#savePoint').on('click', function () {
- if (selectedMarker) {
- map.getLayers().forEach(function (t) {
- if (t === selectedMarker) {
- var geometry = t.getSource().getFeatures()[0].getGeometry();
- geometry.setCoordinates(ol.proj.fromLonLat([parseFloat($('#pointLon').val()), parseFloat($('#pointLat').val())]));
- t.alt = $('#pointAlt').val();
- t.action = $('#pointType').val();
- t.speedValue = $('#pointSpeed').val();
- }
- });
-
- selectedMarker.getSource().getFeatures()[0].setStyle(getPointIcon());
- selectedMarker = null;
- clearEditForm();
- repaint();
- }
- });
-
+
+
+ /////////////////////////////////////////////
+ // Callback for Save/load buttons
+ /////////////////////////////////////////////
$('#loadFileMissionButton').on('click', function () {
if (markers.length && !confirm(chrome.i18n.getMessage('confirm_delete_all_points'))) return;
- removeAllPoints();
+ removeAllWaypoints();
nwdialog.setContext(document);
nwdialog.openFileDialog(function(result) {
loadMissionFile(result);
@@ -783,7 +1587,6 @@ TABS.mission_control.initialize = function (callback) {
});
$('#saveFileMissionButton').on('click', function () {
- //if (!markers.length) return;
nwdialog.setContext(document);
nwdialog.saveFileDialog('', '.mission', function(result) {
saveMissionFile(result);
@@ -792,44 +1595,47 @@ TABS.mission_control.initialize = function (callback) {
$('#loadMissionButton').on('click', function () {
if (markers.length && !confirm(chrome.i18n.getMessage('confirm_delete_all_points'))) return;
- removeAllPoints();
+ removeAllWaypoints();
$(this).addClass('disabled');
GUI.log('Start get point');
-
- pointForSend = 0;
- getNextPoint();
+ getWaypointsFromFC();
+ GUI.log('End get point');
+ $('#loadMissionButton').removeClass('disabled');
});
$('#saveMissionButton').on('click', function () {
$(this).addClass('disabled');
GUI.log('Start send point');
-
- pointForSend = 0;
- sendNextPoint();
+ sendWaypointsToFC();
+ GUI.log('End send point');
+ $('#saveMissionButton').removeClass('disabled');
+
});
$('#loadEepromMissionButton').on('click', function () {
if (markers.length && !confirm(chrome.i18n.getMessage('confirm_delete_all_points'))) return;
- removeAllPoints();
+ removeAllWaypoints();
GUI.log(chrome.i18n.getMessage('eeprom_load_ok'));
-
- MSP.send_message(MSPCodes.MSP_WP_MISSION_LOAD, [0], getPointsFromEprom);
+ MSP.send_message(MSPCodes.MSP_WP_MISSION_LOAD, [0], getWaypointsFromFC);
});
+
$('#saveEepromMissionButton').on('click', function () {
+ $(this).addClass('disabled');
+ GUI.log('Start send point');
+ sendWaypointsToFC();
+ GUI.log('End send point');
+ $('#saveEepromMissionButton').removeClass('disabled');
GUI.log(chrome.i18n.getMessage('eeprom_saved_ok'));
- MSP.send_message(MSPCodes.MSP_WP_MISSION_SAVE, [0], false);
- });
-
- $('#rthEndMission').on('change', function () {
- if ($(this).is(':checked')) {
- $('#rthSettings').fadeIn(300);
- } else {
- $('#rthSettings').fadeOut(300);
- }
+ setTimeout(function(){
+ MSP.send_message(MSPCodes.MSP_WP_MISSION_SAVE, [0], false);
+ },2000);
});
+ /////////////////////////////////////////////
+ // Callback for settings
+ /////////////////////////////////////////////
$('#saveSettings').on('click', function () {
- settings = { speed: $('#MPdefaultPointSpeed').val(), alt: $('#MPdefaultPointAlt').val() };
+ settings = { speed: Number($('#MPdefaultPointSpeed').val()), alt: Number($('#MPdefaultPointAlt').val()), safeRadiusSH: Number($('#MPdefaultSafeRangeSH').val()) };
saveSettings();
closeSettingsPanel();
});
@@ -838,31 +1644,19 @@ TABS.mission_control.initialize = function (callback) {
loadSettings();
closeSettingsPanel();
});
+
+
updateTotalInfo();
}
- function closeSettingsPanel() {
- $('#missionPlanerSettings').hide();
- $('#missionPalnerTotalInfo').fadeIn(300);
- if (selectedMarker !== null) {
- $('#MPeditPoint').fadeIn(300);
- }
- }
- function removeAllPoints() {
- for (var i in markers) {
- map.removeLayer(markers[i]);
- }
- markers = [];
- clearEditForm();
- updateTotalInfo();
- $('#rthEndMission').prop('checked', false);
- $('#rthSettings').fadeOut(300);
- $('#rthLanding').prop('checked', false);
- repaint();
- }
+ /////////////////////////////////////////////
+ //
+ // Load/Save MWP File Toolbox
+ //
+ /////////////////////////////////////////////
function loadMissionFile(filename) {
const fs = require('fs');
if (!window.xml2js) return GUI.log('
Error reading file (xml2js not found)');
@@ -880,7 +1674,7 @@ TABS.mission_control.initialize = function (callback) {
}
// parse mission file
- var mission = { points: [] };
+ removeAllWaypoints();
var node = null;
var nodemission = null;
for (var noderoot in result) {
@@ -892,97 +1686,89 @@ TABS.mission_control.initialize = function (callback) {
if (node['#name'].match(/version/i) && node.$) {
for (var attr in node.$) {
if (attr.match(/value/i)) {
- mission.version = node.$[attr]
+ mission.setVersion(node.$[attr]);
}
}
} else if (node['#name'].match(/mwp/i) && node.$) {
- mission.center = {};
for (var attr in node.$) {
if (attr.match(/zoom/i)) {
- mission.center.zoom = parseInt(node.$[attr]);
+ mission.setCenterZoom(parseInt(node.$[attr]));
} else if (attr.match(/cx/i)) {
- mission.center.lon = parseFloat(node.$[attr]);
+ mission.setCenterLon(parseFloat(node.$[attr]) * 10000000);
} else if (attr.match(/cy/i)) {
- mission.center.lat = parseFloat(node.$[attr]);
+ mission.setCenterLat(parseFloat(node.$[attr]) * 10000000);
}
}
} else if (node['#name'].match(/missionitem/i) && node.$) {
- var point = {};
+ //var point = {};
+ var point = new Waypoint(0,0,0,0);
for (var attr in node.$) {
if (attr.match(/no/i)) {
- point.index = parseInt(node.$[attr]);
+ point.setNumber(parseInt(node.$[attr]));
} else if (attr.match(/action/i)) {
if (node.$[attr].match(/WAYPOINT/i)) {
- point.action = MWNP.WPTYPE.WAYPOINT;
+ point.setAction(MWNP.WPTYPE.WAYPOINT);
} else if (node.$[attr].match(/PH_UNLIM/i) || node.$[attr].match(/POSHOLD_UNLIM/i)) {
- point.action = MWNP.WPTYPE.PH_UNLIM;
+ point.setAction(MWNP.WPTYPE.POSHOLD_UNLIM);
} else if (node.$[attr].match(/PH_TIME/i) || node.$[attr].match(/POSHOLD_TIME/i)) {
- point.action = MWNP.WPTYPE.PH_TIME;
+ point.setAction(MWNP.WPTYPE.POSHOLD_TIME);
} else if (node.$[attr].match(/RTH/i)) {
- point.action = MWNP.WPTYPE.RTH;
+ point.setAction(MWNP.WPTYPE.RTH);
} else if (node.$[attr].match(/SET_POI/i)) {
- point.action = MWNP.WPTYPE.SET_POI;
+ point.setAction(MWNP.WPTYPE.SET_POI);
} else if (node.$[attr].match(/JUMP/i)) {
- point.action = MWNP.WPTYPE.JUMP;
+ point.setAction(MWNP.WPTYPE.JUMP);
} else if (node.$[attr].match(/SET_HEAD/i)) {
- point.action = MWNP.WPTYPE.SET_HEAD;
+ point.setAction(MWNP.WPTYPE.SET_HEAD);
} else if (node.$[attr].match(/LAND/i)) {
- point.action = MWNP.WPTYPE.LAND;
+ point.setAction(MWNP.WPTYPE.LAND);
} else {
- point.action = 0;
+ point.setAction(0);
}
} else if (attr.match(/lat/i)) {
- point.lat = parseFloat(node.$[attr]);
+ point.setLat(Math.round(parseFloat(node.$[attr]) * 10000000));
} else if (attr.match(/lon/i)) {
- point.lon = parseFloat(node.$[attr]);
+ point.setLon(Math.round(parseFloat(node.$[attr]) * 10000000));
} else if (attr.match(/alt/i)) {
- point.alt = (parseInt(node.$[attr]) * 100);
+ point.setAlt((parseInt(node.$[attr]) * 100));
} else if (attr.match(/parameter1/i)) {
- point.p1 = parseInt(node.$[attr]);
+ point.setP1(parseInt(node.$[attr]));
} else if (attr.match(/parameter2/i)) {
- point.p2 = parseInt(node.$[attr]);
+ point.setP2(parseInt(node.$[attr]));
} else if (attr.match(/parameter3/i)) {
- point.p3 = parseInt(node.$[attr]);
+ point.setP3(parseInt(node.$[attr]));
}
}
- mission.points.push(point);
+ mission.put(point);
}
}
}
}
}
-
- // draw actual mission
- removeAllPoints();
- for (var i = 0; i < mission.points.length; i++) {
- //if ([MWNP.WPTYPE.WAYPOINT,MWNP.WPTYPE.PH_UNLIM,MWNP.WPTYPE.PH_TIME,MWNP.WPTYPE.LAND].includes(mission.points[i].action)) {
- if (mission.points[i].action == MWNP.WPTYPE.WAYPOINT) {
- var coord = ol.proj.fromLonLat([mission.points[i].lon, mission.points[i].lat]);
- map.addLayer(addMarker(coord, mission.points[i].alt, mission.points[i].action, mission.points[i].p1));
- if (i == 0) {
- map.getView().setCenter(coord);
- map.getView().setZoom(16);
- }
- } else if (mission.points[i].action == MWNP.WPTYPE.RTH) {
- $('#rthEndMission').prop('checked', true);
- $('#rthSettings').fadeIn(300);
- if (mission.points[i].p1 > 0) {
- $('#rthLanding').prop('checked', true);
- }
+ // update Attached Waypoints (i.e non Map Markers)
+ mission.update(true);
+ console.log("test ",Object.keys(mission.getCenter()).length !== 0);
+ if (Object.keys(mission.getCenter()).length !== 0) {
+ console.log("toto");
+ var coord = ol.proj.fromLonLat([mission.getCenter().lon / 10000000 , mission.getCenter().lat / 10000000]);
+ map.getView().setCenter(coord);
+ console.log("mission.getCenter().zoom ", mission.getCenter().zoom);
+ if (mission.getCenter().zoom) {
+ map.getView().setZoom(mission.getCenter().zoom);
+ }
+ else {
+ map.getView().setZoom(16);
}
}
-
- if (mission.center) {
- var coord = ol.proj.fromLonLat([mission.center.lon, mission.center.lat]);
+ else {
+ var coord = ol.proj.fromLonLat([mission.getWaypoint(0).getLonMap(), mission.getWaypoint(0).getLatMap()]);
map.getView().setCenter(coord);
- if (mission.center.zoom) map.getView().setZoom(mission.center.zoom);
+ map.getView().setZoom(16);
}
-
- repaint();
+
+ redrawLayers();
updateTotalInfo();
-
});
-
});
}
@@ -998,26 +1784,21 @@ TABS.mission_control.initialize = function (callback) {
'mwp': { $: { 'cx': (Math.round(center[0] * 10000000) / 10000000), 'cy': (Math.round(center[1] * 10000000) / 10000000), 'zoom': zoom } },
'missionitem': []
};
-
- for (var i = 0; i < markers.length; i++) {
- var geometry = markers[i].getSource().getFeatures()[0].getGeometry();
- var coordinate = ol.proj.toLonLat(geometry.getCoordinates());
+
+ mission.get().forEach(function (waypoint) {
var point = { $: {
- 'no': (i + 1),
- 'action': ((markers[i].action == MWNP.WPTYPE.WAYPOINT) ? 'WAYPOINT' : markers[i].action),
- 'lon': (Math.round(coordinate[0] * 10000000) / 10000000),
- 'lat': (Math.round(coordinate[1] * 10000000) / 10000000),
- 'alt': (markers[i].alt / 100)
- } };
- if ((markers[i].action == MWNP.WPTYPE.WAYPOINT) && (markers[i].speedValue > 0)) point.$['parameter1'] = markers[i].speedValue;
+ 'no': waypoint.getNumber()+1,
+ 'action': MWNP.WPTYPE.REV[waypoint.getAction()],
+ 'lat': waypoint.getLatMap(),
+ 'lon': waypoint.getLonMap(),
+ 'alt': (waypoint.getAlt() / 100),
+ 'parameter1': (MWNP.WPTYPE.REV[waypoint.getAction()] == "JUMP" ? waypoint.getP1()+1 : waypoint.getP1()),
+ 'parameter2': waypoint.getP2(),
+ 'parameter3': waypoint.getP3(),
+ } };
data.missionitem.push(point);
- }
-
- // add last RTH point
- if ($('#rthEndMission').is(':checked')) {
- data.missionitem.push({ $: { 'no': (markers.length + 1), 'action': 'RTH', 'lon': 0, 'lat': 0, 'alt': (settings.alt / 100), 'parameter1': ($('#rthLanding').is(':checked') ? 1 : 0) } });
- }
-
+ });
+
var builder = new window.xml2js.Builder({ 'rootName': 'mission', 'renderOpts': { 'pretty': true, 'indent': '\t', 'newline': '\n' } });
var xml = builder.buildObject(data);
fs.writeFile(filename, xml, (err) => {
@@ -1029,102 +1810,49 @@ TABS.mission_control.initialize = function (callback) {
});
}
- function getPointsFromEprom() {
- pointForSend = 0;
- MSP.send_message(MSPCodes.MSP_WP_GETINFO, false, false, getNextPoint);
+ /////////////////////////////////////////////
+ //
+ // Load/Save FC mission Toolbox
+ //
+ /////////////////////////////////////////////
+ function getWaypointsFromFC() {
+ mspHelper.loadWaypoints();
+ setTimeout(function(){
+ mission.reinit();
+ mission.copy(MISSION_PLANER);
+ mission.update(true);
+ redrawLayers();
+ updateTotalInfo();
+ }, 2000);
+ }
+
+ function sendWaypointsToFC() {
+ MISSION_PLANER.reinit();
+ MISSION_PLANER.copy(mission);
+ MISSION_PLANER.update(true, true);
+ mspHelper.saveWaypoints();
+ setTimeout(function(){
+ mission.setMaxWaypoints(MISSION_PLANER.getMaxWaypoints());
+ mission.setValidMission(MISSION_PLANER.getValidMission());
+ mission.setCountBusyPoints(MISSION_PLANER.getCountBusyPoints());
+ updateTotalInfo();
+ mission.reinit();
+ mission.copy(MISSION_PLANER);
+ mission.update(true);
+ cleanLayers();
+ redrawLayers();
+ $('#MPeditPoint').fadeOut(300);
+ }, 2000);
}
- function endGetPoint() {
- GUI.log('End get point');
- $('#loadMissionButton').removeClass('disabled');
- repaint();
- updateTotalInfo();
- }
- function getNextPoint() {
- if (MISSION_PLANER.countBusyPoints == 0) {
- endGetPoint();
- return;
+
+ function updateTotalInfo() {
+ if (CONFIGURATOR.connectionValid) {
+ $('#availablePoints').text(mission.getCountBusyPoints() + '/' + mission.getMaxWaypoints());
+ $('#missionValid').html(mission.getValidMission() ? chrome.i18n.getMessage('armingCheckPass') : chrome.i18n.getMessage('armingCheckFail'));
}
-
- if (pointForSend > 0) {
- // console.log(MISSION_PLANER.bufferPoint.lon);
- // console.log(MISSION_PLANER.bufferPoint.lat);
- // console.log(MISSION_PLANER.bufferPoint.alt);
- // console.log(MISSION_PLANER.bufferPoint.action);
- if (MISSION_PLANER.bufferPoint.action == 4) {
- $('#rthEndMission').prop('checked', true);
- $('#rthSettings').fadeIn(300);
- if (MISSION_PLANER.bufferPoint.p1 > 0) {
- $('#rthLanding').prop('checked', true);
- }
- } else {
- var coord = ol.proj.fromLonLat([MISSION_PLANER.bufferPoint.lon, MISSION_PLANER.bufferPoint.lat]);
- map.addLayer(addMarker(coord, MISSION_PLANER.bufferPoint.alt, MISSION_PLANER.bufferPoint.action, MISSION_PLANER.bufferPoint.p1));
- if (pointForSend === 1) {
- map.getView().setCenter(coord);
- }
- }
- }
-
- if (pointForSend >= MISSION_PLANER.countBusyPoints) {
- endGetPoint();
- return;
- }
-
- MISSION_PLANER.bufferPoint.number = pointForSend;
-
- pointForSend++;
-
- MSP.send_message(MSPCodes.MSP_WP, mspHelper.crunch(MSPCodes.MSP_WP), false, getNextPoint);
- }
-
- function sendNextPoint() {
- var isRTH = $('#rthEndMission').is(':checked');
-
- if (pointForSend >= markers.length) {
- if (isRTH) {
- MISSION_PLANER.bufferPoint.number = pointForSend + 1;
- MISSION_PLANER.bufferPoint.action = 4;
- MISSION_PLANER.bufferPoint.lon = 0;
- MISSION_PLANER.bufferPoint.lat = 0;
- MISSION_PLANER.bufferPoint.alt = 0;
- MISSION_PLANER.bufferPoint.endMission = 0xA5;
- MISSION_PLANER.bufferPoint.p1 = $('#rthLanding').is(':checked') ? 1 : 0;
- MSP.send_message(MSPCodes.MSP_SET_WP, mspHelper.crunch(MSPCodes.MSP_SET_WP), false, endSendPoint);
- } else {
- endSendPoint();
- }
-
- return;
- }
-
- var geometry = markers[pointForSend].getSource().getFeatures()[0].getGeometry();
- var coordinate = ol.proj.toLonLat(geometry.getCoordinates());
-
- MISSION_PLANER.bufferPoint.number = pointForSend + 1;
- MISSION_PLANER.bufferPoint.action = markers[pointForSend].action;
- MISSION_PLANER.bufferPoint.lon = parseInt(coordinate[0] * 10000000);
- MISSION_PLANER.bufferPoint.lat = parseInt(coordinate[1] * 10000000);
- MISSION_PLANER.bufferPoint.alt = markers[pointForSend].alt;
- MISSION_PLANER.bufferPoint.p1 = markers[pointForSend].speedValue;
- pointForSend++;
- if (pointForSend >= markers.length && !isRTH) {
- MISSION_PLANER.bufferPoint.endMission = 0xA5;
- } else {
- MISSION_PLANER.bufferPoint.endMission = 0;
- }
-
- MSP.send_message(MSPCodes.MSP_SET_WP, mspHelper.crunch(MSPCodes.MSP_SET_WP), false, sendNextPoint);
- }
-
- function endSendPoint() {
- GUI.log('End send point');
-
- MSP.send_message(MSPCodes.MSP_WP_GETINFO, false, false, updateTotalInfo);
-
- $('#saveMissionButton').removeClass('disabled');
- }
+ }
};
diff --git a/tabs/osd.js b/tabs/osd.js
index e0c5d560..27fd3367 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -26,8 +26,8 @@ SYM.WH = 0xAB;
SYM.WATT = 0xAE;
SYM.MAH_KM_0 = 157;
SYM.MAH_KM_1 = 158;
-SYM.WH_KM_0 = 172;
-SYM.WH_KM_1 = 173;
+SYM.WH_KM = 172;
+SYM.WH_MI = 173;
SYM.GPS_SAT1 = 0x1E;
SYM.GPS_SAT2 = 0x1F;
SYM.GPS_HDP1 = 0xBD;
@@ -1123,7 +1123,7 @@ OSD.constants = {
{
name: 'EFFICIENCY_WH',
id: 39,
- preview: FONT.embed_dot('1.23') + FONT.symbol(SYM.WH_KM_0) + FONT.symbol(SYM.WH_KM_1)
+ preview: FONT.embed_dot('1.23') + FONT.symbol(SYM.WH_KM)
}
]
},
diff --git a/tabs/ports.js b/tabs/ports.js
index cb3af0b2..aad48592 100644
--- a/tabs/ports.js
+++ b/tabs/ports.js
@@ -99,6 +99,12 @@ TABS.ports.initialize = function (callback) {
maxPorts: 1 }
);
+ functionRules.push({
+ name: 'IMU2',
+ groups: ['peripherals'],
+ maxPorts: 1 }
+ );
+
for (var i = 0; i < functionRules.length; i++) {
functionRules[i].displayName = chrome.i18n.getMessage('portsFunction_' + functionRules[i].name);
}