Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

[G4] I2C support

Browse source
This commit is contained in:
jflyper 2020-03-11 19:05:54 +09:00
parent d733c48b04
commit 00e57e6049
3 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/bus_i2c_config.c
View file

@ -56,13 +56,13 @@ void i2cHardwareConfigure(const i2cConfig_t *i2cConfig)
for (int pindex = 0 ; pindex < I2C_PIN_SEL_MAX ; pindex++) { for (int pindex = 0 ; pindex < I2C_PIN_SEL_MAX ; pindex++) {
if (i2cConfig[device].ioTagScl == hardware->sclPins[pindex].ioTag) { if (i2cConfig[device].ioTagScl == hardware->sclPins[pindex].ioTag) {
pDev->scl = IOGetByTag(i2cConfig[device].ioTagScl); pDev->scl = IOGetByTag(i2cConfig[device].ioTagScl);
#if defined(STM32F4) || defined(STM32H7) #if defined(STM32F4) || defined(STM32H7) || defined(STM32G4)
pDev->sclAF = hardware->sclPins[pindex].af; pDev->sclAF = hardware->sclPins[pindex].af;
#endif #endif
} }
if (i2cConfig[device].ioTagSda == hardware->sdaPins[pindex].ioTag) { if (i2cConfig[device].ioTagSda == hardware->sdaPins[pindex].ioTag) {
pDev->sda = IOGetByTag(i2cConfig[device].ioTagSda); pDev->sda = IOGetByTag(i2cConfig[device].ioTagSda);
#if defined(STM32F4) || defined(STM32H7) #if defined(STM32F4) || defined(STM32H7) || defined(STM32G4)
pDev->sdaAF = hardware->sdaPins[pindex].af; pDev->sdaAF = hardware->sdaPins[pindex].af;
#endif #endif
} }

53
src/main/drivers/bus_i2c_hal_init.c
View file

@ -144,6 +144,51 @@ const i2cHardware_t i2cHardware[I2CDEV_COUNT] = {
.er_irq = I2C4_ER_IRQn, .er_irq = I2C4_ER_IRQn,
}, },
#endif #endif
#elif defined(STM32G4)
#ifdef USE_I2C_DEVICE_1
{
.device = I2CDEV_1,
.reg = I2C1,
.sclPins = { I2CPINDEF(PA15, GPIO_AF4_I2C1), I2CPINDEF(PB6, GPIO_AF4_I2C1), I2CPINDEF(PB8, GPIO_AF4_I2C1), },
.sdaPins = { I2CPINDEF(PB7, GPIO_AF4_I2C1), I2CPINDEF(PB9, GPIO_AF4_I2C1), },
.rcc = RCC_APB11(I2C1),
.ev_irq = I2C1_EV_IRQn,
.er_irq = I2C1_ER_IRQn,
},
#endif
#ifdef USE_I2C_DEVICE_2
{
.device = I2CDEV_2,
.reg = I2C2,
.sclPins = { I2CPINDEF(PA9, GPIO_AF4_I2C2), },
.sdaPins = { I2CPINDEF(PA10, GPIO_AF4_I2C2), },
.rcc = RCC_APB11(I2C2),
.ev_irq = I2C2_EV_IRQn,
.er_irq = I2C2_ER_IRQn,
},
#endif
#ifdef USE_I2C_DEVICE_3
{
.device = I2CDEV_3,
.reg = I2C3,
.sclPins = { I2CPINDEF(PA10, GPIO_AF2_I2C3), I2CPINDEF(PC8, GPIO_AF8_I2C3), },
.sdaPins = { I2CPINDEF(PB5, GPIO_AF8_I2C3), I2CPINDEF(PC9, GPIO_AF8_I2C3), I2CPINDEF(PC11, GPIO_AF8_I2C3), },
.rcc = RCC_APB11(I2C3),
.ev_irq = I2C3_EV_IRQn,
.er_irq = I2C3_ER_IRQn,
},
#endif
#ifdef USE_I2C_DEVICE_4
{
.device = I2CDEV_4,
.reg = I2C4,
.sclPins = { I2CPINDEF(PB6, GPIO_AF3_I2C4), I2CPINDEF(PC6, GPIO_AF8_I2C4), },
.sdaPins = { I2CPINDEF(PB7, GPIO_AF4_I2C4), I2CPINDEF(PC7, GPIO_AF8_I2C4), },
.rcc = RCC_APB12(I2C4),
.ev_irq = I2C4_EV_IRQn,
.er_irq = I2C4_ER_IRQn,
},
#endif
#endif #endif
}; };
@ -264,7 +309,7 @@ void i2cInit(I2CDevice device)
#if defined(STM32F7) #if defined(STM32F7)
IOConfigGPIOAF(scl, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, GPIO_AF4_I2C); IOConfigGPIOAF(scl, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, GPIO_AF4_I2C);
IOConfigGPIOAF(sda, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, GPIO_AF4_I2C); IOConfigGPIOAF(sda, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, GPIO_AF4_I2C);
#elif defined(STM32H7) #elif defined(STM32H7) || defined(STM32G4)
IOConfigGPIOAF(scl, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, pDev->sclAF); IOConfigGPIOAF(scl, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, pDev->sclAF);
IOConfigGPIOAF(sda, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, pDev->sdaAF); IOConfigGPIOAF(sda, pDev->pullUp ? IOCFG_I2C_PU : IOCFG_I2C, pDev->sdaAF);
#else #else
@ -284,8 +329,10 @@ void i2cInit(I2CDevice device)
uint32_t i2cPclk; uint32_t i2cPclk;
#if defined(STM32F7) #if defined(STM32F7) || defined(STM32G4)
// Clock source configured in startup/system_stm32f7xx.c as: // F7 Clock source configured in startup/system_stm32f7xx.c as:
// I2C1234 : PCLK1
// G4 Clock source configured in startup/system_stm32g4xx.c as:
// I2C1234 : PCLK1 // I2C1234 : PCLK1
i2cPclk = HAL_RCC_GetPCLK1Freq(); i2cPclk = HAL_RCC_GetPCLK1Freq();
#elif defined(STM32H7) #elif defined(STM32H7)

6
src/main/drivers/bus_i2c_impl.h
View file

@ -33,12 +33,12 @@
typedef struct i2cPinDef_s { typedef struct i2cPinDef_s {
ioTag_t ioTag; ioTag_t ioTag;
#if defined(STM32F4) || defined(STM32H7) #if defined(STM32F4) || defined(STM32H7) || defined(STM32G4)
uint8_t af; uint8_t af;
#endif #endif
} i2cPinDef_t; } i2cPinDef_t;
#if defined(STM32F4) || defined(STM32H7) #if defined(STM32F4) || defined(STM32H7) || defined(STM32G4)
#define I2CPINDEF(pin, af) { DEFIO_TAG_E(pin), af } #define I2CPINDEF(pin, af) { DEFIO_TAG_E(pin), af }
#elif defined(STM32F1) #elif defined(STM32F1)
#define I2CPINDEF(pin, af) { DEFIO_TAG_E(pin) } #define I2CPINDEF(pin, af) { DEFIO_TAG_E(pin) }
@ -79,7 +79,7 @@ typedef struct i2cDevice_s {
I2C_TypeDef *reg; I2C_TypeDef *reg;
IO_t scl; IO_t scl;
IO_t sda; IO_t sda;
#if defined(STM32F4) || defined(STM32H7) #if defined(STM32F4) || defined(STM32H7) || defined(STM32G4)
uint8_t sclAF; uint8_t sclAF;
uint8_t sdaAF; uint8_t sdaAF;
#endif #endif