diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 0d862078..2d69cc6e 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -3490,6 +3490,18 @@ "dTermMechanics": { "message": "D-term mechanics" }, + "tpaMechanics": { + "message": "Thrust PID attenuation" + }, + "fw_level_pitch_trim": { + "message": "Level Trim [deg]" + }, + "fw_level_pitch_trim_help": { + "message": "Pitch trim for self-leveling flight modes. In degrees. +5 means airplane nose should be raised 5 deg from level" + }, + "fwLevelTrimMechanics": { + "message": "Fixed Wing Level Trim" + }, "d_boost_factor": { "message": "D-Boost Factor" }, @@ -3615,5 +3627,8 @@ }, "configurationCurrentMeterType": { "message": "Current Meter Type" + }, + "rollPitchAdjustmentsMoved": { + "message": "Roll & Pitch board orientation is available only in the CLI. Do not use it to trim the airplane for the level flight! Use fw_level_pitch_trim instead" } } diff --git a/js/fc.js b/js/fc.js index 7b7bd232..a71d645d 100644 --- a/js/fc.js +++ b/js/fc.js @@ -603,12 +603,8 @@ var FC = { getLooptimes: function () { return { 125: { - defaultLooptime: 1000, + defaultLooptime: 500, looptimes: { - 4000: "250Hz", - 3000: "334Hz", - 2000: "500Hz", - 1500: "667Hz", 1000: "1kHz", 500: "2kHz", 250: "4kHz", @@ -618,8 +614,6 @@ var FC = { 1000: { defaultLooptime: 1000, looptimes: { - 4000: "250Hz", - 2000: "500Hz", 1000: "1kHz" } } @@ -630,10 +624,6 @@ var FC = { 125: { defaultLooptime: 1000, looptimes: { - 4000: "250Hz", - 3000: "334Hz", - 2000: "500Hz", - 1500: "667Hz", 1000: "1kHz", 500: "2kHz", 250: "4kHz", @@ -643,8 +633,6 @@ var FC = { 1000: { defaultLooptime: 1000, looptimes: { - 4000: "250Hz", - 2000: "500Hz", 1000: "1kHz" } } @@ -654,32 +642,26 @@ var FC = { return [ { tick: 125, - defaultDenominator: 16, label: "256Hz" }, { tick: 1000, - defaultDenominator: 2, label: "188Hz" }, { tick: 1000, - defaultDenominator: 2, label: "98Hz" }, { tick: 1000, - defaultDenominator: 2, label: "42Hz" }, { tick: 1000, - defaultDenominator: 2, label: "20Hz" }, { tick: 1000, - defaultDenominator: 2, label: "10Hz" } ]; diff --git a/main.css b/main.css index f8c2c7b7..399b40a1 100644 --- a/main.css +++ b/main.css @@ -2107,7 +2107,7 @@ select { } .info-box { - background-color: darkgoldenrod; + background-color: #37a8db; color: white; font-weight: bold; margin: 0.4em 0; diff --git a/tabs/configuration.html b/tabs/configuration.html index 5f45cf0c..a704b1c9 100644 --- a/tabs/configuration.html +++ b/tabs/configuration.html @@ -12,7 +12,6 @@
-
-
- -
- -
-
- -
- -
+
diff --git a/tabs/configuration.js b/tabs/configuration.js index b1fe6b2c..05a08707 100644 --- a/tabs/configuration.js +++ b/tabs/configuration.js @@ -257,8 +257,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) { $('#content').scrollTop((scrollPosition) ? scrollPosition : 0); // fill board alignment - $('input[name="board_align_roll"]').val((BF_CONFIG.board_align_roll / 10.0).toFixed(1)); - $('input[name="board_align_pitch"]').val((BF_CONFIG.board_align_pitch / 10.0).toFixed(1)); $('input[name="board_align_yaw"]').val((BF_CONFIG.board_align_yaw / 10.0).toFixed(1)); // fill magnetometer @@ -316,12 +314,9 @@ TABS.configuration.initialize = function (callback, scrollPosition) { $i2cSpeed.change(); - var $looptime = $("#looptime"); - - var $gyroLpf = $("#gyro-lpf"), - $gyroLpfMessage = $('#gyrolpf-info'); - - var values = FC.getGyroLpfValues(); + let $looptime = $("#looptime"), + $gyroLpf = $("#gyro-lpf"), + values = FC.getGyroLpfValues(); for (i in values) { if (values.hasOwnProperty(i)) { @@ -343,43 +338,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) { ); $looptime.val(FC.getLooptimes()[FC.getGyroLpfValues()[INAV_PID_CONFIG.gyroscopeLpf].tick].defaultLooptime); $looptime.change(); - - $gyroLpfMessage.hide(); - $gyroLpfMessage.removeClass('ok-box'); - $gyroLpfMessage.removeClass('info-box'); - $gyroLpfMessage.removeClass('warning-box'); - - if (MIXER_CONFIG.platformType == PLATFORM_MULTIROTOR || MIXER_CONFIG.platformType == PLATFORM_TRICOPTER) { - switch (parseInt(INAV_PID_CONFIG.gyroscopeLpf, 10)) { - case 0: - $gyroLpfMessage.html(chrome.i18n.getMessage('gyroLpfSuggestedMessage')); - $gyroLpfMessage.addClass('ok-box'); - $gyroLpfMessage.show(); - break; - case 1: - $gyroLpfMessage.html(chrome.i18n.getMessage('gyroLpfWhyNotHigherMessage')); - $gyroLpfMessage.addClass('info-box'); - $gyroLpfMessage.show(); - break; - case 2: - $gyroLpfMessage.html(chrome.i18n.getMessage('gyroLpfWhyNotSlightlyHigherMessage')); - $gyroLpfMessage.addClass('info-box'); - $gyroLpfMessage.show(); - break - case 3: - $gyroLpfMessage.html(chrome.i18n.getMessage('gyroLpfNotAdvisedMessage')); - $gyroLpfMessage.addClass('info-box'); - $gyroLpfMessage.show(); - break; - case 4: - case 5: - $gyroLpfMessage.html(chrome.i18n.getMessage('gyroLpfNotFlyableMessage')); - $gyroLpfMessage.addClass('warning-box'); - $gyroLpfMessage.show(); - break; - } - - } }); $gyroLpf.change(); @@ -393,11 +351,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) { } else { $('#looptime-warning').hide(); } - - if (INAV_PID_CONFIG.asynchronousMode == 0) { - //All task running together - ADVANCED_CONFIG.gyroSyncDenominator = Math.floor(FC_CONFIG.loopTime / FC.getGyroLpfValues()[INAV_PID_CONFIG.gyroscopeLpf].tick); - } }); $looptime.change(); @@ -512,8 +465,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) { helper.features.reset(); helper.features.fromUI($('.tab-configuration')); helper.features.execute(function () { - BF_CONFIG.board_align_roll = Math.round(parseFloat($('input[name="board_align_roll"]').val()) * 10); - BF_CONFIG.board_align_pitch = Math.round(parseFloat($('input[name="board_align_pitch"]').val()) * 10); BF_CONFIG.board_align_yaw = Math.round(parseFloat($('input[name="board_align_yaw"]').val()) * 10); BF_CONFIG.currentscale = parseInt($('#currentscale').val()); BF_CONFIG.currentoffset = Math.round(parseFloat($('#currentoffset').val()) * 10); diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html index 5fb096e3..39873779 100755 --- a/tabs/pid_tuning.html +++ b/tabs/pid_tuning.html @@ -164,27 +164,6 @@
-
-
- - - - - - - - - -
- - % -
-
- -
-
-
@@ -566,6 +545,44 @@
+ +
+
+
+ + + + + + + + + +
+ + % +
+
+ +
+
+
+
+
+
+ + + + + + + +
+ +
+
+