Envie: Fix I2C clock speed

Author: facchinm

cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/i2c_device.h

@@ -48,6 +48,12 @@ extern "C" {
 #define I2CAPI_I2C3_CLKSRC RCC_I2C3CLKSOURCE_D2PCLK1
 #define I2CAPI_I2C4_CLKSRC RCC_I2C4CLKSOURCE_D3PCLK1
 
+#if (APB1CLK)
+#define APB1CLK_MULTIPLIER  (APB1CLK / 54000000)
+#else
+#define APB1CLK_MULTIPLIER  (1)
+#endif
+
 /*  Provide the suitable timing depending on requested frequencie */
 static inline uint32_t get_i2c_timing(int hz)
 {
@@ -64,13 +70,13 @@ static inline uint32_t get_i2c_timing(int hz)
     */
     switch (hz) {
         case 100000:
-            tim = 0x10916998; // Standard mode with Rise time = 120ns, Fall time = 120ns
+            tim = 0x10916998 * APB1CLK_MULTIPLIER; // Standard mode with Rise time = 120ns, Fall time = 120ns
             break;
         case 400000:
-            tim = 0x00B11B54; // Fast Mode with Rise time = 120ns, Fall time = 120ns
+            tim = 0x00B11B54 * APB1CLK_MULTIPLIER; // Fast Mode with Rise time = 120ns, Fall time = 120ns
             break;
         case 1000000:
-            tim = 0x0090091B; // Fast Mode Plus with Rise time = 120ns, Fall time = 10ns
+            tim = 0x0090091B * APB1CLK_MULTIPLIER; // Fast Mode Plus with Rise time = 120ns, Fall time = 10ns
             break;
         default:
             break;

variants/ENVIE_M4/pins_arduino.h

@@ -83,13 +83,15 @@ static const uint8_t SCK  = PIN_SPI_SCK;
 uint8_t getUniqueSerialNumber(uint8_t* name);
 void _ontouch1200bps_();
 
-#define WIRE_HOWMANY		1
+#define WIRE_HOWMANY		2
 
 #define I2C_SDA				(digitalPinToPinName(PIN_WIRE_SDA))
 #define I2C_SCL				(digitalPinToPinName(PIN_WIRE_SCL))
 
 #define I2C_SDA_INTERNAL	(PB_7)
 #define I2C_SCL_INTERNAL	(PB_6)
+#define I2C_SDA1			I2C_SDA_INTERNAL
+#define I2C_SCL1			I2C_SCL_INTERNAL
 
 #define SPI_HOWMANY			1
 

variants/ENVIE_M7/defines.txt

@@ -47,7 +47,7 @@
 -DFEATURE_LWIP=1
 -D__FPU_PRESENT=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1579537936.2465086
+-DMBED_BUILD_TIMESTAMP=1580125001.1319444
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_TICKLESS
 -DSTM32H747xx

variants/ENVIE_M7/libs/libmbed.a

@@ -22,6 +22,7 @@
 #define __MBED_CONFIG_DATA__
 
 // Configuration parameters
+#define APB1CLK                                                               112500000                                                                                        // set by target:ENVIE
 #define ATT_NUM_SIMUL_NTF                                                     1                                                                                                // set by library:cordio
 #define ATT_NUM_SIMUL_WRITE_CMD                                               1                                                                                                // set by library:cordio
 #define BLE_FEATURE_EXTENDED_ADVERTISING                                      1                                                                                                // set by library:ble
@@ -38,7 +39,7 @@
 #define BLE_ROLE_CENTRAL                                                      1                                                                                                // set by library:ble
 #define BLE_ROLE_OBSERVER                                                     1                                                                                                // set by library:ble
 #define BLE_ROLE_PERIPHERAL                                                   1                                                                                                // set by library:ble
-#define CLOCK_SOURCE                                                          USE_PLL_HSE_XTAL                                                                                 // set by target:ENVIE
+#define CLOCK_SOURCE                                                          USE_PLL_HSE_EXTC                                                                                 // set by target:ENVIE
 #define DM_CONN_MAX                                                           3                                                                                                // set by library:cordio
 #define DM_NUM_ADV_SETS                                                       3                                                                                                // set by library:cordio
 #define DM_NUM_PHYS                                                           3                                                                                                // set by library:cordio

variants/ENVIE_M7/mbed_config.h

@@ -58,9 +58,11 @@ static const uint8_t SCK  = PIN_SPI_SCK;
 #define PIN_WIRE_SDA        (11u)
 #define PIN_WIRE_SCL        (12u)
 
-#define SERIAL_HOWMANY		1
+#define SERIAL_HOWMANY		2
 #define SERIAL1_TX			(digitalPinToPinName(PIN_SERIAL_TX))
 #define SERIAL1_RX			(digitalPinToPinName(PIN_SERIAL_RX))
+#define SERIAL2_TX			(PA_0)
+#define SERIAL2_RX			(PI_9)
 
 #define SERIAL_CDC			1
 #define HAS_UNIQUE_ISERIAL_DESCRIPTOR
@@ -74,13 +76,16 @@ uint8_t getUniqueSerialNumber(uint8_t* name);
 void _ontouch1200bps_();
 
 
-#define WIRE_HOWMANY		1
+#define WIRE_HOWMANY		2
 
 #define I2C_SDA				(digitalPinToPinName(PIN_WIRE_SDA))
 #define I2C_SCL				(digitalPinToPinName(PIN_WIRE_SCL))
 
 #define I2C_SDA_INTERNAL	(PB_7)
 #define I2C_SCL_INTERNAL	(PB_6)
+#define I2C_SDA1			I2C_SDA_INTERNAL
+#define I2C_SCL1			I2C_SCL_INTERNAL
+
 
 #define SPI_HOWMANY			1