Skip to content

update fields and graphs for GPS Rescue 4.4 #597

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
Sep 13, 2022
Merged

update fields and graphs for GPS Rescue 4.4 #597

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
6 changes: 6 additions & 0 deletions js/flightlog_fielddefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,16 @@ var
"D_LPF",
"VTX_TRAMP",
"GHST",
"GHST_MSP",
"SCHEDULER_DETERMINISM",
"TIMING_ACCURACY",
"RX_EXPRESSLRS_SPI",
"RX_EXPRESSLRS_PHASELOCK",
"RX_STATE_TIME",
"GPS_RESCUE_VELOCITY",
"GPS_RESCUE_HEADING",
"GPS_RESCUE_TRACKING",
"ATTITUDE",
]),

SUPER_EXPO_YAW = makeReadOnly([
Expand Down
51 changes: 44 additions & 7 deletions js/flightlog_fields_presenter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,13 @@ function FlightLogFieldPresenter() {
'debug[2]':'RSSI',
'debug[3]':'Link Quality',
},
'GHST_MSP' : {
'debug[all]':'Ghost MSP',
'debug[0]':'MSP Frame Count',
'debug[1]':'MSP Frame Counter',
'debug[2]':'Not used',
'debug[3]':'Not used',
},
'SCHEDULER_DETERMINISM' : {
'debug[all]':'Scheduler Determinism',
'debug[0]':'Cycle Start time',
Expand Down Expand Up @@ -626,6 +633,13 @@ function FlightLogFieldPresenter() {
'debug[2]':'Frequency Offset',
'debug[3]':'Phase Shift',
},
'RX_STATE_TIME' : {
'debug[all]':'Rx State Time',
'debug[0]':'Time 0',
'debug[1]':'Time 1',
'debug[2]':'Time 2',
'debug[3]':'Time 3',
},
'GPS_RESCUE_VELOCITY' : {
'debug[all]':'GPS Rescue Velocity',
'debug[0]':'Velocity P',
Expand All @@ -635,9 +649,9 @@ function FlightLogFieldPresenter() {
},
'GPS_RESCUE_HEADING' : {
'debug[all]':'GPS Rescue Heading',
'debug[0]':'Rescue Yaw',
'debug[1]':'Rescue Roll',
'debug[2]':'Attitude',
'debug[0]':'Ground speed',
'debug[1]':'GPS Heading',
'debug[2]':'IMU Attitude',
'debug[3]':'Angle to home',
},
'GPS_RESCUE_TRACKING' : {
Expand All @@ -647,6 +661,13 @@ function FlightLogFieldPresenter() {
'debug[2]':'Altitude',
'debug[3]':'Target altitude',
},
'ATTITUDE' : {
'debug[all]':'Attitude',
'debug[0]':'accADC X',
'debug[1]':'accADC Y',
'debug[2]':'Setpoint Roll',
'debug[3]':'Setpoint Pitch',
},
};

let DEBUG_FRIENDLY_FIELD_NAMES = null;
Expand Down Expand Up @@ -1130,6 +1151,14 @@ function FlightLogFieldPresenter() {
default:
return value.toFixed(0);
}
case 'GHST_MSP':
switch (fieldName) {
// debug 0 is msp frame count
// debug 1 is msp frame count
// debug 2 and 3 not used
default:
return value.toFixed(0);
}
case 'SCHEDULER_DETERMINISM':
switch (fieldName) {
case 'debug[0]': // cycle time in us*10
Expand Down Expand Up @@ -1193,10 +1222,9 @@ function FlightLogFieldPresenter() {
}
case 'GPS_RESCUE_HEADING':
switch (fieldName) {
case 'debug[0]': // Rescue yaw rate deg/s * 10 up to +/- 90
return (value / 10).toFixed(1) + 'deg/s';
case 'debug[1]': // Rescue roll deg * 100 up to +/- 20 deg
return (value / 100).toFixed(1) + 'deg';
case 'debug[0]': // Ground speed cm/s
return (value / 100).toFixed(2) + 'm/s';
case 'debug[1]': // GPS Ground course degrees * 10
case 'debug[2]': // Attitude in degrees * 10
case 'debug[3]': // Angle to home in degrees * 10
return (value / 10).toFixed(1) + 'deg';
Expand All @@ -1214,6 +1242,15 @@ function FlightLogFieldPresenter() {
default:
return value.toFixed(0);
}
case 'ATTITUDE:
switch (fieldName) {
case 'debug[0]': // accADC X
case 'debug[1]': // accADC Y
case 'debug[2]': // setpoint Roll
case 'debug[3]': // setpoint Pitch
default:
return value.toFixed(0);
}
}
return value.toFixed(0);
}
Expand Down
12 changes: 3 additions & 9 deletions js/graph_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,20 +781,14 @@ GraphConfig.load = function(config) {
}
case 'GPS_RESCUE_HEADING':
switch (fieldName) {
case 'debug[0]': // Rescue yaw rate deg/s * 10 up to +/- 90
return {
offset: 0,
power: 1.0,
inputRange: 1000,
outputRange: 1.0,
};
case 'debug[1]': // Rescue roll deg * 100 up to +/- 20 deg
case 'debug[0]': // Groundspeed cm/s
return {
offset: 0,
power: 1.0,
inputRange: 10000,
outputRange: 1.0,
};
case 'debug[1]': // GPS GroundCourse
case 'debug[2]': // Yaw attitude * 10
case 'debug[3]': // Angle to home * 10
return {
Expand Down Expand Up @@ -840,7 +834,7 @@ GraphConfig.load = function(config) {
return {
offset: 0,
power: 1.0,
inputRange: 500,
inputRange: 1000,
outputRange: 1.0,
};
case 'debug[2]': // altitude m
Expand Down