Skip to content

Commit 36ab8f6

Browse files
haslinghuishaslinghuis
committed
Refactor left panel
1 parent 2601582 commit 36ab8f6

File tree

5 files changed

+282
-218
lines changed

5 files changed

+282
-218
lines changed

‎locales/en/messages.json‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3779,25 +3779,37 @@
37793779
"message": "Gyro Lowpass Filters"
37803780
},
37813781
"pidTuningGyroLowpassFrequency": {
3782-
"message": "Gyro Lowpass 1 Static Cutoff Frequency [Hz]"
3782+
"message": "Cutoff Frequency [Hz]"
3783+
},
3784+
"pidTuningGyroLowpass": {
3785+
"message": "Gyro Static Lowpass 1 Filter"
3786+
},
3787+
"pidTuningGyroLowpassDyn": {
3788+
"message": "Gyro Dynamic Lowpass 1 Filter"
3789+
},
3790+
"pidTuningGyroLowpassMode": {
3791+
"message": "Mode"
37833792
},
37843793
"pidTuningGyroLowpassType": {
37853794
"message": "Gyro Lowpass 1 Filter Type"
37863795
},
37873796
"pidTuningGyroLowpassDynMinFrequency": {
3788-
"message": "Gyro Lowpass 1 Dynamic Min Cutoff Frequency [Hz]"
3797+
"message": "Min Cutoff Frequency [Hz]"
37893798
},
37903799
"pidTuningGyroLowpassDynMaxFrequency": {
3791-
"message": "Gyro Lowpass 1 Dynamic Max Cutoff Frequency [Hz]"
3800+
"message": "Max Cutoff Frequency [Hz]"
37923801
},
37933802
"pidTuningGyroLowpassDynType": {
3794-
"message": "Gyro Lowpass 1 Dynamic Filter Type"
3803+
"message": "Filter Type"
3804+
},
3805+
"pidTuningGyroLowpass2": {
3806+
"message": "Gyro Lowpass 2"
37953807
},
37963808
"pidTuningGyroLowpass2Frequency": {
3797-
"message": "Gyro Lowpass 2 Static Cutoff Frequency [Hz]"
3809+
"message": "Cutoff Frequency [Hz]"
37983810
},
37993811
"pidTuningGyroLowpass2Type": {
3800-
"message": "Gyro Lowpass 2 Filter Type"
3812+
"message": "Filter Type"
38013813
},
38023814
"pidTuningGyroLowpassFilterHelp": {
38033815
"message": "Gyro lowpass filters attenuate higher frequency noise to keep it out of the PID loop. There are two independently configurable gyro filters; by default both are active.<br /><br />The first D lowpass can be static (fixed cutoff) or dynamic; the second D lowpass is always static. When a lowpass is in dynamic mode, filter will be stronger at low throttle, and the cutoff will go higher (less filtering) as throttle increases.<br /><br />Without RPM filtering, both PT1 filters should be enabled at default (or stronger) cutoffs, with lowpass 1 in dynamic mode.<br /><br />With RPM filtering, the gyro filter slider can often be moved some way to the right. On clean quads it can go all the way right, or alternatively a single static gyro lowpass filter at 500hz may be sufficient.<br /><br />A quad will have less propwash with the least gyro filter delay (sliders to the right, higher cutoff values).<br /><br />Always check for motor heat when shifting to less gyro filtering (sliders to the right). With minimal gyro filtering, it is essential to have enough D filtering! Take care!"
@@ -3808,6 +3820,12 @@
38083820
"pidTuningGyroNotchFiltersGroup": {
38093821
"message": "Gyro Notch Filters"
38103822
},
3823+
"pidTuningGyroNotchFilter": {
3824+
"message": "Gyro Notch Filter 1"
3825+
},
3826+
"pidTuningGyroNotchFilter2": {
3827+
"message": "Gyro Notch Filter 2"
3828+
},
38113829
"pidTuningGyroNotch1Frequency": {
38123830
"message": "Gyro Notch Filter 1 Center Frequency [Hz]"
38133831
},
@@ -3898,6 +3916,12 @@
38983916
"pidTuningFilterSettings": {
38993917
"message": "Profile dependent Filter Settings"
39003918
},
3919+
"pidTuningLowPassStatic": {
3920+
"message": "STATIC"
3921+
},
3922+
"pidTuningLowPassDynamic": {
3923+
"message": "DYN"
3924+
},
39013925
"pidTuningDTermLowpassFiltersGroup": {
39023926
"message": "D Term Lowpass Filters"
39033927
},

‎src/css/tabs/pid_tuning.css‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -909,10 +909,6 @@
909909
table-layout: auto;
910910
}
911911

