Skip to content

Commit 732957b

Browse files
haslinghuishaslinghuis
committed
right panel
1 parent 4ed68a0 commit 732957b

File tree

5 files changed

+140
-196
lines changed

5 files changed

+140
-196
lines changed

‎locales/en/messages.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3922,6 +3922,18 @@
39223922
"pidTuningLowPassDynamic": {
39233923
"message": "DYN"
39243924
},
3925+
"pidTuningDTermLowpass": {
3926+
"message": "D Term Static Lowpass 1 Filter"
3927+
},
3928+
"pidTuningDtermLowpassDyn": {
3929+
"message": "D Term Dynamic Lowpass 1 Filter"
3930+
},
3931+
"pidTuningDTermLowpassMode": {
3932+
"message": "Mode"
3933+
},
3934+
"pidTuningDTermLowpass2": {
3935+
"message": "D Term Lowpass 2"
3936+
},
39253937
"pidTuningDTermLowpassFiltersGroup": {
39263938
"message": "D Term Lowpass Filters"
39273939
},
@@ -3958,7 +3970,7 @@
39583970
"pidTuningDTermNotchCutoff": {
39593971
"message": "D Term Notch Filter Cutoff Frequency [Hz]"
39603972
},
3961-
"pidTuningYawLospassFiltersGroup": {
3973+
"pidTuningYawLowpassFiltersGroup": {
39623974
"message": "Yaw Lowpass Filters"
39633975
},
39643976
"pidTuningYawLowpassFrequency": {

‎src/css/tabs/pid_tuning.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
}
165165

166166
.tab-pid_tuning table.compensation td:first-child {
167-
width: 65px;
168167
text-align: center;
169168
vertical-align: top;
170169
padding-top: 4px;

‎src/js/TuningSliders.js‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -459,18 +459,18 @@ TuningSliders.updateFilterSlidersDisplay = function() {
459459
const lp1Enabled = parseInt($('.pid_filter input[name="gyroLowpassFrequency"]').val()) > 0;
460460
const lp2Enabled = parseInt($('.pid_filter input[name="gyroLowpass2Frequency"]').val()) > 0;
461461

462-
// const lpxChanged = (lp1DynamicEnabled && (lp1DynamicMinChanged || lp1DynamicMaxChanged)) || (lp1Enabled && lp1Changed) || (lp2Enabled && lp2Changed);
462+
const lpxChanged = (lp1DynamicEnabled && (lp1DynamicMinChanged || lp1DynamicMaxChanged)) || (lp1Enabled && lp1Changed) || (lp2Enabled && lp2Changed);
463463
// const lpxDisabled = !lp1DynamicEnabled && !lp1Enabled && !lp2Enabled;
464464
// const lpxOffOrChanged = lpxChanged || lpxDisabled;
465465

466-
// console.log('Gyro lp changed:', lp1DynamicMinChanged, lp1Changed, lp2Changed);
467-
// console.log('Gyro lp disabled:', lp1DynamicEnabled, lp1Enabled, lp2Enabled);
468-
// console.log('lpxChanged, lpxDisabled, lpxOffOrChanged:', lpxChanged, lpxDisabled, lpxOffOrChanged);
469-
470-
const lpxChanged = (lp1DynamicMinChanged || lp1DynamicMaxChanged) && lp1Changed && lp2Changed;
466+
// const lpxChanged = (lp1DynamicMinChanged || lp1DynamicMaxChanged) && lp1Changed && lp2Changed;
471467
const lpxDisabled = !(lp1DynamicEnabled || lp1Enabled || lp2Enabled);
472468
const lpxOffOrChanged = lpxChanged || lpxDisabled;
473469

470+
console.log('Gyro lp changed:', lp1DynamicMinChanged, lp1Changed, lp2Changed);
471+
console.log('Gyro lp disabled:', lp1DynamicEnabled, lp1Enabled, lp2Enabled);
472+
console.log('lpxChanged, lpxDisabled, lpxOffOrChanged:', lpxChanged, lpxDisabled, lpxOffOrChanged);
473+
474474
if (lpxOffOrChanged) {
475475
this.GyroSliderUnavailable = true;
476476
this.sliderGyroFilter = 0;
@@ -493,18 +493,10 @@ TuningSliders.updateFilterSlidersDisplay = function() {
493493
const dlp1StaticEnabled = parseInt($('.pid_filter input[name="dtermLowpassFrequency"]').val()) > 0;
494494
const dlp2Enabled = parseInt($('.pid_filter input[name="dtermLowpass2Frequency"]').val()) > 0;
495495

496-
const dlpDynamicMaxEnabled = Math.abs(parseInt($('.pid_filter input[name="dtermLowpassDynMaxFrequency"]').val()) -
497-
this.FILTER_DEFAULT.dterm_lowpass_dyn_max_hz * this.sliderDTermFilterMultiplier) > 1;
498-
const dlpDynTypeChanged = parseInt($('.pid_filter select[name="dtermLowpassDynType"]').val()) !== this.FILTER_DEFAULT.dterm_lowpass_type;
499-
const dlp2TypeChanged = parseInt($('.pid_filter select[name="dtermLowpass2Type"]').val()) !== this.FILTER_DEFAULT.dterm_lowpass2_type;
500-
501496
const dlpxChanged = (dlp1DynamicMinChanged || dlp1DynamicMaxChanged) && dlp1StaticChanged && dlp2Changed;
502497
const dlpxDisabled = !(dlp1DynamicEnabled || dlp1StaticEnabled || dlp2Enabled);
503498
const dlpxOffOrChanged = dlpxChanged || dlpxDisabled;
504499

505-
// console.log('DTerm booleans:', dlp1DynamicMinChanged, dlp1StaticChanged, dlpDynamicMaxEnabled, dlpDynTypeChanged, dlp2Changed, dlp2TypeChanged, dlpxOffOrChanged, dlpxDisabled);
506-
// if ((dlp1DynamicMinChanged || dlp1StaticChanged || dlpDynamicMaxEnabled || dlpDynTypeChanged || dlp2Changed || dlp2TypeChanged) || dlpxOffOrChanged || dlpxDisabled) {
507-
508500
if (dlpxOffOrChanged) {
509501
this.DTermSliderUnavailable = true;
510502
this.sliderDTermFilter = 0;
@@ -530,9 +522,6 @@ TuningSliders.updateFilterSlidersDisplay = function() {
530522

531523
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
532524
$('.subtab-filter .slidersDisabled').hide();
533-
// document.querySelector (JS path from devtools)
534-
// $("#slidersFilterBox > table.sliderLabels > tbody > tr.sliderGyroFilter").toggle(!this.GyroSliderUnavailable);
535-
// $("#slidersFilterBox > table.sliderLabels > tbody > tr.sliderDtermFilter").toggle(!this.DTermSliderUnavailable);
536525
// toggle enable button for gyro or dterm slider
537526
$('.subtab-filter .sliderGyroDisabled').toggle(this.GyroSliderUnavailable);
538527
$('.subtab-filter .sliderDTermDisabled').toggle(this.DTermSliderUnavailable);

‎src/js/tabs/pid_tuning.js‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ TABS.pid_tuning.initialize = function (callback) {
444444
dynamicNotchQ_e.val(FC.FILTER_CONFIG.dyn_notch_q);
445445
dynamicNotchWidthPercent_e.val(FC.FILTER_CONFIG.dyn_notch_width_percent);
446446
}
447-
447+
$('.rpmFilter span.suboption').toggle(checked);
448448
}).prop('checked', FC.FILTER_CONFIG.gyro_rpm_notch_harmonics != 0).change();
449449

450450
} else {
@@ -702,6 +702,8 @@ TABS.pid_tuning.initialize = function (callback) {
702702
$('.pid_filter input[name="dTermNotchFrequency"]').val(checked ? hz : 0).attr('disabled', !checked)
703703
.attr("min", checked ? 1 : 0).change();
704704
$('.pid_filter input[name="dTermNotchCutoff"]').attr('disabled', !checked).change();
705+
706+
$('.dtermNotch span.suboption').toggle(checked);
705707
});
706708

707709
// gyro filter selectors
@@ -737,7 +739,7 @@ TABS.pid_tuning.initialize = function (callback) {
737739
gyroLowpassDynEnabled.prop('checked', false).change();
738740
}
739741

740-
// gyroLowpassOption.toggle(checked);
742+
gyroLowpassOption.toggle(checked);
741743
self.updateFilterWarning();
742744
});
743745

@@ -762,7 +764,7 @@ TABS.pid_tuning.initialize = function (callback) {
762764
gyroLowpassEnabled.prop('checked', true).change();
763765
}
764766

765-
// gyroLowpassDynOption.toggle(checked);
767+
gyroLowpassDynOption.toggle(checked);
766768
self.updateFilterWarning();
767769
});
768770

