diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-10-13 23:12:18 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-10-13 23:12:18 +0200 |
| commit | 6343a2e844bb41b88a94d05507e4e3ac0b7d0810 (patch) | |
| tree | 11d6fd0d07c3f41cd1f4f197d19b473a3b616f87 | |
| parent | d6b4af4ff6685dfef62ec93042c85286ad29d81f (diff) | |
| download | uGFX-6343a2e844bb41b88a94d05507e4e3ac0b7d0810.tar.gz uGFX-6343a2e844bb41b88a94d05507e4e3ac0b7d0810.tar.bz2 uGFX-6343a2e844bb41b88a94d05507e4e3ac0b7d0810.zip | |
STMPE811 fixes - still not working
| -rw-r--r-- | boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h | 6 | ||||
| -rw-r--r-- | drivers/ginput/touch/STMPE811/stmpe811.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h index ebbe0d5b..f6d0e74c 100644 --- a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h +++ b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h @@ -31,6 +31,9 @@ // If TRUE this is a really slow CPU and we should always clear the FIFO between reads. #define GMOUSE_STMPE811_SLOW_CPU FALSE +// Maximum timeout +#define STMPE811_TIMEOUT 0x3000 + static const I2CConfig i2ccfg = { OPMODE_I2C, 400000, @@ -41,7 +44,7 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) { (void) m; // This board only supports one touch panel - if (driverInstance) + if (driverinstance) return FALSE; palSetPadMode(GPIOC, 13, PAL_MODE_INPUT | PAL_STM32_PUDR_FLOATING); /* TP IRQ */ @@ -49,6 +52,7 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) { palSetPadMode(GPIOB, 9, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN); /* SDA */ i2cStart(&I2CD1, &i2ccfg); + return TRUE; } diff --git a/drivers/ginput/touch/STMPE811/stmpe811.h b/drivers/ginput/touch/STMPE811/stmpe811.h index 1ee9c211..f0d2df42 100644 --- a/drivers/ginput/touch/STMPE811/stmpe811.h +++ b/drivers/ginput/touch/STMPE811/stmpe811.h @@ -11,9 +11,6 @@ // Slave address #define STMPE811_ADDR (0x82 >> 1) -// Maximum timeout -#define STMPE811_TIMEOUT 0x3000 - // Identification registers #define STMPE811_REG_CHP_ID 0x00 // 16-bit #define STMPE811_REG_ID_VER 0x02 |