Skip to content

Commit 435410f

Browse files
haslinghuishaslinghuis
authored
Merge pull request #550 from ctzsnooze/add-dmin-column
Show Dmax in log header properly for 4.3
2 parents b3e135d + aff1bc2 commit 435410f

File tree

4 files changed

+83
-66
lines changed

4 files changed

+83
-66
lines changed

‎css/header_dialog.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ select {
290290
.header-dialog table td,
291291
.header-dialog .pid_titlebar th {
292292
padding: 1px;
293-
width: 20%;
293+
width: 15%;
294294
border-right: 1px solid #ccc;
295295
border-bottom: 1px solid #ccc;
296296
}

‎index.html‎

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,9 @@ <h5 class="modal-title-craft"></h5>
695695
<th name="Integral">
696696
<label>Integral</label>
697697
</th>
698+
<th name="D_Max">
699+
<label>D_Max</label>
700+
</th>
698701
<th name="Derivative">
699702
<label>Derivative</label>
700703
</th>
@@ -714,6 +717,9 @@ <h5 class="modal-title-craft"></h5>
714717
<td>
715718
<input type="text" name="d" step="1" min="0" max="255" />
716719
</td>
720+
<td>
721+
<input type="text" name="d_min_roll" step="1" min="0" max="255" />
722+
</td>
717723
<td>
718724
<input type="text" name="f" step="1" min="0" max="255" />
719725
</td>
@@ -730,6 +736,9 @@ <h5 class="modal-title-craft"></h5>
730736
<td>
731737
<input type="text" name="d" step="1" min="0" max="255" />
732738
</td>
739+
<td>
740+
<input type="text" name="d_min_pitch" step="1" min="0" max="255" />
741+
</td>
733742
<td>
734743
<input type="text" name="f" step="1" min="0" max="255" />
735744
</td>
@@ -746,6 +755,9 @@ <h5 class="modal-title-craft"></h5>
746755
<td>
747756
<input type="text" name="d" step="1" min="0" max="255" />
748757
</td>
758+
<td>
759+
<input type="text" name="d_min_yaw" step="1" min="0" max="255" />
760+
</td>
749761
<td>
750762
<input type="text" name="f" step="1" min="0" max="255" />
751763
</td>
@@ -759,6 +771,7 @@ <h5 class="modal-title-craft"></h5>
759771
</tr>
760772
</thead>
761773
</table>
774+
762775
<table id="pid_baro" class="pid_tuning">
763776
<tr class="altPID">
764777
<!-- 3 -->
@@ -774,6 +787,7 @@ <h5 class="modal-title-craft"></h5>
774787
</td>
775788
<td></td>
776789
</tr>
790+
777791
<tr class="velPID">
778792
<!-- 9 -->
779793
<td>VEL</td>
@@ -860,38 +874,6 @@ <h5 class="modal-title-craft"></h5>
860874
</tr>
861875
</table>
862876

863-
<table id="d_min" class="parameter cf">
864-
<thead>
865-
<tr>
866-
<th colspan="5">D Min</th>
867-
</tr>
868-
</thead>
869-
<tbody>
870-
<tr>
871-
<td name="d_min_roll" class="bf-only">
872-
<label>Roll</label>
873-
<input type="text" step="1" min="0" max="100" />
874-
</td>
875-
<td name="d_min_pitch" class="bf-only">
876-
<label>Pitch</label>
877-
<input type="text" step="1" min="0" max="100" />
878-
</td>
879-
<td name="d_min_yaw" class="bf-only">
880-
<label>Yaw</label>
881-
<input type="text" step="1" min="0" max="100" />
882-
</td>
883-
<td name="d_min_gain" class="bf-only">
884-
<label>Gain</label>
885-
<input type="text" step="1" min="0" max="100" />
886-
</td>
887-
<td name="d_min_advance" class="bf-only">
888-
<label>Advance</label>
889-
<input type="text" step="1" min="0" max="200" />
890-
</td>
891-
</tr>
892-
</tbody>
893-
</table>
894-
895877
<table class="parameter cf">
896878
<thead>
897879
<tr>
@@ -946,30 +928,6 @@ <h5 class="modal-title-craft"></h5>
946928
</tbody>
947929
</table>
948930

949-
<table class="parameter cf">
950-
<thead>
951-
<tr>
952-
<th colspan="5">TPA and Airmode</th>
953-
</tr>
954-
</thead>
955-
<tbody>
956-
<tr>
957-
<td name="dynThrPID">
958-
<label>TPA amount</label>
959-
<input type="text" step="0.01" min="0" max="1.00" />
960-
</td>
961-
<td name="tpa-breakpoint">
962-
<label>TPA Breakpoint</label>
963-
<input type="text" step="10" min="1000" max="2000" />
964-
</td>
965-
<td name="airmode_activate_throttle" class="bf-only">
966-
<label>Airmode Activate</label>
967-
<input type="text" step="10" min="1000" max="2000" />
968-
</td>
969-
</tr>
970-
</tbody>
971-
</table>
972-
973931
<table class="parameter cf">
974932
<thead>
975933
<tr>
@@ -1008,6 +966,50 @@ <h5 class="modal-title-craft"></h5>
1008966
</tbody>
1009967
</table>
1010968

969+
<table id="d_min" class="parameter cf">
970+
<thead>
971+
<tr>
972+
<th colspan="5">D Min</th>
973+
</tr>
974+
</thead>
975+
<tbody>
976+
<tr>
977+
<td name="d_min_gain" class="bf-only">
978+
<label>Gain</label>
979+
<input type="text" step="1" min="0" max="100" />
980+
</td>
981+
<td name="d_min_advance" class="bf-only">
982+
<label>Advance</label>
983+
<input type="text" step="1" min="0" max="200" />
984+
</td>
985+
</tr>
986+
</tbody>
987+
</table>
988+
989+
<table class="parameter cf">
990+
<thead>
991+
<tr>
992+
<th colspan="5">TPA and Airmode</th>
993+
</tr>
994+
</thead>
995+
<tbody>
996+
<tr>
997+
<td name="dynThrPID">
998+
<label>TPA amount</label>
999+
<input type="text" step="0.01" min="0" max="1.00" />
1000+
</td>
1001+
<td name="tpa-breakpoint">
1002+
<label>TPA Breakpoint</label>
1003+
<input type="text" step="10" min="1000" max="2000" />
1004+
</td>
1005+
<td name="airmode_activate_throttle" class="bf-only">
1006+
<label>Airmode Activate</label>
1007+
<input type="text" step="10" min="1000" max="2000" />
1008+
</td>
1009+
</tr>
1010+
</tbody>
1011+
</table>
1012+
10111013
<table class="parameter cf">
10121014
<thead>
10131015
<tr>

‎js/flightlog_parser.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -806,13 +806,13 @@ var FlightLogParser = function(logData) {
806806
var expoParams = parseCommaSeparatedString(fieldValue);
807807
that.sysConfig.superExpoFactor = expoParams[0];
808808
that.sysConfig.superExpoFactorYaw = expoParams[1];
809-
810809
} else {
811810
that.sysConfig.superExpoFactor = parseInt(fieldValue, 10);
812811
}
813812
break;
814813

815814
/* CSV packed values */
815+
816816
case "rates":
817817
case "rate_limits":
818818
case "rollPID":
@@ -831,39 +831,43 @@ var FlightLogParser = function(logData) {
831831
case "rc_smoothing_active_cutoffs_ff_sp_thr":
832832
case "gyro_lowpass_dyn_hz":
833833
case "dterm_lpf_dyn_hz":
834-
case "d_min":
835834
that.sysConfig[fieldName] = parseCommaSeparatedString(fieldValue);
836835
break;
837836
case "magPID":
838837
that.sysConfig.magPID = parseCommaSeparatedString(fieldValue,3); //[parseInt(fieldValue, 10), null, null];
839838
break;
839+
case "d_min":
840+
// Add Dmin values as Derivative numbers to PID array
841+
var dMinValues = parseCommaSeparatedString(fieldValue);
842+
that.sysConfig["rollPID"].push(dMinValues[0]);
843+
that.sysConfig["pitchPID"].push(dMinValues[1]);
844+
that.sysConfig["yawPID"].push(dMinValues[2]);
845+
break;
840846
case "ff_weight":
841-
// Add it to the end of the rollPID, pitchPID and yawPID
847+
// Add feedforward values to the PID array
842848
var ffValues = parseCommaSeparatedString(fieldValue);
843849
that.sysConfig["rollPID"].push(ffValues[0]);
844850
that.sysConfig["pitchPID"].push(ffValues[1]);
845851
that.sysConfig["yawPID"].push(ffValues[2]);
846852
break;
853+
847854
/* End of CSV packed values */
848855

849856
case "vbatcellvoltage":
850857
var vbatcellvoltageParams = parseCommaSeparatedString(fieldValue);
851-
852858
that.sysConfig.vbatmincellvoltage = vbatcellvoltageParams[0];
853859
that.sysConfig.vbatwarningcellvoltage = vbatcellvoltageParams[1];
854860
that.sysConfig.vbatmaxcellvoltage = vbatcellvoltageParams[2];
855861
break;
856862
case "currentMeter":
857863
case "currentSensor":
858864
var currentMeterParams = parseCommaSeparatedString(fieldValue);
859-
860865
that.sysConfig.currentMeterOffset = currentMeterParams[0];
861866
that.sysConfig.currentMeterScale = currentMeterParams[1];
862867
break;
863868
case "gyro.scale":
864869
case "gyro_scale":
865870
that.sysConfig.gyroScale = hexToFloat(fieldValue);
866-
867871
/* Baseflight uses a gyroScale that'll give radians per microsecond as output, whereas Cleanflight produces degrees
868872
* per second and leaves the conversion to radians per us to the IMU. Let's just convert Cleanflight's scale to
869873
* match Baseflight so we can use Baseflight's IMU for both: */

‎js/header_dialog.js‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ function HeaderDialog(dialog, onSave) {
235235
case 0:
236236
if(data[i]!=null) {
237237
$(this).val((data[i]).toFixed(0));
238-
$(this).attr('decPl', 1);
238+
$(this).attr('decPl', 0);
239239
$(this).removeClass('missing');
240240
} else {
241241
$(this).addClass('missing');
@@ -245,7 +245,7 @@ function HeaderDialog(dialog, onSave) {
245245
case 1:
246246
if(data[i]!=null) {
247247
$(this).val((data[i]).toFixed(0));
248-
$(this).attr('decPl', 3);
248+
$(this).attr('decPl', 0);
249249
$(this).removeClass('missing');
250250
} else {
251251
$(this).addClass('missing');
@@ -265,7 +265,18 @@ function HeaderDialog(dialog, onSave) {
265265
case 3:
266266
if(data[i]!=null) {
267267
$(this).val(data[i].toFixed(0));
268-
$(this).attr('decPl', 2);
268+
$(this).attr('decPl', 0);
269+
$(this).removeClass('missing');
270+
} else {
271+
$(this).val('');
272+
$(this).addClass('missing');
273+
}
274+
i++;
275+
break;
276+
case 4:
277+
if(data[i]!=null) {
278+
$(this).val(data[i].toFixed(0));
279+
$(this).attr('decPl', 0);
269280
$(this).removeClass('missing');
270281
} else {
271282
$(this).val('');

0 commit comments

Comments
 (0)