Skip to content

Update debug fields #674

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 2 commits into from
Dec 4, 2023
Merged

Update debug fields #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
693435e
Uodate debug fields
haslinghuis Dec 3, 2023
ed723f7
Remove ATTITUDE
haslinghuis Dec 4, 2023
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
22 changes: 11 additions & 11 deletions js/flightlog_fielddefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,15 @@ let
"NONE",
"CYCLETIME",
"BATTERY",
"GYRO",
"GYRO", // deprecated (GYRO_FILTERED)
"ACCELEROMETER",
"MIXER",
"AIRMODE",
"MIXER", // deprecated
"AIRMODE", // deprecated
"PIDLOOP",
"NOTCH",
"NOTCH", // deprecated (GYRO_SCALED)
"RC_INTERPOLATION",
"VELOCITY",
"DTERM_FILTER",
"VELOCITY", // deprecated
"DTERM_FILTER", // deprecated
"ANGLERATE",
"ESC_SENSOR",
"SCHEDULER",
Expand All @@ -289,10 +289,10 @@ let
"FFT_TIME",
"FFT_FREQ",
"RX_FRSKY_SPI",
"GYRO_RAW",
"DUAL_GYRO",
"GYRO_RAW", // deprecated
"DUAL_GYRO", // deprecated
"DUAL_GYRO_RAW",
"DUAL_GYRO_COMBINED",
"DUAL_GYRO_COMBINED", // deprecated
"DUAL_GYRO_DIFF",
"MAX7456_SIGNAL",
"MAX7456_SPICLOCK",
Expand Down Expand Up @@ -329,8 +329,8 @@ let
"BARO",
"GPS_RESCUE_THROTTLE_PID",
"DYN_IDLE",
"FF_LIMIT",
"FF_INTERPOLATED",
"FF_LIMIT", // deprecated (FEEDFORWARD_LIMIT)
"FF_INTERPOLATED", // deprecated (FEEDFORWARD)
"BLACKBOX_OUTPUT",
"GYRO_SAMPLE",
"RX_TIMING",
Expand Down
30 changes: 17 additions & 13 deletions js/flightlog_fields_presenter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,14 +1003,10 @@ function FlightLogFieldPresenter() {
},
'ATTITUDE' : {
'debug[all]':'Attitude',
'debug[0]':'accADC X',
'debug[1]':'accADC Y',
'debug[2]':'Setpoint Roll',
'debug[3]':'Setpoint Pitch',
'debug[4]':'Not Used',
'debug[5]':'Not Used',
'debug[6]':'Not Used',
'debug[7]':'Not Used',
'debug[0]':'IMU Gain',
'debug[1]':'EZ_EF',
'debug[2]':'GroundSpeedError',
'debug[3]':'VelocityFactor',
},
'VTX_MSP' : {
'debug[all]': 'VTX MSP',
Expand Down Expand Up @@ -1050,10 +1046,10 @@ function FlightLogFieldPresenter() {
},
'ANGLE_MODE' : {
'debug[all]': 'Angle Mode',
'debug[0]': 'Angle Target',
'debug[1]': 'Angle Error',
'debug[2]': 'Angle Feedforward',
'debug[3]': 'Angle Current',
'debug[0]': 'Target Angle',
'debug[1]': 'Error P correction',
'debug[2]': 'Feedforward correction',
'debug[3]': 'Angle Achieved',
},
'ANGLE_TARGET' : {
'debug[all]': 'Angle Target',
Expand Down Expand Up @@ -1861,7 +1857,15 @@ function FlightLogFieldPresenter() {
case 'GYRO_CALIBRATION':
return value.toFixed(0);
case 'ANGLE_MODE':
return value.toFixed(0);
switch (fieldName) {
case 'debug[0]': // target angle
case 'debug[1]': // angle error
case 'debug[2]': // angle feedforward
case 'debug[3]': // angle achieved
return (value / 10).toFixed(1) + " °";
default:
return value.toFixed(0);
}
case 'ANGLE_TARGET':
return value.toFixed(0);
case 'CURRENT_ANGLE':
Expand Down
138 changes: 69 additions & 69 deletions js/graph_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,33 @@ GraphConfig.load = function(config) {
inputRange: maxDegreesSecond(gyroScaleMargin), // Maximum grad/s + 20%
outputRange: 1.0
};
case 'ALTITUDE':
switch (fieldName) {
case 'debug[0]': // GPS Trust
return {
offset: 0,
power: 1.0,
inputRange: 200,
outputRange: 1.0,
};
case 'debug[1]': // Baro Alt
case 'debug[2]': // GPS Alt
return {
offset: 0,
power: 1.0,
inputRange: 5000,
outputRange: 1.0,
};
case 'debug[3]': // Vario
return {
offset: 0,
power: 1.0,
inputRange: 500,
outputRange: 1.0,
};
default:
return getCurveForMinMaxFields(fieldName);
}
case 'FFT':
switch (fieldName) {
case 'debug[0]': // pre-dyn notch gyro [for gyro debug axis]
Expand Down Expand Up @@ -635,6 +662,48 @@ GraphConfig.load = function(config) {
inputRange: 300,
outputRange: 1.0,
};
case 'BARO':
switch (fieldName) {
case 'debug[0]': // Baro state 0-10
return {
offset: 0,
power: 1.0,
inputRange: 20,
outputRange: 1.0,
};
case 'debug[1]': // Baro Temp
case 'debug[2]': // Baro Raw
case 'debug[3]': // Baro smoothed
return {
offset: 0,
power: 1.0,
inputRange: 2000,
outputRange: 1.0,
};
default:
return getCurveForMinMaxFields(fieldName);
}
case 'GPS_RESCUE_THROTTLE_PID':
switch (fieldName) {
case 'debug[0]': // Throttle P uS added
case 'debug[1]': // Throttle D uS added
return {
offset: 0,
power: 1.0,
inputRange: 200,
outputRange: 1.0,
};
case 'debug[2]': // Altitude
case 'debug[3]': // Target Altitude
return {
offset: 0,
power: 1.0,
inputRange: 5000,
outputRange: 1.0,
};
default:
return getCurveForMinMaxFields(fieldName);
}
case 'DYN_IDLE':
switch (fieldName) {
case 'debug[0]': // in 4.3 is dyn idle P
Expand Down Expand Up @@ -771,27 +840,6 @@ GraphConfig.load = function(config) {
default:
return getCurveForMinMaxFields(fieldName);
}
case 'GPS_RESCUE_THROTTLE_PID':
switch (fieldName) {
case 'debug[0]': // Throttle P uS added
case 'debug[1]': // Throttle D uS added
return {
offset: 0,
power: 1.0,
inputRange: 200,
outputRange: 1.0,
};
case 'debug[2]': // Altitude
case 'debug[3]': // Target Altitude
return {
offset: 0,
power: 1.0,
inputRange: 5000,
outputRange: 1.0,
};
default:
return getCurveForMinMaxFields(fieldName);
}
case 'GPS_RESCUE_VELOCITY':
switch (fieldName) {
case 'debug[0]': // Pitch P deg * 100
Expand Down Expand Up @@ -948,54 +996,6 @@ GraphConfig.load = function(config) {
default:
return getCurveForMinMaxFields(fieldName);
}
case 'ALTITUDE':
switch (fieldName) {
case 'debug[0]': // GPS Trust
return {
offset: 0,
power: 1.0,
inputRange: 200,
outputRange: 1.0,
};
case 'debug[1]': // Baro Alt
case 'debug[2]': // GPS Alt
return {
offset: 0,
power: 1.0,
inputRange: 5000,
outputRange: 1.0,
};
case 'debug[3]': // Vario
return {
offset: 0,
power: 1.0,
inputRange: 500,
outputRange: 1.0,
};
default:
return getCurveForMinMaxFields(fieldName);
}
case 'BARO':
switch (fieldName) {
case 'debug[0]': // Baro state 0-10
return {
offset: 0,
power: 1.0,
inputRange: 20,
outputRange: 1.0,
};
case 'debug[1]': // Baro Temp
case 'debug[2]': // Baro Raw
case 'debug[3]': // Baro smoothed
return {
offset: 0,
power: 1.0,
inputRange: 2000,
outputRange: 1.0,
};
default:
return getCurveForMinMaxFields(fieldName);
}
case 'GPS_DOP':
switch (fieldName) {
case 'debug[0]': // Number of Satellites (now this is in normal GPS data, maybe gpsTrust?)
Expand Down