diff --git a/resources/motor_order/flying_wing.svg b/resources/motor_order/flying_wing.svg
index cc8f2ba1..587aaa5a 100644
--- a/resources/motor_order/flying_wing.svg
+++ b/resources/motor_order/flying_wing.svg
@@ -27,12 +27,12 @@ viewBox="0 0 850 850"
-
+
-
+
diff --git a/src/css/tabs/mission_planer.css b/src/css/tabs/mission_planer.css
index ef51efe8..1bdcef81 100644
--- a/src/css/tabs/mission_planer.css
+++ b/src/css/tabs/mission_planer.css
@@ -302,7 +302,7 @@
.tab-mission-control .safehomesTable {
width: 100%;
text-align: center;
- font-size: 8px;
+ font-size: 12px;
}
.tab-mission-control .safehomesTable input[type="text"] {
@@ -311,7 +311,7 @@
}
.tab-mission-control .safehomesTable input[type="number"] {
- font-size: 8px;
+ font-size: 10px;
width: 100%;
-moz-appearance: textfield;
}
@@ -498,8 +498,8 @@
width:20px;
}
-.tab-mission-control .textLegend{
- margin:2px;
+.tab-mission-control .textLegend{
+ margin:2px;
}
.tab-mission-control .valueLegend{
float:right;
diff --git a/tabs/auxiliary.js b/tabs/auxiliary.js
index ac4044bf..3b5cba70 100644
--- a/tabs/auxiliary.js
+++ b/tabs/auxiliary.js
@@ -200,6 +200,7 @@ TABS.auxiliary.initialize = function (callback) {
$(rangeElement).find('a.deleteRange').click(function () {
var rangeElement = $(this).data('rangeElement');
+ modeElement.removeClass('inRange');
rangeElement.remove();
});
diff --git a/tabs/mission_control.html b/tabs/mission_control.html
index 0f1a6a8a..b84aae35 100644
--- a/tabs/mission_control.html
+++ b/tabs/mission_control.html
@@ -102,10 +102,10 @@
- |
- |
- |
- |
+ |
+ |
+ |
+ |
@@ -145,11 +145,11 @@
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
diff --git a/tabs/mission_control.js b/tabs/mission_control.js
index 079630f4..aff3497a 100644
--- a/tabs/mission_control.js
+++ b/tabs/mission_control.js
@@ -474,8 +474,8 @@ TABS.mission_control.initialize = function (callback) {
\
| \
| \
- | \
| \
+ | \
\
');
@@ -645,23 +645,27 @@ TABS.mission_control.initialize = function (callback) {
* Process home table UI
*/
- $(".home-lon").val(HOME.getLonMap()).change(function () {
- HOME.setLon(Math.round(Number($(this).val()) * 10000000));
- cleanHomeLayers();
- renderHomeOnMap();
- });
-
$(".home-lat").val(HOME.getLatMap()).change(function () {
HOME.setLat(Math.round(Number($(this).val()) * 10000000));
cleanHomeLayers();
renderHomeOnMap();
});
- (async () => {
- const elevationAtHome = await HOME.getElevation(globalSettings);
- $('#elevationValueAtHome').text(elevationAtHome+' m');
- HOME.setAlt(elevationAtHome);
- })()
+ $(".home-lon").val(HOME.getLonMap()).change(function () {
+ HOME.setLon(Math.round(Number($(this).val()) * 10000000));
+ cleanHomeLayers();
+ renderHomeOnMap();
+ });
+
+ if (HOME.getLatMap() == 0 && HOME.getLonMap() == 0) {
+ HOME.setAlt("N/A");
+ } else {
+ (async () => {
+ const elevationAtHome = await HOME.getElevation(globalSettings);
+ $('#elevationValueAtHome').text(elevationAtHome+' m');
+ HOME.setAlt(elevationAtHome);
+ })()
+ }
if (globalSettings.mapProviderType == 'bing') {
$('#elevationEarthModelclass').fadeIn(300);
@@ -2009,7 +2013,6 @@ TABS.mission_control.initialize = function (callback) {
$('#loadEepromMissionButton').on('click', function () {
if (markers.length && !confirm(chrome.i18n.getMessage('confirm_delete_all_points'))) return;
removeAllWaypoints();
- GUI.log(chrome.i18n.getMessage('eeprom_load_ok'));
MSP.send_message(MSPCodes.MSP_WP_MISSION_LOAD, [0], getWaypointsFromFC);
});
@@ -2017,12 +2020,6 @@ TABS.mission_control.initialize = function (callback) {
$(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'));
- setTimeout(function(){
- MSP.send_message(MSPCodes.MSP_WP_MISSION_SAVE, [0], false);
- },2000);
});
/////////////////////////////////////////////
@@ -2168,7 +2165,9 @@ TABS.mission_control.initialize = function (callback) {
}
redrawLayers();
- updateHome();
+ if (!(HOME.getLatMap() == 0 && HOME.getLonMap() == 0)) {
+ updateHome();
+ }
updateTotalInfo();
let sFilename = String(filename.split('\\').pop().split('/').pop());
GUI.log(sFilename+' has been loaded successfully !');
@@ -2227,8 +2226,8 @@ TABS.mission_control.initialize = function (callback) {
//
/////////////////////////////////////////////
function getWaypointsFromFC() {
- mspHelper.loadWaypoints();
- setTimeout(function(){
+ mspHelper.loadWaypoints(function() {
+ GUI.log(chrome.i18n.getMessage('eeprom_load_ok'));
mission.reinit();
mission.copy(MISSION_PLANER);
mission.update(true);
@@ -2237,15 +2236,19 @@ TABS.mission_control.initialize = function (callback) {
map.getView().setZoom(16);
redrawLayers();
updateTotalInfo();
- }, 2000);
+ });
}
function sendWaypointsToFC() {
MISSION_PLANER.reinit();
MISSION_PLANER.copy(mission);
MISSION_PLANER.update(true, true);
- mspHelper.saveWaypoints();
- setTimeout(function(){
+ mspHelper.saveWaypoints(function() {
+ 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);
+
mission.setMaxWaypoints(MISSION_PLANER.getMaxWaypoints());
mission.setValidMission(MISSION_PLANER.getValidMission());
mission.setCountBusyPoints(MISSION_PLANER.getCountBusyPoints());
@@ -2256,7 +2259,7 @@ TABS.mission_control.initialize = function (callback) {
cleanLayers();
redrawLayers();
$('#MPeditPoint').fadeOut(300);
- }, 2000);
+ });
}
diff --git a/tabs/osd.js b/tabs/osd.js
index fc27b0d9..3942f0e3 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -2716,11 +2716,18 @@ OSD.GUI.updatePreviews = function() {
// consume drag/drop events.
$img.find('img').css('pointer-events', 'none');
if (item && item.positionable !== false) {
+ var nameKey = 'osdElement_' + item.name;
+ var nameMessage = chrome.i18n.getMessage(nameKey);
+
+ if (!nameMessage) {
+ nameMessage = inflection.titleize(item.name);
+ }
+
$img.addClass('field-' + item.id)
.data('item', item)
.prop('draggable', true)
.on('dragstart', OSD.GUI.preview.onDragStart)
- .prop('title', inflection.titleize(item.name));
+ .prop('title', nameMessage);
}
$row.append($img);