Skip to content

Commit 5cad4b6

Browse files
committed
Rebasing flightlog field presenter
1 parent 6ad92e3 commit 5cad4b6

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

js/flightlog_fields_presenter.js

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,13 @@ function FlightLogFieldPresenter() {
270270
'debug[2]':'Missing Packets',
271271
'debug[3]':'State',
272272
},
273+
'RTH' : {
274+
'debug[all]':'RTH',
275+
'debug[0]':'Rescue Throttle',
276+
'debug[1]':'Rescue Angle',
277+
'debug[2]':'Altitude Adjustment',
278+
'debug[3]':'Rescue State',
279+
},
273280
'RX_SFHSS_SPI' : {
274281
'debug[all]':'SFHSS SPI Rx',
275282
'debug[0]':'State',
@@ -396,13 +403,6 @@ function FlightLogFieldPresenter() {
396403
'debug[2]':'Frequency',
397404
'debug[3]':'Power',
398405
},
399-
'RTH' : {
400-
'debug[all]':'RTH',
401-
'debug[0]':'Rescue Throttle',
402-
'debug[1]':'Rescue Angle',
403-
'debug[2]':'Altitude Adjustment',
404-
'debug[3]':'Rescue State',
405-
},
406406
'ITERM_RELAX' : {
407407
'debug[all]':'I-term Relax',
408408
'debug[0]':'Setpoint HPF [roll]',
@@ -758,13 +758,6 @@ function FlightLogFieldPresenter() {
758758
'debug[2]':'Acceleration, clipped [roll]',
759759
'debug[3]':'Duplicate Counter [roll]',
760760
};
761-
DEBUG_FRIENDLY_FIELD_NAMES.FF_LIMIT = {
762-
'debug[all]':'Feedforward Limit [roll]',
763-
'debug[0]':'FF limit input [roll]',
764-
'debug[1]':'FF limit input [pitch]',
765-
'debug[2]':'FF limited [roll]',
766-
'debug[3]':'Not Used',
767-
};
768761
} else if (semver.gte(firmwareVersion, '4.1.0')) {
769762
DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = {
770763
'debug[all]':'Feedforward [roll]',
@@ -981,7 +974,7 @@ function FlightLogFieldPresenter() {
981974
}
982975
};
983976

984-
FlightLogFieldPresenter.decodeDebugFieldToFriendly = function(flightLog, fieldName, value, currentFlightMode) {
977+
FlightLogFieldPresenter.decodeDebugFieldToFriendly = function(flightLog, fieldName, value) {
985978
if (flightLog) {
986979
const debugModeName = DEBUG_MODE[flightLog.getSysConfig().debug_mode]; // convert to recognisable name
987980
switch (debugModeName) {

0 commit comments

Comments
 (0)