[I2C] Fix compilation for ESP8266

letscontrolit · Jan 31, 2025 · 1eb141c · 1eb141c
1 parent 114161a
commit 1eb141c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/Custom-sample.h b/src/Custom-sample.h
@@ -113,17 +113,17 @@
 #endif
 #ifdef ESP32
 #define DEFAULT_PIN_I2C_SDA                     -1                // Undefined
-#define DEFAULT_PIN_I2C2_SDA                    -1                // Undefined
-#define DEFAULT_PIN_I2C3_SDA                    -1                // Undefined
 #endif
 #ifdef ESP8266
 #define DEFAULT_PIN_I2C_SCL                     5
 #endif
 #ifdef ESP32
 #define DEFAULT_PIN_I2C_SCL                     -1                // Undefined
+#endif
+#define DEFAULT_PIN_I2C2_SDA                    -1                // Undefined
+#define DEFAULT_PIN_I2C3_SDA                    -1                // Undefined
 #define DEFAULT_PIN_I2C3_SCL                    -1                // Undefined
 #define DEFAULT_PIN_I2C3_SCL                    -1                // Undefined
-#endif
 #define DEFAULT_I2C_CLOCK_SPEED                 400000            // Use 100 kHz if working with old I2C chips
 #define FEATURE_I2C_DEVICE_SCAN                 1
 

diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h
@@ -220,14 +220,12 @@
 #define DEFAULT_PIN_I2C_SDA              -1                // Undefined
 #endif
 #endif
-#ifdef ESP32
 #ifndef DEFAULT_PIN_I2C2_SDA
 #define DEFAULT_PIN_I2C2_SDA             -1                // Undefined
 #endif
 #ifndef DEFAULT_PIN_I2C3_SDA
 #define DEFAULT_PIN_I2C3_SDA             -1                // Undefined
 #endif
-#endif
 #ifndef DEFAULT_PIN_I2C_SCL
 #ifdef ESP8266
 #define DEFAULT_PIN_I2C_SCL              5
@@ -236,14 +234,12 @@
 #define DEFAULT_PIN_I2C_SCL              -1                // Undefined
 #endif
 #endif
-#ifdef ESP32
 #ifndef DEFAULT_PIN_I2C2_SCL
 #define DEFAULT_PIN_I2C2_SCL             -1                // Undefined
 #endif
 #ifndef DEFAULT_PIN_I2C3_SCL
 #define DEFAULT_PIN_I2C3_SCL             -1                // Undefined
 #endif
-#endif
 #ifndef DEFAULT_I2C_CLOCK_SPEED
 #define DEFAULT_I2C_CLOCK_SPEED          400000            // Use 100 kHz if working with old I2C chips
 #endif

diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp
@@ -966,7 +966,12 @@ bool SettingsStruct_tmpl<N_TASKS>::isSPI_valid() const {
 template<unsigned int N_TASKS>
 bool SettingsStruct_tmpl<N_TASKS>::isI2C_pin(int8_t pin) const {
   if (pin < 0) { return false; }
-  for (uint8_t i2cBus = 0; i2cBus < getI2CBusCount(); ++i2cBus) {
+  #if !FEATURE_I2C_MULTIPLE
+  const uint8_t i2cBus = 0;
+  #else // if !FEATURE_I2C_MULTIPLE
+  for (uint8_t i2cBus = 0; i2cBus < getI2CBusCount(); ++i2cBus)
+  #endif // if !FEATURE_I2C_MULTIPLE
+  {
     if ((getI2CSdaPin(i2cBus) == pin) || (getI2CSclPin(i2cBus) == pin)) {
       return true;
     }