Merge with master fork

_locales/en/messages.json

@@ -866,6 +866,18 @@
      "configurationGPSUseGalileo": {
         "message": "Gps use Galileo Satellites"
     },
+    "tzOffset": {
+        "message": "Timezone Offset [Mins]"
+    },
+    "tzOffsetHelp": {
+        "message": "Time zone offset from UTC, in minutes. This is applied to the GPS time for logging and time-stamping of Blackbox logs. (Default = 0)"
+    },
+    "tzAutomaticDST": {
+        "message": "Automatic Daylight Savings Time"
+    },
+    "tzAutomaticDSTHelp": {
+        "message": "Automatically add Daylight Saving Time to the GPS time when needed or simply ignore it. Includes presets for EU and the USA - if you live outside these areas it is suggested to manage DST manually via tz_offset. (Default = Off)"
+    },
     "configurationGPSBaudrate": {
         "message": "Baudrate"
     },
@@ -2461,6 +2473,12 @@
     "rthAltitudeHelp": {
         "message": "Used in Extra, Fixed and 'At Least' RTH altitude modes"
     },
+    "rthHomeAltitudeLabel": {
+        "message": "RTH Home altitude [cm]"
+    },
+    "rthHomeAltitudeHelp": {
+        "message": "Used when not landing at the home point. Upon arriving at home, the plane will loiter and change altitude to the RTH Home Altitude. Default is 0, which is feature disabled."
+    },
     "landDescentRate": {
         "message": "Landing vertical speed [cm/s]"
     },

js/defaults_dialog.js

@@ -207,23 +207,23 @@ helper.defaultsDialog = (function() {
                 },
                 {
                     key: "rc_yaw_expo",
-                    value: 70
+                    value: 30
                 },
                 {
                     key: "rc_expo",
-                    value: 70
+                    value: 30
                 },
                 {
                     key: "roll_rate",
-                    value: 30
+                    value: 20
                 },
                 {
                     key: "pitch_rate",
-                    value: 20
+                    value: 15
                 },
                 {
                     key: "yaw_rate",
-                    value: 10
+                    value: 9
                 },
                 {
                     key: "small_angle",

js/fc.js

@@ -1281,7 +1281,9 @@ var FC = {
                     28: "Stabilized Yaw",
                     29: "Current Waypoint Index",
                     30: "Current Waypoint Action",
-                    31: "3D home distance [m]"
+                    31: "3D home distance [m]",
+                    32: "CRSF LQ",
+                    33: "CRSF SNR",
                 }
             },
             3: {
@@ -1297,7 +1299,9 @@ var FC = {
                     5: "Altitude Hold",
                     6: "Angle",
                     7: "Horizon",
-                    8: "Air"
+                    8: "Air",
+                    9: "USER 1",
+                    10: "USER 2"
                 }
             },
             4: {

js/preset_definitions.js

@@ -1444,16 +1444,16 @@ presets.presets = [
     },
     {
         name: "ZOHD Dart 250g",
-        description: "3x5x3 propeller, 1406 2600kV motor, 3S LiPo. 570mm wingspan, AUW potentially under 250g on 2S.",
+        description: "3x5x3 propeller, 1406 2600kV motor, 3S LiPo. 570mm wingspan, AUW potentially under 250g on 2S.<br /><br /><strong>Please set the Stabilised Roll weight to 80, and the Stabilised Pitch weight to 65.</strong>",
         features: [
             "Adjusted gyro filtering",
             "Adjusted PIDs",
             "Adjusted rates"
         ],
         applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"],
         settingsMSP: [
-            presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 0),
-            presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 35),
+            presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 3),
+            presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 30),
             presets.elementHelper("RC_tuning", "roll_rate", 360),
             presets.elementHelper("RC_tuning", "pitch_rate", 130),
             presets.elementHelper("RC_tuning", "dynamic_THR_PID", 30),
@@ -1466,35 +1466,39 @@ presets.presets = [
             },
             {
                 key: "fw_p_pitch",
-                value: 9
+                value: 3
             },
             {
                 key: "fw_i_pitch",
-                value: 15
+                value: 7
             },
             {
                 key: "fw_ff_pitch",
-                value: 14
+                value: 40
             },
             {
                 key: "fw_p_roll",
-                value: 9
+                value: 2
             },
             {
                 key: "fw_i_roll",
-                value: 12
+                value: 4
             },
             {
                 key: "fw_ff_roll",
-                value: 15
+                value: 18
             },
             {
                 key: "rc_expo",
-                value: 30
+                value: 70
             },
             {
                 key: "manual_rc_expo",
-                value: 30
+                value: 70
+            },
+            {
+                key: "rc_yaw_expo",
+                value: 20
             }
         ],
         type: 'flyingwing'
@@ -1554,4 +1558,4 @@ presets.presets = [
         ],
         type: 'flyingwing'
     }
-];
+];

tabs/advanced_tuning.html

@@ -76,6 +76,14 @@
                         </label>
                         <div class="helpicon cf_tip" data-i18n_title="rthAltitudeHelp"></div>
                     </div>
+
+                     <div class="number">
+                        <input type="number" id="rthHomeAltitude" data-setting="nav_rth_home_altitude" data-setting-multiplier="1" step="1" min="0" max="65000" />
+                        <label for="rthHomeAltitude">
+                            <span data-i18n="rthHomeAltitudeLabel"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="rthHomeAltitudeHelp"></div>
+                    </div>
 
                     <div class="checkbox">
                         <input type="checkbox" id="rth-climb-first" class="toggle" />

tabs/configuration.html

@@ -149,6 +149,20 @@
                             <span data-i18n="configurationGPSUseGalileo"></span>
                         </label>
                     </div>
+                    <div class="number">
+                        <input type="number" id="tzOffset" data-setting="tz_offset" data-setting-multiplier="1" step="1" min="-1440" max="1440" />
+                        <label for="tzOffset">
+                            <span data-i18n="tzOffset"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="tzOffsetHelp"></div>
+                    </div>
+                    <div class="select">
+                        <select id="tzAutomaticDST" data-setting="tz_automatic_dst"></select>
+                        <label for="tzAutomaticDST">
+                            <span data-i18n="tzAutomaticDST"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="tzAutomaticDSTHelp"></div>
+                    </div>
                 </div>
             </div>