Fix up FMU input timeout handling.

Fix the FMU auto OK LED status.
Strip out unused fields from the system state structure.

1 files changed, 0 insertions, 91 deletions

diff --git a/apps/px4io/px4io.h b/apps/px4io/px4io.h
index 2e2c50a3a..d8cdafb4b 100644
--- a/apps/px4io/px4io.h
+++ b/apps/px4io/px4io.h
@@ -101,107 +101,16 @@ extern uint16_t			r_page_rc_input_config[]; /* PX4IO_PAGE_RC_INPUT_CONFIG */
 
 /*
  * System state structure.
- *
- * XXX note that many fields here are deprecated and replaced by 
- *     registers.
  */
 struct sys_state_s {
 
-//	bool		armed;			/* IO armed */
-//	bool		arm_ok;			/* FMU says OK to arm */
-//	uint16_t	servo_rate;		/* output rate of servos in Hz */
-
-	/**
-	 * Remote control input(s) channel mappings
-	 */
-	uint8_t		rc_map[4];
-
-	/**
-	 * Remote control channel attributes
-	 */
-	uint16_t	rc_min[4];
-	uint16_t	rc_trim[4];
-	uint16_t	rc_max[4];
-	int16_t		rc_rev[4];
-	uint16_t	rc_dz[4];
-
-	/**
-	 * Data from the remote control input(s)
-	 */
-//	unsigned	rc_channels;
-//	uint16_t	rc_channel_data[PX4IO_INPUT_CHANNELS];
 	uint64_t	rc_channels_timestamp;
 
 	/**
-	 * Control signals from FMU.
-	 */
-//	uint16_t	fmu_channel_data[PX4IO_CONTROL_CHANNELS];
-
-	/**
-	 * Mixed servo outputs
-	 */
-//	uint16_t	servos[IO_SERVO_COUNT];
-
-	/**
-	 * Relay controls
-	 */
-//	bool		relays[PX4IO_RELAY_CHANNELS];
-
-	/**
-	 * If true, we are using the FMU controls, else RC input if available.
-	 */
-//	bool		mixer_manual_override;
-
-	/**
-	 * If true, FMU input is available.
-	 */
-//	bool		mixer_fmu_available;
-
-	/**
-	 * If true, state that should be reported to FMU has been updated.
-	 */
-//	bool		fmu_report_due;
-
-	/**
 	 * Last FMU receive time, in microseconds since system boot
 	 */
 	uint64_t	fmu_data_received_time;
 
-	/**
-	 * If true, the RC signal has been lost for more than a timeout interval
-	 */
-//	bool		rc_lost;
-
-	/**
-	 * If true, the connection to FMU has been lost for more than a timeout interval
-	 */
-//	bool		fmu_lost;
-
-	/**
-	 * If true, FMU is ready for autonomous position control. Only used for LED indication
-	 */
-	bool vector_flight_mode_ok;
-
-	/**
-	 * If true, IO performs an on-board manual override with the RC channel values
-	 */
-//	bool manual_override_ok;
-
-	/*
-	 * Measured battery voltage in mV
-	 */
-//	uint16_t	battery_mv;
-
-	/*
-	 * ADC IN5 measurement
-	 */
-//	uint16_t	adc_in5;
-
-	/*
-	 * Power supply overcurrent status bits.
-	 */
-//	uint8_t		overcurrent;
-
 };
 
 extern struct sys_state_s system_state;