diff options
| author | Joel Challis <git@zvecr.com> | 2021-09-12 15:41:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 15:41:33 +0100 |
| commit | 0fa217a5b7cdd035105387fd31c506fda4cfb945 (patch) | |
| tree | 1ba0df8f6cb8462fcc3517f7a090ad7c72123038 /platforms | |
| parent | bb841087bbd47b0be6dffafa8a4f7a361867f71d (diff) | |
| download | qmk_firmware-0fa217a5b7cdd035105387fd31c506fda4cfb945.tar.gz qmk_firmware-0fa217a5b7cdd035105387fd31c506fda4cfb945.zip | |
Align ChibiOS I2C defs with other drivers (#14399)
* Align ChibiOS I2C defs with other drivers
* Update keyboards/xelus/valor_frl_tkl/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/chibios/drivers/i2c_master.c | 12 | ||||
| -rw-r--r-- | platforms/chibios/drivers/i2c_master.h | 21 |
2 files changed, 10 insertions, 23 deletions
diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c index fc4bb2ab3..9af5c71c3 100644 --- a/platforms/chibios/drivers/i2c_master.c +++ b/platforms/chibios/drivers/i2c_master.c | |||
| @@ -63,16 +63,16 @@ __attribute__((weak)) void i2c_init(void) { | |||
| 63 | is_initialised = true; | 63 | is_initialised = true; |
| 64 | 64 | ||
| 65 | // Try releasing special pins for a short time | 65 | // Try releasing special pins for a short time |
| 66 | palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_INPUT); | 66 | palSetLineMode(I2C1_SCL_PIN, PAL_MODE_INPUT); |
| 67 | palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT); | 67 | palSetLineMode(I2C1_SDA_PIN, PAL_MODE_INPUT); |
| 68 | 68 | ||
| 69 | chThdSleepMilliseconds(10); | 69 | chThdSleepMilliseconds(10); |
| 70 | #if defined(USE_GPIOV1) | 70 | #if defined(USE_GPIOV1) |
| 71 | palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, I2C1_SCL_PAL_MODE); | 71 | palSetLineMode(I2C1_SCL_PIN, I2C1_SCL_PAL_MODE); |
| 72 | palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, I2C1_SDA_PAL_MODE); | 72 | palSetLineMode(I2C1_SDA_PIN, I2C1_SDA_PAL_MODE); |
| 73 | #else | 73 | #else |
| 74 | palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(I2C1_SCL_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); | 74 | palSetLineMode(I2C1_SCL_PIN, PAL_MODE_ALTERNATE(I2C1_SCL_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); |
| 75 | palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(I2C1_SDA_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); | 75 | palSetLineMode(I2C1_SDA_PIN, PAL_MODE_ALTERNATE(I2C1_SDA_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); |
| 76 | #endif | 76 | #endif |
| 77 | } | 77 | } |
| 78 | } | 78 | } |
diff --git a/platforms/chibios/drivers/i2c_master.h b/platforms/chibios/drivers/i2c_master.h index c68109acb..303aa6990 100644 --- a/platforms/chibios/drivers/i2c_master.h +++ b/platforms/chibios/drivers/i2c_master.h | |||
| @@ -27,24 +27,11 @@ | |||
| 27 | #include <ch.h> | 27 | #include <ch.h> |
| 28 | #include <hal.h> | 28 | #include <hal.h> |
| 29 | 29 | ||
| 30 | #ifdef I2C1_BANK | 30 | #ifndef I2C1_SCL_PIN |
| 31 | # define I2C1_SCL_BANK I2C1_BANK | 31 | # define I2C1_SCL_PIN B6 |
| 32 | # define I2C1_SDA_BANK I2C1_BANK | ||
| 33 | #endif | 32 | #endif |
| 34 | 33 | #ifndef I2C1_SDA_PIN | |
| 35 | #ifndef I2C1_SCL_BANK | 34 | # define I2C1_SDA_PIN B7 |
| 36 | # define I2C1_SCL_BANK GPIOB | ||
| 37 | #endif | ||
| 38 | |||
| 39 | #ifndef I2C1_SDA_BANK | ||
| 40 | # define I2C1_SDA_BANK GPIOB | ||
| 41 | #endif | ||
| 42 | |||
| 43 | #ifndef I2C1_SCL | ||
| 44 | # define I2C1_SCL 6 | ||
| 45 | #endif | ||
| 46 | #ifndef I2C1_SDA | ||
| 47 | # define I2C1_SDA 7 | ||
| 48 | #endif | 35 | #endif |
| 49 | 36 | ||
| 50 | #ifdef USE_I2CV1 | 37 | #ifdef USE_I2CV1 |