Release 7.1.0

_locales/en/messages.json

@@ -850,7 +850,7 @@
         "message": "External PWM servo driver"
     },
     "featurePWM_SERVO_DRIVERTip": {
-        "message": "Use external PCA9685 PMW driver to connect up to 16 servos to flight controller. PCA9685 has to be connected to enable this feature."
+        "message": "Use external PCA9685 PWM driver to connect up to 16 servos to flight controller. PCA9685 has to be connected to enable this feature."
     },
     "featureRSSI_ADCTip": {
         "message": "RSSI is a measurement of signal strength and is very handy so you know when your aircraft is going out of range or if it is suffering RF interference."
@@ -2999,8 +2999,8 @@
     "posholdHoverThrottle": {
         "message": "Hover throttle"
     },
-    "posholdHoverMidThrottle": {
-        "message": "Use mid. throttle for ALTHOLD"
+    "navmcAltholdThrottle": {
+        "message": "Stick position for althold hover"
     },
     "mcWpSlowdown": {
         "message": "Slow down when approaching waypoint"
@@ -3377,6 +3377,54 @@
     "fixedWingNavigationConfiguration": {
         "message": "Fixed Wing Navigation Settings"
     },
+    "fixedWingLandingConfiguration": {
+        "message": "Fixed Wing Landing Settings"
+    },
+    "MissionPlannerOnlyOneLandWp": {
+        "message": "You can set only one LAND Waypoint per mission."
+    },
+    "fwLandApproachLength" : {
+        "message": "Final approach length"
+    },
+    "fwLandApproachLengthHelp": {
+        "message": "Length of the final approach, also includes the glide and intercept phase. This is the length from the safe home point to the final turn point."
+    },
+    "fwLandFinalApproachPitch2throttle": {
+        "message": "Modifier for pitch to throttle ratio at final approach"
+    },
+    "fwLandFinalApproachPitch2throttleHelp": {
+        "message": "This value is multiplied by the \"pitch to throttle ratio\" value during the final approach. Allows the velocity to be reduced."
+    },
+    "fwLandGlideAlt" : {
+        "message": "Initial altitude of the glide phase"
+    },
+    "fwLandGlideAltHelp" : {
+        "message": "At this altitude (measured from the altitude of the landing point) the engine is switched off and the aircraft glides from here."
+    },
+    "fwLandFlareAlt" : {
+        "message": "Initial altitude of the flare phase"
+    },
+    "fwLandFlareAltHelp" : {
+        "message": "At this altitude (measured from the altitude of the landing point) the last phase of landing is executed."
+    },
+    "fwLandGlidePitch" : {
+        "message": "Pitch value for glide phase"
+    },
+    "fwLandGlidePitchHelp" : {
+        "message": "This pitch angle is held during the glide phase."
+    },
+    "fwLandFlarePitch" : {
+        "message": "Pitch value for flare phase"
+    },
+    "fwLandFlarePitchHelp" : {
+        "message": "This pitch angle is held during the flare phase."
+    },
+    "fwLandMaxTailwind": {
+        "message": "Max. tailwind"
+    },
+    "fwLandMaxTailwindHelp": {
+        "message": "This value is used when no headwind landing is possible and wind speeds below this value are ignored (inaccuracies in INAV wind measurement)."
+    },
     "osd_unsupported_msg1": {
         "message": "Your flight controller isn't responding to OSD commands. This probably means that it does not have an integrated OSD."
     },
@@ -3461,6 +3509,12 @@
     "osd_hud_settings": {
         "message": "Heads up Display settings"
     },
+    "osd_custom_element_settings": {
+        "message": "Custom OSD elements"
+    },
+    "custom_element": {
+        "message": "Custom element"
+    },
     "osd_hud_settings_HELP": {
         "message": "This section allows tweaking the behavior of HUD elements."
     },
@@ -4331,6 +4385,12 @@
     "SafehomeSafeRadius": {
         "message": "Safe Radius (m):"
     },
+    "SafehomeFwAppraoch": {
+        "message": "FW Approach:"
+    },
+    "safehomeEdit": {
+        "message": "Edit Safehome"
+    },
     "missionTitleHide": {
         "message": "Hide"
     },
@@ -4361,6 +4421,9 @@
     "missionTitleSaveEepromMission": {
         "message": "Save Eeprom mission"
     },
+    "missionTitleDelete": {
+        "message": "Delete"
+    },
     "missionTitleRemoveAll": {
         "message": "Remove all"
     },
@@ -4372,7 +4435,7 @@
     },
     "missionTitleAdd": {
         "message": "Add"
-    },
+    }, 
     "missionTitleMoveToCenterView": {
         "message": "move to center view"
     },
@@ -4385,6 +4448,60 @@
     "missionTitlEditMission": {
         "message": "Edit Mission"
     },
+    "MissionPlannerFwLAndingAltitudeChangeReset": {
+        "message": "Altitude below min land altitude. Change ignored" 
+    },
+    "missionWpType": {
+        "message": "Type:"
+    },
+    "missionWpLat": {
+        "message": "Lat:"
+    },
+    "missionWpLon": {
+        "message": "Lon:"
+    },
+    "missionSeaLevelRef": {
+        "message": "Sea level Ref: "
+    },
+    "missionElevation": {
+        "message": "Elevation (m):"
+    },
+    "missionNA": {
+        "message": "N/A"
+    },
+    "missionGroundDist": {
+        "message": "Grd Dist (m):"
+    },
+    "missionParameter1": {
+        "message": "Parameter 1:"
+    },
+    "missionParameter2": {
+        "message": "Parameter 2:"
+    },
+    "missionUserActions": {
+        "message": "User Actions:"
+    },
+    "missionFwLandingSettings": {
+        "message": "Fixed Wing landing settings:"
+    },
+    "missionFwApproachAlt": {
+        "message": "Approach Alt: (cm):"
+    },
+    "missionFwLandAlt": {
+        "message": "Land Alt: (cm):"
+    },
+    "missionFwApproachDir": {
+        "message": "Approach direction:"
+    },
+    "missionFwLandHeading1": {
+        "message": "Heading 1: (deg):"
+    },
+    "missionFwLandHeading2": {
+        "message": "Heading 2: (deg):"
+    },
+    "missionExclusive": {
+        "message": "Excl."
+    },
     "missionRTHsettingsTitle": {
         "message": "RTH settings"
     },
@@ -4400,6 +4517,12 @@
     "missionSafehomeHead": {
         "message": "Safe Home manager"
     },
+    "missionSafehomeAvailableSafehomes" : {
+        "message": "Available Safehomes:"
+    },
+    "missionSafehomeMaxSafehomesReached": {
+        "message": "Maximum number of safehomes reached."
+    },
     "missionMultiMissionHead": {
         "message": "Multi Missions"
     },
@@ -4914,10 +5037,10 @@
         "message": "Illegal state. Restart required."
     },
     "motor_direction_inverted": {
-        "message": "Normal motor direction / Props In configuration"
+        "message": "Normal motor direction / Props-in configuration"
     },
     "motor_direction_isInverted": {
-        "message": "Reversed motor direction / Props Out configuration"
+        "message": "Reversed motor direction / Props-out configuration"
     },
     "motor_direction_inverted_hint": {
         "message": "Enable if the motor direction is reversed and the props are mounted in the opposite direction."
@@ -5643,4 +5766,4 @@
     "gsTelemetrySpeed": {
         "message": "Speed"
     }
-}
+}

