Skip to content

restore lost debug names, update DOP graphics scaling #608

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

Closed
wants to merge 1 commit into from
Closed

restore lost debug names, update DOP graphics scaling #608

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
16 changes: 2 additions & 14 deletions js/flightlog_fielddefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ let
"GPS_RESCUE_TRACKING",
"ATTITUDE",
"VTX_MSP",
"GPS_DOP",
]),

SUPER_EXPO_YAW = makeReadOnly([
Expand Down Expand Up @@ -545,20 +546,7 @@ function adjustFieldDefsList(firmwareType, firmwareVersion) {
DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_INTERPOLATED'), 1);
}
if (semver.gte(firmwareVersion, '4.3.0')) {
DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_INTERPOLATED'), 1, 'FEEDFORWARD');
DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_LIMIT'), 1, 'FEEDFORWARD_LIMIT');
DEBUG_MODE.splice(DEBUG_MODE.indexOf('DYN_IDLE'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('FFT'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('FFT_TIME'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('FFT_FREQ'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('GPS_RESCUE_THROTTLE_PID'), 1);
}
if (semver.gte(firmwareVersion, '4.4.0')) {
DEBUG_MODE.splice(DEBUG_MODE.indexOf('BARO'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('RTH'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('GPS_RESCUE_THROTTLE_PID'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('VTX_MSP'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('GPS_DOP'), 1);
DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_LIMIT'), 1, 'FEEDFORWARD_LIMIT', 'FEEDFORWARD');
}

DEBUG_MODE = makeReadOnly(DEBUG_MODE);
Expand Down
30 changes: 15 additions & 15 deletions js/flightlog_fields_presenter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,20 @@ function FlightLogFieldPresenter() {
'debug[2]':'Setpoint Roll',
'debug[3]':'Setpoint Pitch',
},
'VTX_MSP' : {
'debug[all]': 'VTX MSP',
'debug[0]': 'packetCounter',
'debug[1]': 'isCrsfPortConfig',
'debug[2]': 'isLowPowerDisarmed',
'debug[3]': 'mspTelemetryDescriptor',
},
'GPS_DOP' : {
'debug[all]': 'GPS Dilution of Precision',
'debug[0]': 'Number of Satellites',
'debug[1]': 'pDOP (positional - 3D)',
'debug[2]': 'hDOP (horizontal - 2D)',
'debug[3]': 'vDOP (vertical - 1D)',
},
};

let DEBUG_FRIENDLY_FIELD_NAMES = null;
Expand Down Expand Up @@ -700,20 +714,6 @@ function FlightLogFieldPresenter() {
'debug[2]':'Altitude',
'debug[3]':'Target altitude',
};
DEBUG_FRIENDLY_FIELD_NAMES.VTX_MSP = {
'debug[all]': 'VTX MSP',
'debug[0]': 'packetCounter',
'debug[1]': 'isCrsfPortConfig',
'debug[2]': 'isLowPowerDisarmed',
'debug[3]': 'mspTelemetryDescriptor',
};
DEBUG_FRIENDLY_FIELD_NAMES.GPS_DOP = {
'debug[all]': 'GPS Dilution of Precision',
'debug[0]': 'Number of Satellites',
'debug[1]': 'pDOP (positional - 3D)',
'debug[2]': 'hDOP (horizontal - 2D)',
'debug[3]': 'vDOP (vertical - 1D)',
};
} else if (semver.gte(firmwareVersion, '4.3.0')) {
DEBUG_FRIENDLY_FIELD_NAMES.FEEDFORWARD = {
'debug[all]':'Feedforward [roll]',
Expand Down Expand Up @@ -1307,7 +1307,7 @@ function FlightLogFieldPresenter() {
case 'debug[2]': // hDOP (horizontal - 2D)
case 'debug[3]': // vDOP (vertical - 1D)
default:
return (value / 100).toFixed(1);
return (value / 100).toFixed(2);
}
}
return value.toFixed(0);
Expand Down
15 changes: 15 additions & 0 deletions js/graph_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,21 @@ GraphConfig.load = function(config) {
default:
return getCurveForMinMaxFields(fieldName);
}
case 'GPS_DOP':
switch (fieldName) {
case 'debug[0]': // Number of Satellites (now this is in normal GPS data, maybe gpsTrust?)
case 'debug[1]': // pDOP
case 'debug[2]': // hDOP
case 'debug[3]': // vDOP
return {
offset: 0,
power: 1.0,
inputRange: 200 ,
outputRange: 1.0,
};
default:
return getCurveForMinMaxFields(fieldName);
}
}
}
// if not found above then
Expand Down
2 changes: 1 addition & 1 deletion js/grapher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ function FlightLogGrapher(flightLog, graphConfig, canvas, stickCanvas, craftCanv
idents.vbatField = fieldIndex;
idents.numCells = flightLog.getNumCellsEstimate();
break;
case "BaroAlt":
case "baroAlt":
idents.baroField = fieldIndex;
break;
case "roll":
Expand Down