Skip to content

Reverted the blanket rename from PID to PIDF. #234

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
Jul 22, 2018
Merged

Reverted the blanket rename from PID to PIDF. #234

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 js/flightlog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ function FlightLog(logData) {
destFrame[fieldIndex++] = attitude.pitch;
destFrame[fieldIndex++] = attitude.heading;

// Add the PIDF sum (P+I+D+F)
// Add the Feedforward PID sum (P+I+D+F)
for (var axis = 0; axis < 3; axis++) {
destFrame[fieldIndex++] =
(axisPID[axis][0] !== undefined ? srcFrame[axisPID[axis][0]] : 0) +
Expand Down
54 changes: 27 additions & 27 deletions js/flightlog_fields_presenter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@ function FlightLogFieldPresenter() {
(function() {
var FRIENDLY_FIELD_NAMES = {

'axisP[all]': 'PIDF P',
'axisP[0]': 'PIDF P [roll]',
'axisP[1]': 'PIDF P [pitch]',
'axisP[2]': 'PIDF P [yaw]',

'axisI[all]': 'PIDF I',
'axisI[0]': 'PIDF I [roll]',
'axisI[1]': 'PIDF I [pitch]',
'axisI[2]': 'PIDF I [yaw]',

'axisD[all]': 'PIDF D',
'axisD[0]': 'PIDF D [roll]',
'axisD[1]': 'PIDF D [pitch]',
'axisD[2]': 'PIDF D [yaw]',

'axisF[all]': 'PIDF F',
'axisF[0]': 'PIDF F [roll]',
'axisF[1]': 'PIDF F [pitch]',
'axisF[2]': 'PIDF F [yaw]',
'axisP[all]': 'PID P',
'axisP[0]': 'PID P [roll]',
'axisP[1]': 'PID P [pitch]',
'axisP[2]': 'PID P [yaw]',

'axisI[all]': 'PID I',
'axisI[0]': 'PID I [roll]',
'axisI[1]': 'PID I [pitch]',
'axisI[2]': 'PID I [yaw]',

'axisD[all]': 'PID D',
'axisD[0]': 'PID D [roll]',
'axisD[1]': 'PID D [pitch]',
'axisD[2]': 'PID D [yaw]',

'axisF[all]': 'PID Feedforward',
'axisF[0]': 'PID Feedforward [roll]',
'axisF[1]': 'PID Feedforward [pitch]',
'axisF[2]': 'PID Feedforward [yaw]',

//Virtual field
'axisSum[all]': 'PIDF Sum',
'axisSum[0]' : 'PIDF Sum [roll]',
'axisSum[1]' : 'PIDF Sum [pitch]',
'axisSum[2]' : 'PIDF Sum [yaw]',
'axisSum[all]': 'PID Sum',
'axisSum[0]' : 'PID Sum [roll]',
'axisSum[1]' : 'PID Sum [pitch]',
'axisSum[2]' : 'PID Sum [yaw]',

//Virtual field
'axisError[all]': 'PIDF Error',
'axisError[0]' : 'PIDF Error [roll]',
'axisError[1]' : 'PIDF Error [pitch]',
'axisError[2]' : 'PIDF Error [yaw]',
'axisError[all]': 'PID Error',
'axisError[0]' : 'PID Error [roll]',
'axisError[1]' : 'PID Error [pitch]',
'axisError[2]' : 'PID Error [yaw]',

//Virtual field
'rcCommands[all]': 'RC Rates',
Expand Down
10 changes: 5 additions & 5 deletions js/graph_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,23 +191,23 @@ GraphConfig.load = function(config) {
fields: ["rcCommand[all]"]
},
{
label: "PIDFs",
label: "PIDs",
fields: ["axisSum[all]"]
},
{
label: "PIDF Error",
label: "PID Error",
fields: ["axisError[all]"]
},
{
label: "Gyro + PIDF roll",
label: "Gyro + PID roll",
fields: ["axisP[0]", "axisI[0]", "axisD[0]", "axisF[0]", "gyroADC[0]"]
},
{
label: "Gyro + PIDF pitch",
label: "Gyro + PID pitch",
fields: ["axisP[1]", "axisI[1]", "axisD[1]", "axisF[1]", "gyroADC[1]"]
},
{
label: "Gyro + PIDF yaw",
label: "Gyro + PID yaw",
fields: ["axisP[2]", "axisI[2]", "axisD[2]", "axisF[2]", "gyroADC[2]"]
},
{
Expand Down