diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-30 12:05:38 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-30 12:05:38 +0100 |
| commit | 234af06571fb69d0e91a9e72b16c33fd8f930227 (patch) | |
| tree | d23e59d3baacf91248a2295f5fc936c6874d9e9a /apps/px4io | |
| parent | 1da1b8f49c8ba626e6459eb87efa0f8addad4f76 (diff) | |
| download | px4-firmware-234af06571fb69d0e91a9e72b16c33fd8f930227.tar.gz px4-firmware-234af06571fb69d0e91a9e72b16c33fd8f930227.tar.bz2 px4-firmware-234af06571fb69d0e91a9e72b16c33fd8f930227.zip | |
Fixed merge error
Diffstat (limited to 'apps/px4io')
| -rw-r--r-- | apps/px4io/protocol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/px4io/protocol.h b/apps/px4io/protocol.h index c53b94eb0..3a049bb29 100644 --- a/apps/px4io/protocol.h +++ b/apps/px4io/protocol.h @@ -54,7 +54,6 @@ struct px4io_command { uint16_t f2i_magic; #define F2I_MAGIC 0x636d - uint16_t servo_command[PX4IO_OUTPUT_CHANNELS]; /**< servo output channels */ uint16_t servo_rate; uint16_t output_control[PX4IO_CONTROL_CHANNELS]; /**< PWM output rate in Hz */ bool relay_state[PX4IO_RELAY_CHANNELS]; /**< relay states as requested by FMU */ |