diff options
| author | px4dev <px4@purgatory.org> | 2014-07-06 11:24:39 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2014-07-06 11:24:39 -0700 |
| commit | d2a2297a14bf2f4dbb71a6ed20c76617e93b14a2 (patch) | |
| tree | e695cc1d2dd8ffb751f49df32615ea1fcb9d7de3 /src | |
| parent | bd88951f6ce609bc5ba364bfa3d19ae61e444964 (diff) | |
| download | px4-firmware-d2a2297a14bf2f4dbb71a6ed20c76617e93b14a2.tar.gz px4-firmware-d2a2297a14bf2f4dbb71a6ed20c76617e93b14a2.tar.bz2 px4-firmware-d2a2297a14bf2f4dbb71a6ed20c76617e93b14a2.zip | |
Fixes #1130
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/px4iofirmware/i2c.c | 3 | ||||
| -rw-r--r-- | src/modules/px4iofirmware/px4io.h | 4 | ||||
| -rw-r--r-- | src/modules/px4iofirmware/registers.c | 2 | ||||
| -rw-r--r-- | src/modules/px4iofirmware/sbus.c | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/modules/px4iofirmware/i2c.c b/src/modules/px4iofirmware/i2c.c index 76762c0fc..6d1d1fc2d 100644 --- a/src/modules/px4iofirmware/i2c.c +++ b/src/modules/px4iofirmware/i2c.c @@ -64,12 +64,15 @@ #define rCCR REG(STM32_I2C_CCR_OFFSET) #define rTRISE REG(STM32_I2C_TRISE_OFFSET) +void i2c_reset(void); static int i2c_interrupt(int irq, void *context); static void i2c_rx_setup(void); static void i2c_tx_setup(void); static void i2c_rx_complete(void); static void i2c_tx_complete(void); +#ifdef DEBUG static void i2c_dump(void); +#endif static DMA_HANDLE rx_dma; static DMA_HANDLE tx_dma; diff --git a/src/modules/px4iofirmware/px4io.h b/src/modules/px4iofirmware/px4io.h index ca175bfbc..b00a96717 100644 --- a/src/modules/px4iofirmware/px4io.h +++ b/src/modules/px4iofirmware/px4io.h @@ -219,8 +219,8 @@ 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, bool *sbus_failsafe, bool *sbus_frame_drop, uint16_t max_channels); -extern bool sbus1_output(uint16_t *values, uint16_t num_values); -extern bool sbus2_output(uint16_t *values, uint16_t num_values); +extern void sbus1_output(uint16_t *values, uint16_t num_values); +extern void sbus2_output(uint16_t *values, uint16_t num_values); /** global debug level for isr_debug() */ extern volatile uint8_t debug_level; diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 50108ea1b..b37259997 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -711,7 +711,7 @@ registers_get(uint8_t page, uint8_t offset, uint16_t **values, unsigned *num_val { #define SELECT_PAGE(_page_name) \ do { \ - *values = &_page_name[0]; \ + *values = (uint16_t *)&_page_name[0]; \ *num_values = sizeof(_page_name) / sizeof(_page_name[0]); \ } while(0) diff --git a/src/modules/px4iofirmware/sbus.c b/src/modules/px4iofirmware/sbus.c index 70ccab180..0f0414148 100644 --- a/src/modules/px4iofirmware/sbus.c +++ b/src/modules/px4iofirmware/sbus.c @@ -116,14 +116,14 @@ sbus_init(const char *device) return sbus_fd; } -bool +void sbus1_output(uint16_t *values, uint16_t num_values) { char a = 'A'; write(sbus_fd, &a, 1); } -bool +void sbus2_output(uint16_t *values, uint16_t num_values) { char b = 'B'; |