Skip to content

Commit fb4ac6a

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

File tree

1 file changed

+1
-64
lines changed

1 file changed

+1
-64
lines changed

js/flightlog_fields_presenter.js

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -242,27 +242,6 @@ function FlightLogFieldPresenter() {
242242
'debug[2]':'GPS Altitude',
243243
'debug[3]':'Vario',
244244
},
245-
'FFT' : {
246-
'debug[all]':'Debug FFT',
247-
'debug[0]':'Gyro Scaled [dbg-axis]',
248-
'debug[1]':'Gyro Pre-Dyn [dbg-axis]',
249-
'debug[2]':'Gyro Downsampled [roll]',
250-
'debug[3]':'FFT Center Index [roll]',
251-
},
252-
'FFT_TIME' : {
253-
'debug[all]':'Debug FFT TIME',
254-
'debug[0]':'Active calc step',
255-
'debug[1]':'Step duration',
256-
'debug[2]':'Additional steps',
257-
'debug[3]':'Not used',
258-
},
259-
'FFT_FREQ' : {
260-
'debug[all]':'Debug FFT FREQ',
261-
'debug[0]':'Center Freq [roll]',
262-
'debug[1]':'Center Freq [pitch]',
263-
'debug[2]':'Gyro Pre-Dyn [dbg-axis]',
264-
'debug[3]':'Gyro Scaled [dbg-axis]',
265-
},
266245
'RX_FRSKY_SPI' : {
267246
'debug[all]':'FrSky SPI Rx',
268247
'debug[0]':'Looptime',
@@ -396,13 +375,6 @@ function FlightLogFieldPresenter() {
396375
'debug[2]':'Frequency',
397376
'debug[3]':'Power',
398377
},
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-
},
406378
'ITERM_RELAX' : {
407379
'debug[all]':'I-term Relax',
408380
'debug[0]':'Setpoint HPF [roll]',
@@ -529,34 +501,6 @@ function FlightLogFieldPresenter() {
529501
'debug[2]':'Baro Pressure',
530502
'debug[3]':'Baro Pressure Sum',
531503
},
532-
'GPS_RESCUE_THROTTLE_PID' : {
533-
'debug[all]':'GPS Rescue Throttle PID',
534-
'debug[0]':'Throttle P',
535-
'debug[1]':'Throttle I',
536-
'debug[2]':'Throttle D',
537-
'debug[3]':'Z Velocity',
538-
},
539-
'DYN_IDLE' : {
540-
'debug[all]':'Dyn Idle',
541-
'debug[0]':'Motor Range Min Inc',
542-
'debug[1]':'Target RPS Change Rate',
543-
'debug[2]':'Error',
544-
'debug[3]':'Min RPM',
545-
},
546-
'FF_LIMIT' : {
547-
'debug[all]':'FF Limit',
548-
'debug[0]':'FF input [roll]',
549-
'debug[1]':'FF input [pitch]',
550-
'debug[2]':'FF limited [roll]',
551-
'debug[3]':'Not Used',
552-
},
553-
'FF_INTERPOLATED' : {
554-
'debug[all]':'FF Interpolated [roll]',
555-
'debug[0]':'Setpoint Delta Impl [roll]',
556-
'debug[1]':'Boost amount [roll]',
557-
'debug[2]':'Boost amount, clipped [roll]',
558-
'debug[3]':'Clip amount [roll]',
559-
},
560504
'BLACKBOX_OUTPUT' : {
561505
'debug[all]':'Blackbox Output',
562506
'debug[0]':'Blackbox Rate',
@@ -758,13 +702,6 @@ function FlightLogFieldPresenter() {
758702
'debug[2]':'Acceleration, clipped [roll]',
759703
'debug[3]':'Duplicate Counter [roll]',
760704
};
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-
};
768705
} else if (semver.gte(firmwareVersion, '4.1.0')) {
769706
DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = {
770707
'debug[all]':'Feedforward [roll]',
@@ -981,7 +918,7 @@ function FlightLogFieldPresenter() {
981918
}
982919
};
983920

984-
FlightLogFieldPresenter.decodeDebugFieldToFriendly = function(flightLog, fieldName, value, currentFlightMode) {
921+
FlightLogFieldPresenter.decodeDebugFieldToFriendly = function(flightLog, fieldName, value) {
985922
if (flightLog) {
986923
const debugModeName = DEBUG_MODE[flightLog.getSysConfig().debug_mode]; // convert to recognisable name
987924
switch (debugModeName) {

0 commit comments

Comments
 (0)