Skip to content

Commit 3d6db28

Browse files
authored
Fix order (#702)
1 parent fb92627 commit 3d6db28

File tree

1 file changed

+46
-40
lines changed

1 file changed

+46
-40
lines changed

js/flightlog_fields_presenter.js

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,41 +1124,46 @@ function FlightLogFieldPresenter() {
11241124

11251125
if (firmwareType === FIRMWARE_TYPE_BETAFLIGHT) {
11261126

1127-
if (semver.gte(firmwareVersion, '4.4.0')) {
1128-
DEBUG_FRIENDLY_FIELD_NAMES.BARO = {
1129-
'debug[all]':'Debug Barometer',
1130-
'debug[0]':'Baro State',
1131-
'debug[1]':'Baro Pressure',
1132-
'debug[2]':'Baro Temperature',
1133-
'debug[3]':'Baro Altitude',
1127+
if (semver.gte(firmwareVersion, '4.1.0')) {
1128+
DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = {
1129+
'debug[all]':'Feedforward [roll]',
1130+
'debug[0]':'Setpoint Delta [roll]',
1131+
'debug[1]':'Boost [roll]',
1132+
'debug[2]':'Boost, clipped [roll]',
1133+
'debug[3]':'Duplicate Counter [roll]',
11341134
'debug[4]':'Not Used',
11351135
'debug[5]':'Not Used',
11361136
'debug[6]':'Not Used',
11371137
'debug[7]':'Not Used',
11381138
};
1139-
DEBUG_FRIENDLY_FIELD_NAMES.RTH = {
1140-
'debug[all]':'RTH Rescue codes',
1141-
'debug[0]':'Pitch angle, deg',
1142-
'debug[1]':'Rescue Phase',
1143-
'debug[2]':'Failure code',
1144-
'debug[3]':'Failure timers',
1139+
DEBUG_FRIENDLY_FIELD_NAMES.FF_LIMIT = {
1140+
'debug[all]':'Feedforward Limit [roll]',
1141+
'debug[0]':'FF limit input [roll]',
1142+
'debug[1]':'FF limit input [pitch]',
1143+
'debug[2]':'FF limited [roll]',
1144+
'debug[3]':'Not Used',
11451145
'debug[4]':'Not Used',
11461146
'debug[5]':'Not Used',
11471147
'debug[6]':'Not Used',
11481148
'debug[7]':'Not Used',
11491149
};
1150-
DEBUG_FRIENDLY_FIELD_NAMES.GPS_RESCUE_THROTTLE_PID = {
1151-
'debug[all]':'GPS Rescue throttle PIDs',
1152-
'debug[0]':'Throttle P',
1153-
'debug[1]':'Throttle D',
1154-
'debug[2]':'Altitude',
1155-
'debug[3]':'Target altitude',
1150+
}
1151+
1152+
if (semver.gte(firmwareVersion, '4.2.0')) {
1153+
DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = {
1154+
'debug[all]':'Feedforward [roll]',
1155+
'debug[0]':'Setpoint Delta [roll]',
1156+
'debug[1]':'Acceleration [roll]',
1157+
'debug[2]':'Acceleration, clipped [roll]',
1158+
'debug[3]':'Duplicate Counter [roll]',
11561159
'debug[4]':'Not Used',
11571160
'debug[5]':'Not Used',
11581161
'debug[6]':'Not Used',
11591162
'debug[7]':'Not Used',
11601163
};
1161-
} else if (semver.gte(firmwareVersion, '4.3.0')) {
1164+
}
1165+
1166+
if (semver.gte(firmwareVersion, '4.3.0')) {
11621167
DEBUG_FRIENDLY_FIELD_NAMES.FEEDFORWARD = {
11631168
'debug[all]':'Feedforward [roll]',
11641169
'debug[0]':'Setpoint, un-smoothed [roll]',
@@ -1236,36 +1241,37 @@ function FlightLogFieldPresenter() {
12361241
'debug[6]':'Not Used',
12371242
'debug[7]':'Not Used',
12381243
};
1239-
} else if (semver.gte(firmwareVersion, '4.2.0')) {
1240-
DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = {
1241-
'debug[all]':'Feedforward [roll]',
1242-
'debug[0]':'Setpoint Delta [roll]',
1243-
'debug[1]':'Acceleration [roll]',
1244-
'debug[2]':'Acceleration, clipped [roll]',
1245-
'debug[3]':'Duplicate Counter [roll]',
1244+
}
1245+
1246+
if (semver.gte(firmwareVersion, '4.4.0')) {
1247+
DEBUG_FRIENDLY_FIELD_NAMES.BARO = {
1248+
'debug[all]':'Debug Barometer',
1249+
'debug[0]':'Baro State',
1250+
'debug[1]':'Baro Pressure',
1251+
'debug[2]':'Baro Temperature',
1252+
'debug[3]':'Baro Altitude',
12461253
'debug[4]':'Not Used',
12471254
'debug[5]':'Not Used',
12481255
'debug[6]':'Not Used',
12491256
'debug[7]':'Not Used',
12501257
};
1251-
} else if (semver.gte(firmwareVersion, '4.1.0')) {
1252-
DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = {
1253-
'debug[all]':'Feedforward [roll]',
1254-
'debug[0]':'Setpoint Delta [roll]',
1255-
'debug[1]':'Boost [roll]',
1256-
'debug[2]':'Boost, clipped [roll]',
1257-
'debug[3]':'Duplicate Counter [roll]',
1258+
DEBUG_FRIENDLY_FIELD_NAMES.RTH = {
1259+
'debug[all]':'RTH Rescue codes',
1260+
'debug[0]':'Pitch angle, deg',
1261+
'debug[1]':'Rescue Phase',
1262+
'debug[2]':'Failure code',
1263+
'debug[3]':'Failure timers',
12581264
'debug[4]':'Not Used',
12591265
'debug[5]':'Not Used',
12601266
'debug[6]':'Not Used',
12611267
'debug[7]':'Not Used',
12621268
};
1263-
DEBUG_FRIENDLY_FIELD_NAMES.FF_LIMIT = {
1264-
'debug[all]':'Feedforward Limit [roll]',
1265-
'debug[0]':'FF limit input [roll]',
1266-
'debug[1]':'FF limit input [pitch]',
1267-
'debug[2]':'FF limited [roll]',
1268-
'debug[3]':'Not Used',
1269+
DEBUG_FRIENDLY_FIELD_NAMES.GPS_RESCUE_THROTTLE_PID = {
1270+
'debug[all]':'GPS Rescue throttle PIDs',
1271+
'debug[0]':'Throttle P',
1272+
'debug[1]':'Throttle D',
1273+
'debug[2]':'Altitude',
1274+
'debug[3]':'Target altitude',
12691275
'debug[4]':'Not Used',
12701276
'debug[5]':'Not Used',
12711277
'debug[6]':'Not Used',

0 commit comments

Comments
 (0)