From 3d722bc35d01ab6cb4566d2d64a1f0869199e727 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 21 Apr 2019 01:17:03 +0200 Subject: [PATCH] Move SCCB timing to board config files. --- src/omv/boards/OPENMV3/omv_boardconfig.h | 1 + src/omv/boards/OPENMV4/omv_boardconfig.h | 1 + src/omv/cambus.c | 6 ++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/omv/boards/OPENMV3/omv_boardconfig.h b/src/omv/boards/OPENMV3/omv_boardconfig.h index 2f5a1f0bb..c91170b69 100644 --- a/src/omv/boards/OPENMV3/omv_boardconfig.h +++ b/src/omv/boards/OPENMV3/omv_boardconfig.h @@ -80,6 +80,7 @@ #define SCCB_PORT (GPIOB) #define SCCB_SCL_PIN (GPIO_PIN_8) #define SCCB_SDA_PIN (GPIO_PIN_9) +#define SCCB_TIMING (0x1090699B) // Frequency: 100KHz Rise Time: 100ns Fall Time: 20ns /* DCMI */ #define DCMI_TIM (TIM1) diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.h b/src/omv/boards/OPENMV4/omv_boardconfig.h index c5931fd3b..911f2e683 100644 --- a/src/omv/boards/OPENMV4/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4/omv_boardconfig.h @@ -99,6 +99,7 @@ #define SCCB_PORT (GPIOB) #define SCCB_SCL_PIN (GPIO_PIN_8) #define SCCB_SDA_PIN (GPIO_PIN_9) +#define SCCB_TIMING (0x40604E73) // Frequency: 100KHz Rise Time: 100ns Fall Time: 20ns /* DCMI */ #define DCMI_TIM (TIM1) diff --git a/src/omv/cambus.c b/src/omv/cambus.c index 14b513b5c..f512cc748 100644 --- a/src/omv/cambus.c +++ b/src/omv/cambus.c @@ -21,10 +21,8 @@ int cambus_init() /* Configure I2C */ I2CHandle.Instance = SCCB_I2C; I2CHandle.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; - #if defined(MCU_SERIES_F7) - I2CHandle.Init.Timing = 0x1090699B; // 100KHz, rise time = 100ns, fall time = 20ns - #elif defined(MCU_SERIES_H7) - I2CHandle.Init.Timing = 0x40604E73; // 100KHz, rise time = 100ns, fall time = 20ns + #if defined(SCCB_TIMING) + I2CHandle.Init.Timing = SCCB_TIMING; #else I2CHandle.Init.ClockSpeed = I2C_FREQUENCY; I2CHandle.Init.DutyCycle = I2C_DUTYCYCLE_2;