diff options
| author | mazahner <mazahner@student.ethz.ch> | 2014-11-10 17:39:04 +0100 |
|---|---|---|
| committer | mazahner <mazahner@student.ethz.ch> | 2014-11-10 17:39:04 +0100 |
| commit | 6ec08335459457c82158d2df06050bd30fb8cc59 (patch) | |
| tree | 3d5407b6bc88533eacedb3bebfc9e0c9b23609ea /src/modules/px4iofirmware/px4io.h | |
| parent | d15203de91cc07530809060f949374bb8918daea (diff) | |
| parent | 4e8e6e653beb21808f532b83c6c6e827103ea379 (diff) | |
| download | px4-firmware-6ec08335459457c82158d2df06050bd30fb8cc59.tar.gz px4-firmware-6ec08335459457c82158d2df06050bd30fb8cc59.tar.bz2 px4-firmware-6ec08335459457c82158d2df06050bd30fb8cc59.zip | |
Merge branch 'master' of https://github.com/mazahner/Firmware
Diffstat (limited to 'src/modules/px4iofirmware/px4io.h')
| -rw-r--r-- | src/modules/px4iofirmware/px4io.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/px4io.h b/src/modules/px4iofirmware/px4io.h index b00a96717..8186e4c78 100644 --- a/src/modules/px4iofirmware/px4io.h +++ b/src/modules/px4iofirmware/px4io.h @@ -140,6 +140,7 @@ extern pwm_limit_t pwm_limit; #define LED_BLUE(_s) stm32_gpiowrite(GPIO_LED1, !(_s)) #define LED_AMBER(_s) stm32_gpiowrite(GPIO_LED2, !(_s)) #define LED_SAFETY(_s) stm32_gpiowrite(GPIO_LED3, !(_s)) +#define LED_RING(_s) stm32_gpiowrite(GPIO_LED4, !(_s)) #ifdef CONFIG_ARCH_BOARD_PX4IO_V1 @@ -215,7 +216,7 @@ extern uint16_t adc_measure(unsigned channel); 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 bool dsm_input(uint16_t *values, uint16_t *num_values, uint8_t *n_bytes, uint8_t **bytes); 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, bool *sbus_failsafe, bool *sbus_frame_drop, uint16_t max_channels); |