Merged master

This commit is contained in:
Lorenz Meier
2013-08-17 20:30:52 +02:00
4 changed files with 330 additions and 225 deletions
+1 -1
View File
@@ -195,7 +195,7 @@ extern void controls_init(void);
extern void controls_tick(void);
extern int dsm_init(const char *device);
extern bool dsm_input(uint16_t *values, uint16_t *num_values);
extern void dsm_bind(uint16_t cmd, int pulses);
extern void dsm_bind(uint16_t cmd, int pulses);
extern int sbus_init(const char *device);
extern bool sbus_input(uint16_t *values, uint16_t *num_values);