Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-23 00:05:22 +03:00
Code Issues Wiki Activity

Refactor PID table

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2018-07-10 09:26:06 +02:00
parent 25e4e7f6ca
commit 1e1952b16b
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/css/tabs/pid_tuning.css
View file

@ -222,6 +222,7 @@
margin: 0px; margin: 0px;
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
table-layout: fixed;
} }
.tab-pid_tuning .gui_box { .tab-pid_tuning .gui_box {
@ -244,12 +245,10 @@
padding: 5px; padding: 5px;
text-align: left; text-align: left;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
width: calc(100% / 9);
} }
.tab-pid_tuning .pid_titlebar th:first-child { .tab-pid_tuning .pid_titlebar th:first-child {
text-align: left; text-align: left;
width: calc(100% / 9);
} }
.tab-pid_tuning .pid_titlebar th:last-child { .tab-pid_tuning .pid_titlebar th:last-child {
@ -336,7 +335,6 @@
.tab-pid_tuning table td { .tab-pid_tuning table td {
padding: 1px; padding: 1px;
padding-left: 5px; padding-left: 5px;
width: calc(100% / 9);
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
} }

11
src/js/tabs/pid_tuning.js
View file

@ -399,11 +399,14 @@ TABS.pid_tuning.initialize = function (callback) {
$('.absoluteControlGain').hide(); $('.absoluteControlGain').hide();
$('.throttleBoost').hide(); $('.throttleBoost').hide();
$('.acroTrainerAngleLimit').hide(); $('.acroTrainerAngleLimit').hide();
$('.pid_tuning .YAW input[name="d"]').hide(); $('.pid_tuning .YAW input[name="d"]').hide();
$('.pid_tuning .ROLL input[name="f"]').hide();
$('.pid_tuning .PITCH input[name="f"]').hide(); // Feedforward column
$('.pid_tuning .YAW input[name="f"]').hide(); $('#pid_main tr :nth-child(5)').hide();
$('#pid-tuning .feedForwardTransition').hide(); $('#pid_main .pid_titlebar2 th').attr("colspan", 8);
$('#pid-tuning .feedforwardTransition').hide();
} }
$('input[id="gyroNotch1Enabled"]').change(function() { $('input[id="gyroNotch1Enabled"]').change(function() {

12
src/tabs/pid_tuning.html
View file

@ -66,8 +66,8 @@
<div class="clear-both"></div> <div class="clear-both"></div>
<div class="cf_column twothird"> <div class="cf_column twothird">
<div class="gui_box grey topspacer" style="margin-top: 0px;"> <div class="gui_box grey topspacer" style="margin-top: 0px;">
<table class="pid_titlebar"> <table id="pid_main" class="pid_tuning">
<tr> <tr class="pid_titlebar">
<th class="name"></th> <th class="name"></th>
<th class="proportional" i18n="pidTuningProportional"></th> <th class="proportional" i18n="pidTuningProportional"></th>
<th class="integral" i18n="pidTuningIntegral"></th> <th class="integral" i18n="pidTuningIntegral"></th>
@ -78,9 +78,7 @@
<th class="new_rates maxVel" i18n="pidTuningMaxVel"></th> <th class="new_rates maxVel" i18n="pidTuningMaxVel"></th>
<th class="rc_expo" i18n="pidTuningRcExpo"></th> <th class="rc_expo" i18n="pidTuningRcExpo"></th>
</tr> </tr>
</table> <tr class="pid_titlebar2">
<table id="pid_main" class="pid_tuning">
<tr>
<th colspan="9"> <th colspan="9">
<div class="pid_mode"> <div class="pid_mode">
<div i18n="pidTuningBasic" style="float:left;"></div> <div i18n="pidTuningBasic" style="float:left;"></div>
@ -492,7 +490,7 @@
<div class="cf_column third_right"> <div class="cf_column third_right">
<div class="spacer_left rc_curve"> <div class="spacer_left rc_curve">
<div class="rc_curve_bg"> <div class="rc_curve_bg">
<table class="cf"> <table class="cf rc_curve">
<thead> <thead>
<tr> <tr>
<th colspan="2"> <th colspan="2">
@ -505,7 +503,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <td colspan="2">
<div class="spacer" style="margin-top: 10px; margin-bottom: 8px;"> <div class="spacer" style="margin-top: 10px; margin-bottom: 8px;">
<div class="rate_curve" style="position:relative;" > <div class="rate_curve" style="position:relative;" >
<canvas id="rate_curve_layer0" height="120px" style="position:absolute; top: 0; left: 0; z-index: 0; height:100%; width:100%;"></canvas> <canvas id="rate_curve_layer0" height="120px" style="position:absolute; top: 0; left: 0; z-index: 0; height:100%; width:100%;"></canvas>