Skip to content

Commit 9961080

Browse files
haslinghuishaslinghuis
authored
Update debug fields (#674)
* Uodate debug fields * Remove ATTITUDE
1 parent cfbea75 commit 9961080

File tree

3 files changed

+97
-93
lines changed

3 files changed

+97
-93
lines changed

‎js/flightlog_fielddefs.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,15 @@ let
269269
"NONE",
270270
"CYCLETIME",
271271
"BATTERY",
272-
"GYRO",
272+
"GYRO", // deprecated (GYRO_FILTERED)
273273
"ACCELEROMETER",
274-
"MIXER",
275-
"AIRMODE",
274+
"MIXER", // deprecated
275+
"AIRMODE", // deprecated
276276
"PIDLOOP",
277-
"NOTCH",
277+
"NOTCH", // deprecated (GYRO_SCALED)
278278
"RC_INTERPOLATION",
279-
"VELOCITY",
280-
"DTERM_FILTER",
279+
"VELOCITY", // deprecated
280+
"DTERM_FILTER", // deprecated
281281
"ANGLERATE",
282282
"ESC_SENSOR",
283283
"SCHEDULER",
@@ -289,10 +289,10 @@ let
289289
"FFT_TIME",
290290
"FFT_FREQ",
291291
"RX_FRSKY_SPI",
292-
"GYRO_RAW",
293-
"DUAL_GYRO",
292+
"GYRO_RAW", // deprecated
293+
"DUAL_GYRO", // deprecated
294294
"DUAL_GYRO_RAW",
295-
"DUAL_GYRO_COMBINED",
295+
"DUAL_GYRO_COMBINED", // deprecated
296296
"DUAL_GYRO_DIFF",
297297
"MAX7456_SIGNAL",
298298
"MAX7456_SPICLOCK",
@@ -329,8 +329,8 @@ let
329329
"BARO",
330330
"GPS_RESCUE_THROTTLE_PID",
331331
"DYN_IDLE",
332-
"FF_LIMIT",
333-
"FF_INTERPOLATED",
332+
"FF_LIMIT", // deprecated (FEEDFORWARD_LIMIT)
333+
"FF_INTERPOLATED", // deprecated (FEEDFORWARD)
334334
"BLACKBOX_OUTPUT",
335335
"GYRO_SAMPLE",
336336
"RX_TIMING",

‎js/flightlog_fields_presenter.js‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,14 +1003,10 @@ function FlightLogFieldPresenter() {
10031003
},
10041004
'ATTITUDE' : {
10051005
'debug[all]':'Attitude',
1006-
'debug[0]':'accADC X',
1007-
'debug[1]':'accADC Y',
1008-
'debug[2]':'Setpoint Roll',
1009-
'debug[3]':'Setpoint Pitch',
1010-
'debug[4]':'Not Used',
1011-
'debug[5]':'Not Used',
1012-
'debug[6]':'Not Used',
1013-
'debug[7]':'Not Used',
1006+
'debug[0]':'IMU Gain',
1007+
'debug[1]':'EZ_EF',
1008+
'debug[2]':'GroundSpeedError',
1009+
'debug[3]':'VelocityFactor',
10141010
},
10151011
'VTX_MSP' : {
10161012
'debug[all]': 'VTX MSP',
@@ -1050,10 +1046,10 @@ function FlightLogFieldPresenter() {
10501046
},
10511047
'ANGLE_MODE' : {
10521048
'debug[all]': 'Angle Mode',
1053-
'debug[0]': 'Angle Target',
1054-
'debug[1]': 'Angle Error',
1055-
'debug[2]': 'Angle Feedforward',
1056-
'debug[3]': 'Angle Current',
1049+
'debug[0]': 'Target Angle',
1050+
'debug[1]': 'Error P correction',
1051+
'debug[2]': 'Feedforward correction',
1052+
'debug[3]': 'Angle Achieved',
10571053
},
10581054
'ANGLE_TARGET' : {
10591055
'debug[all]': 'Angle Target',
@@ -1861,7 +1857,15 @@ function FlightLogFieldPresenter() {
18611857
case 'GYRO_CALIBRATION':
18621858
return value.toFixed(0);
18631859
case 'ANGLE_MODE':
1864-
return value.toFixed(0);
1860+
switch (fieldName) {
1861+
case 'debug[0]': // target angle
1862+
case 'debug[1]': // angle error
1863+
case 'debug[2]': // angle feedforward
1864+
case 'debug[3]': // angle achieved
1865+
return (value / 10).toFixed(1) + " °";
1866+
default:
1867+
return value.toFixed(0);
1868+
}
18651869
case 'ANGLE_TARGET':
18661870
return value.toFixed(0);
18671871
case 'CURRENT_ANGLE':

‎js/graph_config.js‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,33 @@ GraphConfig.load = function(config) {
503503
inputRange: maxDegreesSecond(gyroScaleMargin), // Maximum grad/s + 20%
504504
outputRange: 1.0
505505
};
506+
case 'ALTITUDE':
507+
switch (fieldName) {
508+
case 'debug[0]': // GPS Trust
509+
return {
510+
offset: 0,
511+
power: 1.0,
512+
inputRange: 200,
513+
outputRange: 1.0,
514+
};
515+
case 'debug[1]': // Baro Alt
516+
case 'debug[2]': // GPS Alt
517+
return {
518+
offset: 0,
519+
power: 1.0,
520+
inputRange: 5000,
521+
outputRange: 1.0,
522+
};
523+
case 'debug[3]': // Vario
524+
return {
525+
offset: 0,
526+
power: 1.0,
527+
inputRange: 500,
528+
outputRange: 1.0,
529+
};
530+
default:
531+
return getCurveForMinMaxFields(fieldName);
532+
}
506533
case 'FFT':
507534
switch (fieldName) {
508535
case 'debug[0]': // pre-dyn notch gyro [for gyro debug axis]
@@ -635,6 +662,48 @@ GraphConfig.load = function(config) {
635662
inputRange: 300,
636663
outputRange: 1.0,
637664
};
665+
case 'BARO':
666+
switch (fieldName) {
667+
case 'debug[0]': // Baro state 0-10
668+
return {
669+
offset: 0,
670+
power: 1.0,
671+
inputRange: 20,
672+
outputRange: 1.0,
673+
};
674+
case 'debug[1]': // Baro Temp
675+
case 'debug[2]': // Baro Raw
676+
case 'debug[3]': // Baro smoothed
677+
return {
678+
offset: 0,
679+
power: 1.0,
680+
inputRange: 2000,
681+
outputRange: 1.0,
682+
};
683+
default:
684+
return getCurveForMinMaxFields(fieldName);
685+
}
686+
case 'GPS_RESCUE_THROTTLE_PID':
687+
switch (fieldName) {
688+
case 'debug[0]': // Throttle P uS added
689+
case 'debug[1]': // Throttle D uS added
690+
return {
691+
offset: 0,
692+
power: 1.0,
693+
inputRange: 200,
694+
outputRange: 1.0,
695+
};
696+
case 'debug[2]': // Altitude
697+
case 'debug[3]': // Target Altitude
698+
return {
699+
offset: 0,
700+
power: 1.0,
701+
inputRange: 5000,
702+
outputRange: 1.0,
703+
};
704+
default:
705+
return getCurveForMinMaxFields(fieldName);
706+
}
638707
case 'DYN_IDLE':
639708
switch (fieldName) {
640709
case 'debug[0]': // in 4.3 is dyn idle P
@@ -771,27 +840,6 @@ GraphConfig.load = function(config) {
771840
default:
772841
return getCurveForMinMaxFields(fieldName);
773842
}
774-
case 'GPS_RESCUE_THROTTLE_PID':
775-
switch (fieldName) {
776-
case 'debug[0]': // Throttle P uS added
777-
case 'debug[1]': // Throttle D uS added
778-
return {
779-
offset: 0,
780-
power: 1.0,
781-
inputRange: 200,
782-
outputRange: 1.0,
783-
};
784-
case 'debug[2]': // Altitude
785-
case 'debug[3]': // Target Altitude
786-
return {
787-
offset: 0,
788-
power: 1.0,
789-
inputRange: 5000,
790-
outputRange: 1.0,
791-
};
792-
default:
793-
return getCurveForMinMaxFields(fieldName);
794-
}
795843
case 'GPS_RESCUE_VELOCITY':
796844
switch (fieldName) {
797845
case 'debug[0]': // Pitch P deg * 100
@@ -948,54 +996,6 @@ GraphConfig.load = function(config) {
948996
default:
949997
return getCurveForMinMaxFields(fieldName);
950998
}
951-
case 'ALTITUDE':
952-
switch (fieldName) {
953-
case 'debug[0]': // GPS Trust
954-
return {
955-
offset: 0,
956-
power: 1.0,
957-
inputRange: 200,
958-
outputRange: 1.0,
959-
};
960-
case 'debug[1]': // Baro Alt
961-
case 'debug[2]': // GPS Alt
962-
return {
963-
offset: 0,
964-
power: 1.0,
965-
inputRange: 5000,
966-
outputRange: 1.0,
967-
};
968-
case 'debug[3]': // Vario
969-
return {
970-
offset: 0,
971-
power: 1.0,
972-
inputRange: 500,
973-
outputRange: 1.0,
974-
};
975-
default:
976-
return getCurveForMinMaxFields(fieldName);
977-
}
978-
case 'BARO':
979-
switch (fieldName) {
980-
case 'debug[0]': // Baro state 0-10
981-
return {
982-
offset: 0,
983-
power: 1.0,
984-
inputRange: 20,
985-
outputRange: 1.0,
986-
};
987-
case 'debug[1]': // Baro Temp
988-
case 'debug[2]': // Baro Raw
989-
case 'debug[3]': // Baro smoothed
990-
return {
991-
offset: 0,
992-
power: 1.0,
993-
inputRange: 2000,
994-
outputRange: 1.0,
995-
};
996-
default:
997-
return getCurveForMinMaxFields(fieldName);
998-
}
999999
case 'GPS_DOP':
10001000
switch (fieldName) {
10011001
case 'debug[0]': // Number of Satellites (now this is in normal GPS data, maybe gpsTrust?)

0 commit comments

Comments
 (0)