diff options
| author | px4dev <px4@purgatory.org> | 2013-01-14 01:11:29 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-14 01:11:29 -0800 |
| commit | 5c60ed9a9457e3ab0c51584e7e0db59bdbe4fd87 (patch) | |
| tree | cc3582793d06504470412e076708ef914e50ff8a /apps/px4io/mixer.cpp | |
| parent | 06b66ad065f096060bfdd2e1f18cdc6704c70d2c (diff) | |
| download | px4-firmware-5c60ed9a9457e3ab0c51584e7e0db59bdbe4fd87.tar.gz px4-firmware-5c60ed9a9457e3ab0c51584e7e0db59bdbe4fd87.tar.bz2 px4-firmware-5c60ed9a9457e3ab0c51584e7e0db59bdbe4fd87.zip | |
Fix up FMU input timeout handling.
Fix the FMU auto OK LED status.
Strip out unused fields from the system state structure.
Diffstat (limited to 'apps/px4io/mixer.cpp')
| -rw-r--r-- | apps/px4io/mixer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/px4io/mixer.cpp b/apps/px4io/mixer.cpp index 7ccf915b0..f394233f4 100644 --- a/apps/px4io/mixer.cpp +++ b/apps/px4io/mixer.cpp @@ -66,7 +66,7 @@ extern "C" { #define OVERRIDE 4 /* current servo arm/disarm state */ -bool mixer_servos_armed = false; +static bool mixer_servos_armed = false; /* selected control values and count for mixing */ enum mixer_source { @@ -89,7 +89,7 @@ mixer_tick(void) /* check that we are receiving fresh data from the FMU */ if ((hrt_absolute_time() - system_state.fmu_data_received_time) > FMU_INPUT_DROP_LIMIT_US) { - /* too many frames without FMU input, time to go to failsafe */ + /* too long without FMU input, time to go to failsafe */ r_status_flags |= PX4IO_P_STATUS_FLAGS_OVERRIDE; r_status_flags &= ~PX4IO_P_STATUS_FLAGS_FMU_OK; r_status_alarms |= PX4IO_P_STATUS_ALARMS_FMU_LOST; |