[ESP32-s2] Fix crash when scanning I2C bus

TD-er · TD-er · commit 0a5b435e517d · 2021-09-06T12:00:14.000+02:00
See: espressif/arduino-esp32#5636
diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp
@@ -173,7 +173,6 @@ void initI2C() {
   }
   addLog(LOG_LEVEL_INFO, F("INIT : I2C"));
   I2CSelectClockSpeed(false); // Set normal clock speed
-  Wire.begin(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl);
 
   if (Settings.WireClockStretchLimit)
   {
@@ -226,8 +225,13 @@ void I2CSelectClockSpeed(bool setLowSpeed) {
     // No need to change the clock speed.
     return;
   }
-  lastI2CClockSpeed = newI2CClockSpeed;  
+  lastI2CClockSpeed = newI2CClockSpeed;
+  #ifdef ESP32
+  Wire.begin(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl, newI2CClockSpeed);
+  #else
+  Wire.begin(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl);
   Wire.setClock(newI2CClockSpeed);
+  #endif
 }
 
 #ifdef FEATURE_I2CMULTIPLEXER

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,6 @@ void initI2C() {`
`173`	`173`	`}`
`174`	`174`	`addLog(LOG_LEVEL_INFO, F("INIT : I2C"));`
`175`	`175`	`I2CSelectClockSpeed(false); // Set normal clock speed`
`176`		`- Wire.begin(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl);`
`177`	`176`
`178`	`177`	`if (Settings.WireClockStretchLimit)`
`179`	`178`	`{`
`@@ -226,8 +225,13 @@ void I2CSelectClockSpeed(bool setLowSpeed) {`
`226`	`225`	`// No need to change the clock speed.`
`227`	`226`	`return;`
`228`	`227`	`}`
`229`		`- lastI2CClockSpeed = newI2CClockSpeed;`
	`228`	`+ lastI2CClockSpeed = newI2CClockSpeed;`
	`229`	`+ #ifdef ESP32`
	`230`	`+ Wire.begin(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl, newI2CClockSpeed);`
	`231`	`+ #else`
	`232`	`+ Wire.begin(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl);`
`230`	`233`	`Wire.setClock(newI2CClockSpeed);`
	`234`	`+ #endif`
`231`	`235`	`}`
`232`	`236`
`233`	`237`	`#ifdef FEATURE_I2CMULTIPLEXER`