refactor(libraries/Wire): return return types

In TwoWire class return return types.

Author: safocl

cores/esp32/HardwareI2C.h

@@ -24,11 +24,11 @@
 class HardwareI2C : public Stream
 {
   public:
-    virtual void begin() = 0;
-    virtual void begin(uint8_t address) = 0;
-    virtual void end() = 0;
+    virtual bool begin() = 0;
+    virtual bool begin(uint8_t address) = 0;
+    virtual bool end() = 0;
 
-    virtual void setClock(uint32_t freq) = 0;
+    virtual bool setClock(uint32_t freq) = 0;
 
     virtual void beginTransmission(uint8_t address) = 0;
     virtual uint8_t endTransmission(bool stopBit) = 0;

libraries/Wire/src/Wire.cpp

@@ -332,34 +332,35 @@ bool TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
 
 }
 
-void TwoWire::end()
+bool TwoWire::end()
 {
+    esp_err_t err = ESP_OK;
 #if !CONFIG_DISABLE_HAL_LOCKS
     if(lock != NULL){
         //acquire lock
         if(xSemaphoreTake(lock, portMAX_DELAY) != pdTRUE){
             log_e("could not acquire lock");
-            return;
+            return false;
         }
 #endif
 #if SOC_I2C_SUPPORT_SLAVE
         if(is_slave){
-            esp_err_t err = i2cSlaveDeinit(num);
+            err = i2cSlaveDeinit(num);
             if(err == ESP_OK){
                 is_slave = false;
             }
         } else
 #endif /* SOC_I2C_SUPPORT_SLAVE */
         if(i2cIsInit(num)){
-            i2cDeinit(num);
+            err = i2cDeinit(num);
         }
         freeWireBuffer();
 #if !CONFIG_DISABLE_HAL_LOCKS
         //release lock
         xSemaphoreGive(lock);
     }
 #endif
-    return;
+    return (err == ESP_OK);
 }
 
 uint32_t TwoWire::getClock()
@@ -389,25 +390,28 @@ uint32_t TwoWire::getClock()
 
 void TwoWire::setClock(uint32_t frequency)
 {
+    esp_err_t err = ESP_OK;
 #if !CONFIG_DISABLE_HAL_LOCKS
     //acquire lock
     if(lock == NULL || xSemaphoreTake(lock, portMAX_DELAY) != pdTRUE){
         log_e("could not acquire lock");
-        return;
+        return false;
     }
 #endif
 #if SOC_I2C_SUPPORT_SLAVE
     if(is_slave){
         log_e("Bus is in Slave Mode");
+        err = ESP_FAIL;
     } else 
 #endif /* SOC_I2C_SUPPORT_SLAVE */
     {
-        i2cSetClock(num, frequency);
+        err = i2cSetClock(num, frequency);
     }
 #if !CONFIG_DISABLE_HAL_LOCKS
     //release lock
     xSemaphoreGive(lock);
 #endif
+    return (err == ESP_OK);
 }
 
 void TwoWire::setTimeOut(uint16_t timeOutMillis)

libraries/Wire/src/Wire.h

@@ -90,24 +90,24 @@ class TwoWire: public HardwareI2C
     TwoWire(uint8_t bus_num);
     ~TwoWire();
 
-    void begin() override final
+    bool begin() override final
     {
-        begin(-1, -1);
+        return begin(-1, -1);
     }
 
-    void begin(uint8_t address) override final
+    bool begin(uint8_t address) override final
     {
 #if SOC_I2C_SUPPORT_SLAVE
-        begin(address, -1, -1, 0);
+        return begin(address, -1, -1, 0);
 #else
         log_e("I2C slave is not supported by you SoC!!!");
 #endif
     }
 
 
-    void end() override;
+    bool end() override;
 
-    void setClock(uint32_t freq) override;
+    bool setClock(uint32_t freq) override;
 
     void beginTransmission(uint8_t address) override;
     uint8_t endTransmission(bool stopBit) override;