Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup

This commit is contained in:
px4dev
2013-07-14 13:04:44 -07:00
35 changed files with 1379 additions and 736 deletions
+1
View File
@@ -200,6 +200,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 int sbus_init(const char *device);
extern bool sbus_input(uint16_t *values, uint16_t *num_values);