Merge pull request firmata#450 from pgrawehr/I2CReplyLength

soundanalogous · web-flow · commit a4e79c9c6314 · 2020-04-18T23:13:00.000-07:00
Return only as many bytes as were received in I2C transfers.
diff --git a/examples/StandardFirmata/StandardFirmata.ino b/examples/StandardFirmata/StandardFirmata.ino
@@ -206,6 +206,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX
     Firmata.sendString("I2C: Too many bytes received");
   } else if (numBytes > Wire.available()) {
     Firmata.sendString("I2C: Too few bytes received");
+    numBytes = Wire.available();
   }
 
   i2cRxData[0] = address;
diff --git a/examples/StandardFirmataBLE/StandardFirmataBLE.ino b/examples/StandardFirmataBLE/StandardFirmataBLE.ino
@@ -219,6 +219,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX
     Firmata.sendString("I2C: Too many bytes received");
   } else if (numBytes > Wire.available()) {
     Firmata.sendString("I2C: Too few bytes received");
+    numBytes = Wire.available();
   }
 
   i2cRxData[0] = address;
diff --git a/examples/StandardFirmataChipKIT/StandardFirmataChipKIT.ino b/examples/StandardFirmataChipKIT/StandardFirmataChipKIT.ino
@@ -203,6 +203,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX
     Firmata.sendString("I2C: Too many bytes received");
   } else if (numBytes > Wire.available()) {
     Firmata.sendString("I2C: Too few bytes received");
+    numBytes = Wire.available();
   }
 
   i2cRxData[0] = address;
diff --git a/examples/StandardFirmataEthernet/StandardFirmataEthernet.ino b/examples/StandardFirmataEthernet/StandardFirmataEthernet.ino
@@ -285,6 +285,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX
     Firmata.sendString("I2C: Too many bytes received");
   } else if (numBytes > Wire.available()) {
     Firmata.sendString("I2C: Too few bytes received");
+    numBytes = Wire.available();
   }
 
   i2cRxData[0] = address;
diff --git a/examples/StandardFirmataPlus/StandardFirmataPlus.ino b/examples/StandardFirmataPlus/StandardFirmataPlus.ino
@@ -231,6 +231,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX
     Firmata.sendString("I2C: Too many bytes received");
   } else if (numBytes > Wire.available()) {
     Firmata.sendString("I2C: Too few bytes received");
+    numBytes = Wire.available();
   }
 
   i2cRxData[0] = address;
diff --git a/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino b/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino
@@ -290,6 +290,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX
     Firmata.sendString("I2C: Too many bytes received");
   } else if (numBytes > Wire.available()) {
     Firmata.sendString("I2C: Too few bytes received");
+    numBytes = Wire.available();
   }
 
   i2cRxData[0] = address;

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX`
`206`	`206`	`Firmata.sendString("I2C: Too many bytes received");`
`207`	`207`	`} else if (numBytes > Wire.available()) {`
`208`	`208`	`Firmata.sendString("I2C: Too few bytes received");`
	`209`	`+ numBytes = Wire.available();`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`i2cRxData[0] = address;`
Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX`
`219`	`219`	`Firmata.sendString("I2C: Too many bytes received");`
`220`	`220`	`} else if (numBytes > Wire.available()) {`
`221`	`221`	`Firmata.sendString("I2C: Too few bytes received");`
	`222`	`+ numBytes = Wire.available();`
`222`	`223`	`}`
`223`	`224`
`224`	`225`	`i2cRxData[0] = address;`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX`
`203`	`203`	`Firmata.sendString("I2C: Too many bytes received");`
`204`	`204`	`} else if (numBytes > Wire.available()) {`
`205`	`205`	`Firmata.sendString("I2C: Too few bytes received");`
	`206`	`+ numBytes = Wire.available();`
`206`	`207`	`}`
`207`	`208`
`208`	`209`	`i2cRxData[0] = address;`
Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX`
`285`	`285`	`Firmata.sendString("I2C: Too many bytes received");`
`286`	`286`	`} else if (numBytes > Wire.available()) {`
`287`	`287`	`Firmata.sendString("I2C: Too few bytes received");`
	`288`	`+ numBytes = Wire.available();`
`288`	`289`	`}`
`289`	`290`
`290`	`291`	`i2cRxData[0] = address;`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX`
`231`	`231`	`Firmata.sendString("I2C: Too many bytes received");`
`232`	`232`	`} else if (numBytes > Wire.available()) {`
`233`	`233`	`Firmata.sendString("I2C: Too few bytes received");`
	`234`	`+ numBytes = Wire.available();`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`i2cRxData[0] = address;`
Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ void readAndReportData(byte address, int theRegister, byte numBytes, byte stopTX`
`290`	`290`	`Firmata.sendString("I2C: Too many bytes received");`
`291`	`291`	`} else if (numBytes > Wire.available()) {`
`292`	`292`	`Firmata.sendString("I2C: Too few bytes received");`
	`293`	`+ numBytes = Wire.available();`
`293`	`294`	`}`
`294`	`295`
`295`	`296`	`i2cRxData[0] = address;`