Skip to content

Commit

Permalink
fixed I2C driver support for stm32f4 (qmk#7526)
Browse files Browse the repository at this point in the history
* correct i2c driver for stm32f4

* update pin mode definitions

* update macro definition
  • Loading branch information
yulei authored and fdidron committed Jan 8, 2020
1 parent 20f465b commit 5f9e60b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
3 changes: 1 addition & 2 deletions drivers/arm/i2c_master.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ __attribute__((weak)) void i2c_init(void) {
palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT);

chThdSleepMilliseconds(10);

#ifdef USE_I2CV1
#if defined(USE_GPIOV1)
palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
#else
Expand Down
24 changes: 15 additions & 9 deletions drivers/arm/i2c_master.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "ch.h"
#include <hal.h>

#if defined(STM32F1XX) || defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32L0xx) || defined(STM32L1xx)
#if defined(STM32F1XX) || defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32F4XX) || defined(STM32L0xx) || defined(STM32L1xx)
# define USE_I2CV1
#endif

Expand All @@ -51,6 +51,20 @@
# define I2C1_SDA 7
#endif

#if defined(STM32F1XX) || defined(STM32F1xx)
# define USE_GPIOV1
#endif

#ifndef USE_GPIOV1
// The default PAL alternate modes are used to signal that the pins are used for I2C
# ifndef I2C1_SCL_PAL_MODE
# define I2C1_SCL_PAL_MODE 4
# endif
# ifndef I2C1_SDA_PAL_MODE
# define I2C1_SDA_PAL_MODE 4
# endif
#endif

#ifdef USE_I2CV1
# ifndef I2C1_OPMODE
# define I2C1_OPMODE OPMODE_I2C
Expand All @@ -62,14 +76,6 @@
# define I2C1_DUTY_CYCLE STD_DUTY_CYCLE /* FAST_DUTY_CYCLE_2 */
# endif
#else
// The default PAL alternate modes are used to signal that the pins are used for I2C
# ifndef I2C1_SCL_PAL_MODE
# define I2C1_SCL_PAL_MODE 4
# endif
# ifndef I2C1_SDA_PAL_MODE
# define I2C1_SDA_PAL_MODE 4
# endif

// The default timing values below configures the I2C clock to 400khz assuming a 72Mhz clock
// For more info : https://www.st.com/en/embedded-software/stsw-stm32126.html
# ifndef I2C1_TIMINGR_PRESC
Expand Down

0 comments on commit 5f9e60b

Please sign in to comment.