@@ -774,7 +776,7 @@ TABS.pid_tuning.initialize = function (callback) {
774776

775777
gyroLowpass2Frequency.val(checked ? cutoff : 0).attr('disabled', !checked).attr("min", checked ? 1 : 0); //.change();
776778
gyroLowpass2Type.val(type).attr('disabled', !checked); //.change();
777-
// gyroLowpass2Option.toggle(checked);
779+
gyroLowpass2Option.toggle(checked);
778780
self.updateFilterWarning();
779781
});
780782

@@ -798,6 +800,7 @@ TABS.pid_tuning.initialize = function (callback) {
798800
if (checked) {
799801
$('input[id="dtermLowpassDynEnabled"]').prop('checked', false).change();
800802
}
803+
$('.dtermLowpass span.suboption').toggle(checked);
801804
self.updateFilterWarning();
802805
});
803806

@@ -828,6 +831,7 @@ TABS.pid_tuning.initialize = function (callback) {
828831
$('input[id="dtermLowpassEnabled"]').prop('checked', true).change();
829832
$('.pid_filter input[id="dtermLowpassDynExpoEnabled"]').prop('checked', false).change();
830833
}
834+
$('.dtermLowpassDyn span.suboption').toggle(checked);
831835
self.updateFilterWarning();
832836
});
833837

