diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-01 16:30:21 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-01 16:30:21 +0100 |
| commit | 126e6ac2073ffb96c3867e7cbdd4e51e8408d0ec (patch) | |
| tree | 277f05a93bea57ada888302829f716dc46dd92ef /apps/px4io/comms.c | |
| parent | 2bfb6727912e804325e5a512c9c09d36e8fe06d3 (diff) | |
| download | px4-firmware-126e6ac2073ffb96c3867e7cbdd4e51e8408d0ec.tar.gz px4-firmware-126e6ac2073ffb96c3867e7cbdd4e51e8408d0ec.tar.bz2 px4-firmware-126e6ac2073ffb96c3867e7cbdd4e51e8408d0ec.zip | |
Enabled manual override switch, work in progress. Added initial demix testing code to support delta mixing on the remote for convenient manual override
Diffstat (limited to 'apps/px4io/comms.c')
| -rw-r--r-- | apps/px4io/comms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/px4io/comms.c b/apps/px4io/comms.c index 40ea38cf7..f4eddbdd3 100644 --- a/apps/px4io/comms.c +++ b/apps/px4io/comms.c @@ -177,13 +177,13 @@ comms_handle_command(const void *buffer, size_t length) for (unsigned i = 0; i < PX4IO_OUTPUT_CHANNELS; i++) system_state.fmu_channel_data[i] = cmd->servo_command[i]; - /* if the IO is armed and the FMU gets disarmed, the IO must also disarm */ + /* if the IO is armed and FMU gets disarmed, IO must also disarm */ if(system_state.arm_ok && !cmd->arm_ok) { system_state.armed = false; } system_state.arm_ok = cmd->arm_ok; - system_state.mixer_use_fmu = true; + system_state.mixer_fmu_available = true; system_state.fmu_data_received = true; |