فهرست منبع

fixed I2C driver support for stm32f4 (#7526)

* correct i2c driver for stm32f4

* update pin mode definitions

* update macro definition
yulei 6 سال پیش
والد
کامیت
a037cedfdc
2فایلهای تغییر یافته به همراه16 افزوده شده و 10 حذف شده
  1. 1 1
      drivers/arm/i2c_master.c
  2. 15 9
      drivers/arm/i2c_master.h

+ 1 - 1
drivers/arm/i2c_master.c

@@ -62,7 +62,7 @@ __attribute__((weak)) void i2c_init(void) {
     palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT);
     palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT);
 
 
     chThdSleepMilliseconds(10);
     chThdSleepMilliseconds(10);
-#ifdef USE_I2CV1
+#if defined(USE_GPIOV1)
     palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
     palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
     palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
     palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
 #else
 #else

+ 15 - 9
drivers/arm/i2c_master.h

@@ -27,7 +27,7 @@
 #include "ch.h"
 #include "ch.h"
 #include <hal.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
 #    define USE_I2CV1
 #endif
 #endif
 
 
@@ -51,6 +51,20 @@
 #    define I2C1_SDA 7
 #    define I2C1_SDA 7
 #endif
 #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
 #ifdef USE_I2CV1
 #    ifndef I2C1_OPMODE
 #    ifndef I2C1_OPMODE
 #        define I2C1_OPMODE OPMODE_I2C
 #        define I2C1_OPMODE OPMODE_I2C
@@ -62,14 +76,6 @@
 #        define I2C1_DUTY_CYCLE STD_DUTY_CYCLE /* FAST_DUTY_CYCLE_2 */
 #        define I2C1_DUTY_CYCLE STD_DUTY_CYCLE /* FAST_DUTY_CYCLE_2 */
 #    endif
 #    endif
 #else
 #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
 // 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
 // For more info : https://www.st.com/en/embedded-software/stsw-stm32126.html
 #    ifndef I2C1_TIMINGR_PRESC
 #    ifndef I2C1_TIMINGR_PRESC