Cleanup looptime handling

pull/1185/head
Pawel Spychalski (DzikuVx) 4 years ago
parent 7fc842fa02
commit 9586259a18

@ -603,12 +603,8 @@ var FC = {
getLooptimes: function () { getLooptimes: function () {
return { return {
125: { 125: {
defaultLooptime: 1000, defaultLooptime: 500,
looptimes: { looptimes: {
4000: "250Hz",
3000: "334Hz",
2000: "500Hz",
1500: "667Hz",
1000: "1kHz", 1000: "1kHz",
500: "2kHz", 500: "2kHz",
250: "4kHz", 250: "4kHz",
@ -618,8 +614,6 @@ var FC = {
1000: { 1000: {
defaultLooptime: 1000, defaultLooptime: 1000,
looptimes: { looptimes: {
4000: "250Hz",
2000: "500Hz",
1000: "1kHz" 1000: "1kHz"
} }
} }
@ -630,10 +624,6 @@ var FC = {
125: { 125: {
defaultLooptime: 1000, defaultLooptime: 1000,
looptimes: { looptimes: {
4000: "250Hz",
3000: "334Hz",
2000: "500Hz",
1500: "667Hz",
1000: "1kHz", 1000: "1kHz",
500: "2kHz", 500: "2kHz",
250: "4kHz", 250: "4kHz",
@ -643,8 +633,6 @@ var FC = {
1000: { 1000: {
defaultLooptime: 1000, defaultLooptime: 1000,
looptimes: { looptimes: {
4000: "250Hz",
2000: "500Hz",
1000: "1kHz" 1000: "1kHz"
} }
} }
@ -654,32 +642,26 @@ var FC = {
return [ return [
{ {
tick: 125, tick: 125,
defaultDenominator: 16,
label: "256Hz" label: "256Hz"
}, },
{ {
tick: 1000, tick: 1000,
defaultDenominator: 2,
label: "188Hz" label: "188Hz"
}, },
{ {
tick: 1000, tick: 1000,
defaultDenominator: 2,
label: "98Hz" label: "98Hz"
}, },
{ {
tick: 1000, tick: 1000,
defaultDenominator: 2,
label: "42Hz" label: "42Hz"
}, },
{ {
tick: 1000, tick: 1000,
defaultDenominator: 2,
label: "20Hz" label: "20Hz"
}, },
{ {
tick: 1000, tick: 1000,
defaultDenominator: 2,
label: "10Hz" label: "10Hz"
} }
]; ];

@ -12,7 +12,6 @@
<div class="spacer_box_title" data-i18n="configurationSystem"></div> <div class="spacer_box_title" data-i18n="configurationSystem"></div>
</div> </div>
<div class="spacer_box"> <div class="spacer_box">
<div id="gyrolpf-info" class="info-box is-hidden"></div>
<div class="select is-hidden"> <div class="select is-hidden">
<select id="gyro-lpf"></select> <select id="gyro-lpf"></select>
<label for="gyro-lpf"> <span data-i18n="configurationGyroLpfTitle"></span></label> <label for="gyro-lpf"> <span data-i18n="configurationGyroLpfTitle"></span></label>

@ -316,12 +316,9 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
$i2cSpeed.change(); $i2cSpeed.change();
var $looptime = $("#looptime"); let $looptime = $("#looptime"),
$gyroLpf = $("#gyro-lpf"),
var $gyroLpf = $("#gyro-lpf"), values = FC.getGyroLpfValues();
$gyroLpfMessage = $('#gyrolpf-info');
var values = FC.getGyroLpfValues();
for (i in values) { for (i in values) {
if (values.hasOwnProperty(i)) { if (values.hasOwnProperty(i)) {
@ -343,43 +340,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
); );
$looptime.val(FC.getLooptimes()[FC.getGyroLpfValues()[INAV_PID_CONFIG.gyroscopeLpf].tick].defaultLooptime); $looptime.val(FC.getLooptimes()[FC.getGyroLpfValues()[INAV_PID_CONFIG.gyroscopeLpf].tick].defaultLooptime);
$looptime.change(); $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(); $gyroLpf.change();
@ -393,11 +353,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
} else { } else {
$('#looptime-warning').hide(); $('#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(); $looptime.change();

Loading…
Cancel
Save