aboutsummaryrefslogtreecommitdiff
path: root/apps/px4io/px4io.h
diff options
context:
space:
mode:
authorJulian Oes <joes@student.ethz.ch>2012-11-07 10:24:49 -0800
committerJulian Oes <joes@student.ethz.ch>2012-11-07 10:24:49 -0800
commit9f92c6df67f3cdde2504c7c2b8357b7a0871fe63 (patch)
treefe09c55a63a18305a8fe72da2a4f4eea8c4c8529 /apps/px4io/px4io.h
parent74f76006029ad6b209c1a409e8e35044b1c53bbb (diff)
parentff3a014971f83f15f4884e584a2f58ee979f23ee (diff)
downloadpx4-firmware-9f92c6df67f3cdde2504c7c2b8357b7a0871fe63.tar.gz
px4-firmware-9f92c6df67f3cdde2504c7c2b8357b7a0871fe63.tar.bz2
px4-firmware-9f92c6df67f3cdde2504c7c2b8357b7a0871fe63.zip
Merge branch 'master' of https://github.com/PX4/Firmware
Diffstat (limited to 'apps/px4io/px4io.h')
-rw-r--r--apps/px4io/px4io.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/px4io/px4io.h b/apps/px4io/px4io.h
index 8eb0c53b2..f50e29252 100644
--- a/apps/px4io/px4io.h
+++ b/apps/px4io/px4io.h
@@ -147,7 +147,6 @@ extern volatile int timers[TIMER_NUM_TIMERS];
* Mixer
*/
extern int mixer_init(void);
-extern void mixer_set_serial_mode(uint8_t newmode);
/*
* Safety switch/LED.
@@ -161,6 +160,14 @@ extern void comms_init(void);
extern void comms_check(void);
/*
+ * Serial receiver decoders.
+ */
+extern void dsm_init(unsigned mode);
+extern void dsm_input(int fd);
+extern void sbus_init(unsigned mode);
+extern void sbus_input(int fd);
+
+/*
* Assertion codes
*/
#define A_GPIO_OPEN_FAIL 100