diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-30 10:42:36 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-30 10:42:36 +0100 |
| commit | 31c5425e5006802751ed24ef97e140dea53d3883 (patch) | |
| tree | 5e2470db1ac8fc5601a51784fd350f462f46fbc6 /apps/px4io/px4io.h | |
| parent | d16d66f990664481cb8ef6dddd038c575fe16380 (diff) | |
| parent | c961dd8bab38c1a8570eaf02b912353641e45df3 (diff) | |
| download | px4-firmware-31c5425e5006802751ed24ef97e140dea53d3883.tar.gz px4-firmware-31c5425e5006802751ed24ef97e140dea53d3883.tar.bz2 px4-firmware-31c5425e5006802751ed24ef97e140dea53d3883.zip | |
Merge remote-tracking branch 'origin/#61-px4io-spektrum-decoder' into sbus
Diffstat (limited to 'apps/px4io/px4io.h')
| -rw-r--r-- | apps/px4io/px4io.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/apps/px4io/px4io.h b/apps/px4io/px4io.h index 0a3a4448c..2ecab966d 100644 --- a/apps/px4io/px4io.h +++ b/apps/px4io/px4io.h @@ -147,7 +147,7 @@ extern volatile int timers[TIMER_NUM_TIMERS]; /* * Mixer */ -extern int mixer_init(void); +extern void mixer_tick(void); /* * Safety switch/LED. @@ -158,15 +158,16 @@ extern void safety_init(void); * FMU communications */ extern void comms_init(void); -extern void comms_check(void); +extern void comms_main(void) __attribute__((noreturn)); /* - * Serial receiver decoders. + * R/C receiver handling. */ -extern void dsm_init(unsigned mode); -extern void dsm_input(int fd); -extern void sbus_init(unsigned mode); -extern void sbus_input(int fd); +extern void controls_main(void); +extern int dsm_init(const char *device); +extern void dsm_input(void); +extern int sbus_init(const char *device); +extern void sbus_input(void); /* * Assertion codes |