diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-05 19:55:33 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-05 19:55:33 +0100 |
| commit | 1ebb3b4ada6bdf2109f3e6bb45800f0459b35ccc (patch) | |
| tree | d0ac45b615ef77168dd802799aa0c4262ae15e07 /apps/px4io/px4io.h | |
| parent | 126e6ac2073ffb96c3867e7cbdd4e51e8408d0ec (diff) | |
| parent | fd771f67f2a2392d5ba2b7dd74100338859af6d7 (diff) | |
| download | px4-firmware-1ebb3b4ada6bdf2109f3e6bb45800f0459b35ccc.tar.gz px4-firmware-1ebb3b4ada6bdf2109f3e6bb45800f0459b35ccc.tar.bz2 px4-firmware-1ebb3b4ada6bdf2109f3e6bb45800f0459b35ccc.zip | |
Merged DSM fixes
Diffstat (limited to 'apps/px4io/px4io.h')
| -rw-r--r-- | apps/px4io/px4io.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/apps/px4io/px4io.h b/apps/px4io/px4io.h index 9bfe3b1e4..e0b7cdda1 100644 --- a/apps/px4io/px4io.h +++ b/apps/px4io/px4io.h @@ -69,17 +69,13 @@ struct sys_state_s { - bool armed; /* IO armed */ - bool arm_ok; /* FMU says OK to arm */ - - bool ppm_input_ok; /* valid PPM input data */ - bool dsm_input_ok; /* valid Spektrum DSM data */ - bool sbus_input_ok; /* valid Futaba S.Bus data */ + bool armed; /* IO armed */ + bool arm_ok; /* FMU says OK to arm */ /** * Data from the remote control input(s) */ - int rc_channels; + unsigned rc_channels; uint16_t rc_channel_data[PX4IO_INPUT_CHANNELS]; uint64_t rc_channels_timestamp; @@ -184,9 +180,9 @@ extern void comms_main(void) __attribute__((noreturn)); */ extern void controls_main(void); extern int dsm_init(const char *device); -extern void dsm_input(void); +extern bool dsm_input(void); extern int sbus_init(const char *device); -extern void sbus_input(void); +extern bool sbus_input(void); /* * Assertion codes |