Skip to content

Show Dmax in log header properly for 4.3 #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 28, 2021
Merged

Show Dmax in log header properly for 4.3 #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/header_dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ select {
.header-dialog table td,
.header-dialog .pid_titlebar th {
padding: 1px;
width: 20%;
width: 15%;
border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
Expand Down
114 changes: 58 additions & 56 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,9 @@ <h5 class="modal-title-craft"></h5>
<th name="Integral">
<label>Integral</label>
</th>
<th name="D_Max">
<label>D_Max</label>
</th>
<th name="Derivative">
<label>Derivative</label>
</th>
Expand All @@ -714,6 +717,9 @@ <h5 class="modal-title-craft"></h5>
<td>
<input type="text" name="d" step="1" min="0" max="255" />
</td>
<td>
<input type="text" name="d_min_roll" step="1" min="0" max="255" />
</td>
<td>
<input type="text" name="f" step="1" min="0" max="255" />
</td>
Expand All @@ -730,6 +736,9 @@ <h5 class="modal-title-craft"></h5>
<td>
<input type="text" name="d" step="1" min="0" max="255" />
</td>
<td>
<input type="text" name="d_min_pitch" step="1" min="0" max="255" />
</td>
<td>
<input type="text" name="f" step="1" min="0" max="255" />
</td>
Expand All @@ -746,6 +755,9 @@ <h5 class="modal-title-craft"></h5>
<td>
<input type="text" name="d" step="1" min="0" max="255" />
</td>
<td>
<input type="text" name="d_min_yaw" step="1" min="0" max="255" />
</td>
<td>
<input type="text" name="f" step="1" min="0" max="255" />
</td>
Expand All @@ -759,6 +771,7 @@ <h5 class="modal-title-craft"></h5>
</tr>
</thead>
</table>

<table id="pid_baro" class="pid_tuning">
<tr class="altPID">
<!-- 3 -->
Expand All @@ -774,6 +787,7 @@ <h5 class="modal-title-craft"></h5>
</td>
<td></td>
</tr>

<tr class="velPID">
<!-- 9 -->
<td>VEL</td>
Expand Down Expand Up @@ -860,38 +874,6 @@ <h5 class="modal-title-craft"></h5>
</tr>
</table>

<table id="d_min" class="parameter cf">
<thead>
<tr>
<th colspan="5">D Min</th>
</tr>
</thead>
<tbody>
<tr>
<td name="d_min_roll" class="bf-only">
<label>Roll</label>
<input type="text" step="1" min="0" max="100" />
</td>
<td name="d_min_pitch" class="bf-only">
<label>Pitch</label>
<input type="text" step="1" min="0" max="100" />
</td>
<td name="d_min_yaw" class="bf-only">
<label>Yaw</label>
<input type="text" step="1" min="0" max="100" />
</td>
<td name="d_min_gain" class="bf-only">
<label>Gain</label>
<input type="text" step="1" min="0" max="100" />
</td>
<td name="d_min_advance" class="bf-only">
<label>Advance</label>
<input type="text" step="1" min="0" max="200" />
</td>
</tr>
</tbody>
</table>

<table class="parameter cf">
<thead>
<tr>
Expand Down Expand Up @@ -946,30 +928,6 @@ <h5 class="modal-title-craft"></h5>
</tbody>
</table>

<table class="parameter cf">
<thead>
<tr>
<th colspan="5">TPA and Airmode</th>
</tr>
</thead>
<tbody>
<tr>
<td name="dynThrPID">
<label>TPA amount</label>
<input type="text" step="0.01" min="0" max="1.00" />
</td>
<td name="tpa-breakpoint">
<label>TPA Breakpoint</label>
<input type="text" step="10" min="1000" max="2000" />
</td>
<td name="airmode_activate_throttle" class="bf-only">
<label>Airmode Activate</label>
<input type="text" step="10" min="1000" max="2000" />
</td>
</tr>
</tbody>
</table>

<table class="parameter cf">
<thead>
<tr>
Expand Down Expand Up @@ -1008,6 +966,50 @@ <h5 class="modal-title-craft"></h5>
</tbody>
</table>

<table id="d_min" class="parameter cf">
<thead>
<tr>
<th colspan="5">D Min</th>
</tr>
</thead>
<tbody>
<tr>
<td name="d_min_gain" class="bf-only">
<label>Gain</label>
<input type="text" step="1" min="0" max="100" />
</td>
<td name="d_min_advance" class="bf-only">
<label>Advance</label>
<input type="text" step="1" min="0" max="200" />
</td>
</tr>
</tbody>
</table>

<table class="parameter cf">
<thead>
<tr>
<th colspan="5">TPA and Airmode</th>
</tr>
</thead>
<tbody>
<tr>
<td name="dynThrPID">
<label>TPA amount</label>
<input type="text" step="0.01" min="0" max="1.00" />
</td>
<td name="tpa-breakpoint">
<label>TPA Breakpoint</label>
<input type="text" step="10" min="1000" max="2000" />
</td>
<td name="airmode_activate_throttle" class="bf-only">
<label>Airmode Activate</label>
<input type="text" step="10" min="1000" max="2000" />
</td>
</tr>
</tbody>
</table>

<table class="parameter cf">
<thead>
<tr>
Expand Down
16 changes: 10 additions & 6 deletions js/flightlog_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,13 +806,13 @@ var FlightLogParser = function(logData) {
var expoParams = parseCommaSeparatedString(fieldValue);
that.sysConfig.superExpoFactor = expoParams[0];
that.sysConfig.superExpoFactorYaw = expoParams[1];

} else {
that.sysConfig.superExpoFactor = parseInt(fieldValue, 10);
}
break;

/* CSV packed values */

case "rates":
case "rate_limits":
case "rollPID":
Expand All @@ -831,39 +831,43 @@ var FlightLogParser = function(logData) {
case "rc_smoothing_active_cutoffs_ff_sp_thr":
case "gyro_lowpass_dyn_hz":
case "dterm_lpf_dyn_hz":
case "d_min":
that.sysConfig[fieldName] = parseCommaSeparatedString(fieldValue);
break;
case "magPID":
that.sysConfig.magPID = parseCommaSeparatedString(fieldValue,3); //[parseInt(fieldValue, 10), null, null];
break;
case "d_min":
// Add Dmin values as Derivative numbers to PID array
var dMinValues = parseCommaSeparatedString(fieldValue);
that.sysConfig["rollPID"].push(dMinValues[0]);
that.sysConfig["pitchPID"].push(dMinValues[1]);
that.sysConfig["yawPID"].push(dMinValues[2]);
break;
case "ff_weight":
// Add it to the end of the rollPID, pitchPID and yawPID
// Add feedforward values to the PID array
var ffValues = parseCommaSeparatedString(fieldValue);
that.sysConfig["rollPID"].push(ffValues[0]);
that.sysConfig["pitchPID"].push(ffValues[1]);
that.sysConfig["yawPID"].push(ffValues[2]);
break;

/* End of CSV packed values */

case "vbatcellvoltage":
var vbatcellvoltageParams = parseCommaSeparatedString(fieldValue);

that.sysConfig.vbatmincellvoltage = vbatcellvoltageParams[0];
that.sysConfig.vbatwarningcellvoltage = vbatcellvoltageParams[1];
that.sysConfig.vbatmaxcellvoltage = vbatcellvoltageParams[2];
break;
case "currentMeter":
case "currentSensor":
var currentMeterParams = parseCommaSeparatedString(fieldValue);

that.sysConfig.currentMeterOffset = currentMeterParams[0];
that.sysConfig.currentMeterScale = currentMeterParams[1];
break;
case "gyro.scale":
case "gyro_scale":
that.sysConfig.gyroScale = hexToFloat(fieldValue);

/* Baseflight uses a gyroScale that'll give radians per microsecond as output, whereas Cleanflight produces degrees
* per second and leaves the conversion to radians per us to the IMU. Let's just convert Cleanflight's scale to
* match Baseflight so we can use Baseflight's IMU for both: */
Expand Down
17 changes: 14 additions & 3 deletions js/header_dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ function HeaderDialog(dialog, onSave) {
case 0:
if(data[i]!=null) {
$(this).val((data[i]).toFixed(0));
$(this).attr('decPl', 1);
$(this).attr('decPl', 0);
$(this).removeClass('missing');
} else {
$(this).addClass('missing');
Expand All @@ -245,7 +245,7 @@ function HeaderDialog(dialog, onSave) {
case 1:
if(data[i]!=null) {
$(this).val((data[i]).toFixed(0));
$(this).attr('decPl', 3);
$(this).attr('decPl', 0);
$(this).removeClass('missing');
} else {
$(this).addClass('missing');
Expand All @@ -265,7 +265,18 @@ function HeaderDialog(dialog, onSave) {
case 3:
if(data[i]!=null) {
$(this).val(data[i].toFixed(0));
$(this).attr('decPl', 2);
$(this).attr('decPl', 0);
$(this).removeClass('missing');
} else {
$(this).val('');
$(this).addClass('missing');
}
i++;
break;
case 4:
if(data[i]!=null) {
$(this).val(data[i].toFixed(0));
$(this).attr('decPl', 0);
$(this).removeClass('missing');
} else {
$(this).val('');
Expand Down