Skip to content

Commit e5cbc5f

Browse files
authored
Merge pull request #35 from iNavFlight/dzikuvx-update-flight-flags
Update flight and failsafe flags
2 parents 79259a2 + 7b7d5f3 commit e5cbc5f

File tree

2 files changed

+52
-24
lines changed

2 files changed

+52
-24
lines changed

js/flightlog_fielddefs.js

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,27 @@ var
220220
"GPS_FIX",
221221
"CALIBRATE_MAG",
222222
"SMALL_ANGLE",
223-
"FIXED_WING",
223+
"FIXED_WING", // set when in flying_wing or airplane mode. currently used by althold selection code
224224
"ANTI_WINDUP",
225-
"PID_ATTENUATE",
226-
"FLAPERON_AVAILABLE"
225+
"FLAPERON_AVAILABLE",
226+
"NAV_MOTOR_STOP_OR_IDLE", // navigation requests MOTOR_STOP or motor idle regardless of throttle stick, will only activate if MOTOR_STOP feature is available
227+
"COMPASS_CALIBRATED",
228+
"ACCELEROMETER_CALIBRATED",
229+
"PWM_DRIVER_AVAILABLE",
230+
"NAV_CRUISE_BRAKING",
231+
"NAV_CRUISE_BRAKING_BOOST",
232+
"NAV_CRUISE_BRAKING_LOCKED",
233+
"NAV_EXTRA_ARMING_SAFETY_BYPASSED", // nav_extra_arming_safey was bypassed. Keep it until power cycle.
234+
"AIRMODE_ACTIVE"
227235
]),
228236

229237
FLIGHT_LOG_FAILSAFE_PHASE_NAME = makeReadOnly([
230-
"IDLE",
231-
"RX_LOSS_DETECTED",
232-
"LANDING",
233-
"LANDED"
238+
"FAILSAFE_IDLE",
239+
"FAILSAFE_RX_LOSS_DETECTED",
240+
"FAILSAFE_RX_LOSS_IDLE",
241+
"FAILSAFE_RETURN_TO_HOME",
242+
"FAILSAFE_LANDING",
243+
"FAILSAFE_LANDED",
244+
"FAILSAFE_RX_LOSS_MONITORING",
245+
"FAILSAFE_RX_LOSS_RECOVERED"
234246
]);

package-lock.json

Lines changed: 33 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)