Update Wire.cpp

Author: Jason2866

libraries/Wire/src/Wire.cpp

@@ -32,7 +32,9 @@ extern "C" {
 }
 
 #include "esp32-hal-i2c.h"
+#if SOC_I2C_SUPPORT_SLAVE
 #include "esp32-hal-i2c-slave.h"
+#endif /* SOC_I2C_SUPPORT_SLAVE */
 #include "Wire.h"
 #include "Arduino.h"
 
@@ -57,7 +59,7 @@ TwoWire::TwoWire(uint8_t bus_num)
     ,is_slave(false)
     ,user_onRequest(NULL)
     ,user_onReceive(NULL)
-#endif
+#endif /* SOC_I2C_SUPPORT_SLAVE */
 {}
 
 TwoWire::~TwoWire()
@@ -299,10 +301,12 @@ bool TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
         return false;
     }
 #endif
+#if SOC_I2C_SUPPORT_SLAVE
     if(is_slave){
         log_e("Bus already started in Slave Mode.");
         goto end;
     }
+#endif /* SOC_I2C_SUPPORT_SLAVE */
     if(i2cIsInit(num)){
         log_w("Bus already started in Master Mode.");
         started = true;
@@ -339,14 +343,15 @@ bool TwoWire::end()
             return false;
         }
 #endif
-        if(is_slave){
 #if SOC_I2C_SUPPORT_SLAVE
+        if(is_slave){
             err = i2cSlaveDeinit(num);
             if(err == ESP_OK){
                 is_slave = false;
             }
-#endif
-        } else if(i2cIsInit(num)){
+        } else
+#endif /* SOC_I2C_SUPPORT_SLAVE */
+        if(i2cIsInit(num)){
             err = i2cDeinit(num);
         }
         freeWireBuffer();
@@ -367,9 +372,12 @@ uint32_t TwoWire::getClock()
         log_e("could not acquire lock");
     } else {
 #endif
+#if SOC_I2C_SUPPORT_SLAVE
         if(is_slave){
             log_e("Bus is in Slave Mode");
-        } else {
+        } else 
+#endif /* SOC_I2C_SUPPORT_SLAVE */
+        {
             i2cGetClock(num, &frequency);
         }
 #if !CONFIG_DISABLE_HAL_LOCKS
@@ -390,10 +398,13 @@ bool TwoWire::setClock(uint32_t frequency)
         return false;
     }
 #endif
+#if SOC_I2C_SUPPORT_SLAVE
     if(is_slave){
         log_e("Bus is in Slave Mode");
         err = ESP_FAIL;
-    } else {
+    } else 
+#endif /* SOC_I2C_SUPPORT_SLAVE */
+    {
         err = i2cSetClock(num, frequency);
     }
 #if !CONFIG_DISABLE_HAL_LOCKS
@@ -415,10 +426,12 @@ uint16_t TwoWire::getTimeOut()
 
 void TwoWire::beginTransmission(uint16_t address)
 {
+#if SOC_I2C_SUPPORT_SLAVE
     if(is_slave){
         log_e("Bus is in Slave Mode");
         return;
     }
+#endif /* SOC_I2C_SUPPORT_SLAVE */
 #if !CONFIG_DISABLE_HAL_LOCKS
     if(nonStop && nonStopTask == xTaskGetCurrentTaskHandle()){
         log_e("Unfinished Repeated Start transaction! Expected requestFrom, not beginTransmission! Clearing...");
@@ -448,10 +461,12 @@ endTransmission() returns:
 */
 uint8_t TwoWire::endTransmission(bool sendStop)
 {
+#if SOC_I2C_SUPPORT_SLAVE
     if(is_slave){
         log_e("Bus is in Slave Mode");
         return 4;
     }
+#endif /* SOC_I2C_SUPPORT_SLAVE */
     if (txBuffer == NULL){
         log_e("NULL TX buffer pointer");
         return 4;
@@ -481,10 +496,12 @@ uint8_t TwoWire::endTransmission(bool sendStop)
 
 size_t TwoWire::requestFrom(uint16_t address, size_t size, bool sendStop)
 {
+#if SOC_I2C_SUPPORT_SLAVE
     if(is_slave){
         log_e("Bus is in Slave Mode");
         return 0;
     }
+#endif /* SOC_I2C_SUPPORT_SLAVE */
     if (rxBuffer == NULL || txBuffer == NULL){
         log_e("NULL buffer pointer");
         return 0;
@@ -708,4 +725,4 @@ void TwoWire::onRequest( void (*function)(void) )
 TwoWire Wire = TwoWire(0);
 TwoWire Wire1 = TwoWire(1);
 
-#endif /* SOC_I2C_SUPPORTED */
+#endif /* SOC_I2C_SUPPORTED */