From 234af06571fb69d0e91a9e72b16c33fd8f930227 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 30 Dec 2012 12:05:38 +0100 Subject: Fixed merge error --- apps/px4io/protocol.h | 1 - 1 file changed, 1 deletion(-) (limited to 'apps/px4io') 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 */ -- cgit v1.2.3