Update Wire.cpp

Author: stickbreaker

Diff for: libraries/Wire/src/Wire.cpp

@@ -58,7 +58,7 @@ TwoWire::~TwoWire()
     }
 }
 
-void TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
+bool TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
 {
     if(sdaPin < 0) { // default param passed
         if(num == 0) {
@@ -70,7 +70,7 @@ void TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
         } else {
             if(sda==-1) {
                 log_e("no Default SDA Pin for Second Peripheral");
-                return; //no Default pin for Second Peripheral
+                return false; //no Default pin for Second Peripheral
             } else {
                 sdaPin = sda;    // reuse prior pin
             }
@@ -87,7 +87,7 @@ void TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
         } else {
             if(scl == -1) {
                 log_e("no Default SCL Pin for Second Peripheral");
-                return; //no Default pin for Second Peripheral
+                return false; //no Default pin for Second Peripheral
             } else {
                 sclPin = scl;    // reuse prior pin
             }
@@ -98,10 +98,11 @@ void TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
     scl = sclPin;
     i2c = i2cInit(num, sdaPin, sclPin, frequency);
     if(!i2c) {
-        return;
+        return false;
     }
 
     flush();
+    return true;
 
 }
 
@@ -145,6 +146,7 @@ void TwoWire::beginTransmission(uint16_t address)
     txAddress = address;
     txIndex = txQueued; // allow multiple beginTransmission(),write(),endTransmission(false) until endTransmission(true)
     txLength = txQueued;
+    last_error = I2C_ERROR_OK;
 }
 
 /*stickbreaker isr
@@ -202,27 +204,27 @@ size_t TwoWire::write(uint8_t data)
 {
     if(transmitting) {
         if(txLength >= I2C_BUFFER_LENGTH) {
+            last_error = I2C_ERROR_MEMORY;
             return 0;
         }
         txBuffer[txIndex] = data;
         ++txIndex;
         txLength = txIndex;
         return 1;
     }
+    last_error = I2C_ERROR_NO_BEGIN; // no begin, not transmitting
     return 0;
 }
 
 size_t TwoWire::write(const uint8_t *data, size_t quantity)
 {
-    if(transmitting) {
-        for(size_t i = 0; i < quantity; ++i) {
-            if(!write(data[i])) {
-                return i;
-            }
+    for(size_t i = 0; i < quantity; ++i) {
+        if(!write(data[i])) {
+            return i;
         }
-        return quantity;
     }
-    return 0;
+    return quantity;
+
 }
 
 int TwoWire::available(void)
@@ -353,14 +355,13 @@ char * TwoWire::getErrorText(uint8_t err)
 
 /*stickbreaker Dump i2c Interrupt buffer, i2c isr Debugging
  */
-void TwoWire::dumpInts()
-{
-    i2cDumpInts(num);
+ 
+uint32_t TwoWire::setDebugFlags( uint32_t setBits, uint32_t resetBits){
+  i2cDebug(i2c,setBits,resetBits);
 }
 
-void TwoWire::dumpI2C()
-{
-    i2cDumpI2c(i2c);
+bool TwoWire::busy(void){
+  return ((i2cGetStatus(i2c) & 16 )==16);
 }
 
 TwoWire Wire = TwoWire(0);