@@ -846,6 +850,7 @@ TABS.pid_tuning.initialize = function (callback) {
846850
$('.pid_filter input[name="dtermLowpass2Frequency"]').val(checked ? cutoff : 0);
847851
$('.pid_filter input[name="dtermLowpass2Frequency"]').attr('disabled', !checked);
848852
$('.pid_filter select[name="dtermLowpass2Type"]').val(type).attr('disabled', !checked);
853+
$('.dtermLowpass2 span.suboption').toggle(checked);
849854
});
850855

851856
$('.pid_filter input[name="dtermLowpassDynMinFrequency"]').on('input', () => $('input[id="dtermLowpassDynEnabled"]').prop('checked', false).trigger('change'));
@@ -858,6 +863,7 @@ TABS.pid_tuning.initialize = function (callback) {
858863
const cutoff = FC.FILTER_CONFIG.yaw_lowpass_hz > 0 ? FC.FILTER_CONFIG.yaw_lowpass_hz : FILTER_DEFAULT.yaw_lowpass_hz;
859864

860865
$('.pid_filter input[name="yawLowpassFrequency"]').val(checked ? cutoff : 0).attr('disabled', !checked);
866+
$('.yawLowpass span.suboption').toggle(checked);
861867
});
862868

863869
// The notch cutoff must be smaller than the notch frecuency
@@ -2268,15 +2274,14 @@ TABS.pid_tuning.initialize = function (callback) {
22682274
});
22692275

22702276
// update on pid table inputs
2271-
$('#pid_main input').on('input', function(e) {
2272-
console.log(e.target.id);
2277+
$('#pid_main input').on('input', function() {
22732278
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
22742279
TuningSliders.updatePidSlidersDisplay();
22752280
self.analyticsChanges['PidTuningSliders'] = "Off";
22762281
}
22772282
});
22782283
// update on filter value or type changes
2279-
$('.pid_filter tr:not(.newFilter) input, .pid_filter tr:not(.newFilter) select').on('input', function() {
2284+
$('.pid_filter tr:not(.newFilter) input, .pid_filter tr:not(.newFilter) select').on('input', function(e) {
22802285
TuningSliders.updateFilterSlidersDisplay();
22812286
if (TuningSliders.GyroSliderUnavailable) {
22822287
self.analyticsChanges['GyroFilterTuningSlider'] = "Off";

0 commit comments

Comments
 (0)