gulpfile.js

@@ -142,6 +142,8 @@ sources.js = [
     './js/sitl.js',
     './js/CliAutoComplete.js',
     './node_modules/jquery-textcomplete/dist/jquery.textcomplete.js',
+    './js/fwApproach.js',
+    './js/fwApproachCollection.js',
     './js/ltmDecoder.js',
     './js/groundstation.js'
 ];
@@ -410,18 +412,39 @@ gulp.task('release-osx64', function(done) {
         archive.directory(src, 'INAV Configurator.app');
         output.on('close', function() {
             if (getArguments().notarize) {
-                console.log('Notarizing DMG file: ' + zipFilename);
-                const notarizeArgs = ['macapptool', '-v', '1', 'notarize'];
+                console.log('Notarizing ZIP file: ' + zipFilename);
+                const notarizeArgs = ['xcrun', 'notarytool', 'submit'];
+                notarizeArgs.push(zipFilename);
                 const notarizationUsername = getArguments()['notarization-username'];
                 if (notarizationUsername) {
-                    notarizeArgs.push('-u', notarizationUsername)
+                    notarizeArgs.push('--apple-id', notarizationUsername)
+                } else {
+                    throw new Error('Missing notarization username');
                 }
                 const notarizationPassword = getArguments()['notarization-password'];
                 if (notarizationPassword) {
-                    notarizeArgs.push('-p', notarizationPassword)
+                    notarizeArgs.push('--password', notarizationPassword)
+                } else {
+                    throw new Error('Missing notarization password');
+                }
+                const notarizationTeamId = getArguments()['notarization-team-id'];
+                if (notarizationTeamId) {
+                    notarizeArgs.push('--team-id', notarizationTeamId)
+                } else {
+                    throw new Error('Missing notarization Team ID');
+                }
+                notarizeArgs.push('--wait');
+
+                const notarizationWebhook = getArguments()['notarization-webhook'];
+                if (notarizationWebhook) {
+                    notarizeArgs.push('--webhook', notarizationWebhook);
                 }
-                notarizeArgs.push(zipFilename)
                 execSync.apply(this, notarizeArgs);
+
+                console.log('Stapling ZIP file: ' + zipFilename);
+                const stapleArgs = ['macapptool', '-v', '1', 'staple'];
+                stapleArgs.push(zipFilename)
+                execSync.apply(this, stapleArgs);
             }
             done();
         });
@@ -587,7 +610,7 @@ function release_deb(arch) {
                     `xdg-desktop-menu install ${LINUX_INSTALL_DIR}/${metadata.name}/${metadata.name}.desktop`,
                 ],
                 prerm: [`xdg-desktop-menu uninstall ${metadata.name}.desktop`],
-                depends: ['libgconf-2-4', 'libatomic1'],
+                depends: ['libatomic1'],
                 changelog: [],
                 _target: `${LINUX_INSTALL_DIR}/${metadata.name}`,
                 _out: appsDir,

js/fc.js

@@ -65,7 +65,10 @@ var CONFIG,
     BOARD_ALIGNMENT,
     CURRENT_METER_CONFIG,
     FEATURES,
-    RATE_DYNAMICS;
+    RATE_DYNAMICS,
+    FW_APPROACH,
+    OSD_CUSTOM_ELEMENTS;
+
 
 var FC = {
     restartRequired: false,
@@ -565,6 +568,15 @@ var FC = {
             rate: null,
             expo: null
         };
+
+
+        FW_APPROACH = new FwApproachCollection();
+
+        OSD_CUSTOM_ELEMENTS = {
+           settings: {customElementsCount: 0, customElementTextSize: 0},
+           items: [],
+        };
+
     },
     getOutputUsages: function() {
         return {
@@ -1307,7 +1319,8 @@ var FC = {
                     37: "Rangefinder [cm]",
                     38: "Active MixerProfile",
                     39: "MixerTransition Active",
-                    40: "Yaw [deg]"
+                    40: "Yaw [deg]",
+                    41: "FW Land State"
                 }
             },
             3: {