912-
.tab-pid_tuning table.filterTable td:first-child {
913-
width: 25%;
914-
}
915-
916912
@media only screen and (max-width: 1205px) {
917913

918914
.tab-pid_tuning .subtab-pid .spacer_left {

‎src/js/TuningSliders.js‎

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -445,55 +445,64 @@ TuningSliders.updateFilterSlidersDisplay = function() {
445445
this.GyroSliderUnavailable = !FC.TUNING_SLIDERS.slider_gyro_filter;
446446
this.DTermSliderUnavailable = !FC.TUNING_SLIDERS.slider_dterm_filter;
447447

448-
const lp1Changed = parseInt($('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val()) !==
448+
console.log('Firmware:', this.GyroSliderUnavailable, this.DTermSliderUnavailable);
449+
450+
const lp1DynamicMinChanged = parseInt($('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val()) !==
449451
Math.floor(this.FILTER_DEFAULT.gyro_lowpass_dyn_min_hz * this.sliderGyroFilterMultiplier);
452+
const lp1DynamicMaxChanged = parseInt($('.pid_filter input[name="gyroLowpassDynMaxFrequency"]').val()) !==
453+
Math.floor(this.FILTER_DEFAULT.gyro_lowpass_dyn_max_hz * this.sliderGyroFilterMultiplier);
450454
const lp1StaticChanged = parseInt($('.pid_filter input[name="gyroLowpassFrequency"]').val()) !==
451455
Math.floor(this.FILTER_DEFAULT.gyro_lowpass_hz * this.sliderGyroFilterMultiplier);
452456
const lp2Changed = parseInt($('.pid_filter input[name="gyroLowpass2Frequency"]').val()) !==
453457
Math.floor(this.FILTER_DEFAULT.gyro_lowpass2_hz * this.sliderGyroFilterMultiplier);
454-
const lp1Enabled = parseInt($('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val());
455-
const lp1StaticEnabled = parseInt($('.pid_filter input[name="gyroLowpassFrequency"]').val());
456-
const lp2Enabled = parseInt($('.pid_filter input[name="gyroLowpass2Frequency"]').val());
457458

458-
const lpDynMaxChanged = parseInt($('.pid_filter input[name="gyroLowpassDynMaxFrequency"]').val()) !==
459-
Math.floor(this.FILTER_DEFAULT.gyro_lowpass_dyn_max_hz * this.sliderGyroFilterMultiplier);
460459
const lpfDynTypeChanged = parseInt($('.pid_filter select[name="gyroLowpassDynType"]').val()) !== this.FILTER_DEFAULT.gyro_lowpass_type;
461460
const lp2TypeChanged = parseInt($('.pid_filter select[name="gyroLowpass2Type"]').val()) !== this.FILTER_DEFAULT.gyro_lowpass2_type;
462461

463-
const lpxChanged = lp1Changed && lp1StaticChanged && lp2Changed;
464-
const lpxDisabled = !(lp1Enabled || lp1StaticEnabled || lp2Enabled);
462+
const lp1DynamicEnabled = (parseInt($('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val()) > 0 &&
463+
parseInt($('.pid_filter input[name="gyroLowpassDynMaxFrequency"]').val()) > 0);
464+
const lp1StaticEnabled = parseInt($('.pid_filter input[name="gyroLowpassFrequency"]').val()) > 0;
465+
const lp2Enabled = parseInt($('.pid_filter input[name="gyroLowpass2Frequency"]').val()) > 0;
465466

466-
const lpxOffAndChanged = lpxChanged && lpxDisabled;
467+
const lpxChanged = (lp1DynamicMinChanged || lp1DynamicMaxChanged) && lp1StaticChanged && lp2Changed;
468+
const lpxDisabled = !(lp1DynamicEnabled || lp1StaticEnabled || lp2Enabled);
469+
const lpxOffOrChanged = lpxChanged || lpxDisabled;
467470

468-
if ((lp1Changed || lp1StaticChanged || lpDynMaxChanged || lpfDynTypeChanged || lp2Changed || lp2TypeChanged) && lpxOffAndChanged) {
471+
console.log('Gyro booleans:', lp1DynamicMinChanged, lp1StaticChanged, lpfDynTypeChanged, lp2Changed, lp2TypeChanged, lpxOffOrChanged, lpxDisabled);
472+
//v1 if ((lp1DynamicMinChanged || lp1StaticChanged || lpfDynTypeChanged || lp2Changed || lp2TypeChanged) || lpxOffAndChanged || lpxDisabled) {
473+
//v2 if ((lp1DynamicEnabled && (lp1DynamicMinChanged || lp1DynamicMinChanged)) || (lp1StaticEnabled && lp1StaticChanged) && (lp2Enabled && lp2Changed)) {
474+
//v3 works, but now we can't have manual inputs because sliders enables upon checkbox enable.
475+
if (lpxOffOrChanged) {
469476
this.GyroSliderUnavailable = true;
470477
this.sliderGyroFilter = 0;
471478
} else {
472479
this.cachedGyroSliderValues = true;
473480
this.sliderGyroFilter = 1;
474481
}
475482

476-
const dlp1Changed = parseInt($('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val()) !==
483+
const dlp1DynamicMinChanged = parseInt($('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val()) !==
477484
Math.floor(this.FILTER_DEFAULT.dterm_lowpass_dyn_min_hz * this.sliderDTermFilterMultiplier);
478485
const dlp1StaticChanged = parseInt($('.pid_filter input[name="dtermLowpassFrequency"]').val()) !==
479486
Math.floor(this.FILTER_DEFAULT.dterm_lowpass_hz * this.sliderDTermFilterMultiplier);
480487
const dlp2Changed = parseInt($('.pid_filter input[name="dtermLowpass2Frequency"]').val()) !==
481488
Math.floor(this.FILTER_DEFAULT.dterm_lowpass2_hz * this.sliderDTermFilterMultiplier);
482489

483-
const dlp1Enabled = parseInt($('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val());
484-
const dlp1StaticEnabled = parseInt($('.pid_filter input[name="dtermLowpassFrequency"]').val());
485-
const dlp2Enabled = parseInt($('.pid_filter input[name="dtermLowpass2Frequency"]').val());
490+
const dlp1DynamicMinEnabled = parseInt($('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val()) > 0;
491+
const dlp1StaticEnabled = parseInt($('.pid_filter input[name="dtermLowpassFrequency"]').val()) > 0;
492+
const dlp2Enabled = parseInt($('.pid_filter input[name="dtermLowpass2Frequency"]').val()) > 0;
486493

487-
const dlpDynMaxChanged = Math.abs(parseInt($('.pid_filter input[name="dtermLowpassDynMaxFrequency"]').val()) -
494+
const dlpDynamicMaxEnabled = Math.abs(parseInt($('.pid_filter input[name="dtermLowpassDynMaxFrequency"]').val()) -
488495
this.FILTER_DEFAULT.dterm_lowpass_dyn_max_hz * this.sliderDTermFilterMultiplier) > 1;
489496
const dlpDynTypeChanged = parseInt($('.pid_filter select[name="dtermLowpassDynType"]').val()) !== this.FILTER_DEFAULT.dterm_lowpass_type;
490497
const dlp2TypeChanged = parseInt($('.pid_filter select[name="dtermLowpass2Type"]').val()) !== this.FILTER_DEFAULT.dterm_lowpass2_type;
491498

492-
const dlpxChanged = dlp1Changed && dlp1StaticChanged && dlp2Changed;
493-
const dlpxDisabled = !(dlp1Enabled || dlp1StaticEnabled || dlp2Enabled);
494-
const dlpxOffAndChanged = dlpxChanged && dlpxDisabled;
499+
const dlpxChanged = dlp1DynamicMinChanged && dlp1StaticChanged && dlp2Changed;
500+
const dlpxDisabled = !(dlp1DynamicMinEnabled || dlp1StaticEnabled || dlp2Enabled);
501+
const dlpxOffAndChanged = dlpxChanged || dlpxDisabled;
495502

496-
if ((dlp1Changed || dlp1StaticChanged || dlpDynMaxChanged || dlpDynTypeChanged || dlp2Changed || dlp2TypeChanged) && dlpxOffAndChanged) {
503+
console.log('Enabled:', dlp1DynamicMinEnabled, dlp1StaticEnabled, dlp2Enabled);
504+
console.log('DTerm booleans:', dlp1DynamicMinChanged, dlp1StaticChanged, dlpDynamicMaxEnabled, dlpDynTypeChanged, dlp2Changed, dlp2TypeChanged, dlpxOffAndChanged, dlpxDisabled);
505+
if ((dlp1DynamicMinChanged || dlp1StaticChanged || dlpDynamicMaxEnabled || dlpDynTypeChanged || dlp2Changed || dlp2TypeChanged) || dlpxOffAndChanged || dlpxDisabled) {
497506
this.DTermSliderUnavailable = true;
498507
this.sliderDTermFilter = 0;
499508
} else {
@@ -517,11 +526,17 @@ TuningSliders.updateFilterSlidersDisplay = function() {
517526
}
518527

519528
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
520-
$('.subtab-filter .slidersDisabled').hide();
529+
$('.subtab-filter .slidersDisabled').hide(this.GyroSliderUnavailable && this.DTermSliderUnavailable);
530+
// document.querySelector (JS path from devtools)
531+
console.log('Sliders unavailable:', this.GyroSliderUnavailable, this.DTermSliderUnavailable);
532+
$("#slidersFilterBox > table.sliderLabels > tbody > tr.sliderGyroFilter").toggle(!this.GyroSliderUnavailable);
533+
$("#slidersFilterBox > table.sliderLabels > tbody > tr.sliderDtermFilter").toggle(!this.DTermSliderUnavailable);
534+
// toggle enable button for gyro or dterm slider
521535
$('.subtab-filter .sliderGyroDisabled').toggle(this.GyroSliderUnavailable);
522536
$('.subtab-filter .sliderDTermDisabled').toggle(this.DTermSliderUnavailable);
523537
} else {
524538
$('.tuningFilterSliders').toggle(!(this.GyroSliderUnavailable && this.DTermSliderUnavailable));
539+
$('.subtab-filter .slidersDisabled').toggle(this.GyroSliderUnavailable || this.DTermSliderUnavailable);
525540
}
526541
$('.subtab-filter .nonExpertModeSlidersNote').toggle((!this.GyroSliderUnavailable || !this.DTermSliderUnavailable) && !this.expertMode);
527542
this.updateFilterSlidersWarning(this.GyroSliderUnavailable, this.DTermSliderUnavailable);
@@ -730,4 +745,18 @@ TuningSliders.updateLowpassValues = function() {
730745
$('.pid_filter select[name="dtermLowpassDynType"]').val(FC.FILTER_CONFIG.dterm_lowpass_type);
731746
$('.pid_filter select[name="dtermLowpass2Type"]').val(FC.FILTER_CONFIG.dterm_lowpass2_type);
732747
$('output[name="sliderDTermFilterMultiplier-number"]').val(this.sliderDTermFilterMultiplier);
748+
749+
// TESTING
750+
console.log('### UPDATELOWPASSVALUES AFTER MSP_SET_TUNING_SLIDERS');
751+
console.log('gyroNotch1Enabled', FC.FILTER_CONFIG.gyro_notch_hz);
752+
console.log('gyroNotch2Enabled', FC.FILTER_CONFIG.gyro_notch2_hz);
753+
console.log('dtermNotchEnabled', FC.FILTER_CONFIG.dterm_notch_hz);
754+
console.log('gyroLowpassEnabled', FC.FILTER_CONFIG.gyro_lowpass_hz);
755+
console.log('gyroLowpassDynEnabled', FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz);
756+
console.log('dtermLowpassDynExpoEnabled', FC.FILTER_CONFIG.dyn_lpf_curve_expo);
757+
console.log('gyroLowpass2Enabled', FC.FILTER_CONFIG.gyro_lowpass2_hz);
758+
console.log('dtermLowpassEnabled', FC.FILTER_CONFIG.dterm_lowpass_hz);
759+
console.log('dtermLowpassDynEnabled', FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz);
760+
console.log('dtermLowpass2Enabled', FC.FILTER_CONFIG.dterm_lowpass2_hz);
761+
console.log('yawLowpassEnabled', FC.FILTER_CONFIG.yaw_lowpass_hz);
733762
};

0 commit comments

Comments
 (0)