diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-12 09:13:51 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-12 09:13:51 +0100 |
| commit | ef301890bae6cb63980931d731ac10af72a00bb4 (patch) | |
| tree | d17ed5032e244b9c1fd2f9775a87903f26f190fc | |
| parent | 4b2e8556b880775fc7ab669e532b8a75c1ef620c (diff) | |
| parent | aa16a63a10bb43d8614f01915cdf33996fe0d0e4 (diff) | |
| download | px4-firmware-ef301890bae6cb63980931d731ac10af72a00bb4.tar.gz px4-firmware-ef301890bae6cb63980931d731ac10af72a00bb4.tar.bz2 px4-firmware-ef301890bae6cb63980931d731ac10af72a00bb4.zip | |
Merge branch 'px4io-i2c' of github.com:PX4/Firmware into px4io-i2c
| -rw-r--r-- | apps/drivers/boards/px4io/px4io_internal.h | 4 | ||||
| -rw-r--r-- | apps/px4io/i2c.c | 2 | ||||
| -rw-r--r-- | apps/px4io/registers.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/drivers/boards/px4io/px4io_internal.h b/apps/drivers/boards/px4io/px4io_internal.h index f77d237a7..44bb98513 100644 --- a/apps/drivers/boards/px4io/px4io_internal.h +++ b/apps/drivers/boards/px4io/px4io_internal.h @@ -74,8 +74,8 @@ #define GPIO_ACC_OC_DETECT (GPIO_INPUT|GPIO_CNF_INPULLUP|GPIO_MODE_INPUT|GPIO_PORTB|GPIO_PIN12) #define GPIO_SERVO_OC_DETECT (GPIO_INPUT|GPIO_CNF_INPULLUP|GPIO_MODE_INPUT|GPIO_PORTB|GPIO_PIN13) -#define GPIO_RELAY1_EN (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN13) -#define GPIO_RELAY2_EN (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN12) +#define GPIO_RELAY1_EN (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN12) +#define GPIO_RELAY2_EN (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN11) /* Analog inputs ********************************************************************/ diff --git a/apps/px4io/i2c.c b/apps/px4io/i2c.c index 2b8c502c7..93dfd21dd 100644 --- a/apps/px4io/i2c.c +++ b/apps/px4io/i2c.c @@ -174,7 +174,7 @@ i2c_interrupt(int irq, FAR void *context) i2c_rx_complete(); break; default: - /* spurious stop, ignore */ + /* not currently transferring - must be a new txn */ break; } direction = DIR_NONE; diff --git a/apps/px4io/registers.c b/apps/px4io/registers.c index c60491f93..3824c64b0 100644 --- a/apps/px4io/registers.c +++ b/apps/px4io/registers.c @@ -370,7 +370,7 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) /* assert min..center..max ordering */ if (conf[PX4IO_P_RC_CONFIG_MIN] < 500) break; - if (conf[PX4IO_P_RC_CONFIG_MAX] < 2500) + if (conf[PX4IO_P_RC_CONFIG_MAX] > 2500) break; if (conf[PX4IO_P_RC_CONFIG_CENTER] < conf[PX4IO_P_RC_CONFIG_MIN]) break; |