zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

HAL_ChibiOS: fixed H7 I2C timing 

we were running the clock at too low speed. This affected the SSD1306 display
c415-sdk
Andrew Tridgell 5 years ago
parent
56286d8df3
commit
f68b9bafd8
1 changed files with 13 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      libraries/AP_HAL_ChibiOS/I2CDevice.cpp

15
libraries/AP_HAL_ChibiOS/I2CDevice.cpp
Unescape View File

@ -54,6 +54,9 @@ I2CBus I2CDeviceManager::businfo[ARRAY_SIZE(I2CD)];
#define HAL_I2C_F7_100_TIMINGR 0x20404768 #define HAL_I2C_F7_100_TIMINGR 0x20404768
#define HAL_I2C_F7_400_TIMINGR 0x6000030D #define HAL_I2C_F7_400_TIMINGR 0x6000030D
#define HAL_I2C_H7_100_TIMINGR 0x00707CBB
#define HAL_I2C_H7_400_TIMINGR 0x00300F38
/* /*
enable clear (toggling SCL) on I2C bus timeouts which leave SDA stuck low enable clear (toggling SCL) on I2C bus timeouts which leave SDA stuck low
*/ */
@ -123,7 +126,7 @@ I2CDeviceManager::I2CDeviceManager(void)
drop the speed to be the minimum speed requested drop the speed to be the minimum speed requested
*/ */
businfo[i].busclock = HAL_I2C_MAX_CLOCK; businfo[i].busclock = HAL_I2C_MAX_CLOCK;
#if defined(STM32F7) || defined(STM32H7) || defined(STM32F3) #if defined(STM32F7) || defined(STM32F3)
if (businfo[i].busclock <= 100000) { if (businfo[i].busclock <= 100000) {
businfo[i].i2ccfg.timingr = HAL_I2C_F7_100_TIMINGR; businfo[i].i2ccfg.timingr = HAL_I2C_F7_100_TIMINGR;
businfo[i].busclock = 100000; businfo[i].busclock = 100000;
@ -131,7 +134,15 @@ I2CDeviceManager::I2CDeviceManager(void)
businfo[i].i2ccfg.timingr = HAL_I2C_F7_400_TIMINGR; businfo[i].i2ccfg.timingr = HAL_I2C_F7_400_TIMINGR;
businfo[i].busclock = 400000; businfo[i].busclock = 400000;
} }
#else #elif defined(STM32H7)
if (businfo[i].busclock <= 100000) {
businfo[i].i2ccfg.timingr = HAL_I2C_H7_100_TIMINGR;
businfo[i].busclock = 100000;
} else {
businfo[i].i2ccfg.timingr = HAL_I2C_H7_400_TIMINGR;
businfo[i].busclock = 400000;
}
#else // F1 or F4
businfo[i].i2ccfg.op_mode = OPMODE_I2C; businfo[i].i2ccfg.op_mode = OPMODE_I2C;
businfo[i].i2ccfg.clock_speed = businfo[i].busclock; businfo[i].i2ccfg.clock_speed = businfo[i].busclock;
if (businfo[i].i2ccfg.clock_speed <= 100000) { if (businfo[i].i2ccfg.clock_speed <= 100000) {

Write Preview
Loading…
Cancel
Save