Skip to content

Fix count overflow on readBytes/readWords #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2023
Merged

Fix count overflow on readBytes/readWords #750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Arduino/I2Cdev/I2Cdev.cpp
View file
Original file line number Diff line number Diff line change
@@ -217,7 +217,7 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
Serial.print("...");
#endif

int8_t count = 0;
uint8_t count = 0;
uint32_t t1 = millis();

#if (I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
@@ -329,7 +329,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
Serial.print("...");
#endif

int8_t count = 0;
uint8_t count = 0;
uint32_t t1 = millis();

#if I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE
2 changes: 1 addition & 1 deletion Arduino/IAQ2000/IAQ2000.cpp
View file
Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@ int8_t IAQ2000::readAllBytes(uint8_t devAddr, uint8_t length, uint8_t *data, uin
Serial.print(" bytes...");
#endif

int8_t count = 0;
uint8_t count = 0;

Wire.requestFrom(devAddr, length);

4 changes: 2 additions & 2 deletions MSP430/I2Cdev/I2Cdev.cpp
View file
Original file line number Diff line number Diff line change
@@ -215,7 +215,7 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
Serial.print("...");
#endif

int8_t count = 0;
uint8_t count = 0;
uint32_t t1 = millis();

#if (I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE)
@@ -330,7 +330,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
Serial.print("...");
#endif

int8_t count = 0;
uint8_t count = 0;
uint32_t t1 = millis();

#if (I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE)
4 changes: 2 additions & 2 deletions PIC18/I2Cdev/I2Cdev.c
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ THE SOFTWARE.
* @return Number of bytes read (-1 indicates failure)
*/
int8_t I2Cdev_readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data) {
int8_t count = 0;
uint8_t count = 0;

// S
IdleI2C();
@@ -104,7 +104,7 @@ int8_t I2Cdev_readByte(uint8_t devAddr, uint8_t regAddr, uint8_t *data) {
* @return Number of words read (-1 indicates failure)
*/
int8_t I2Cdev_readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data) {
int8_t count = 0;
uint8_t count = 0;

// S
IdleI2C();
4 changes: 2 additions & 2 deletions RP2040/I2Cdev/I2Cdev.cpp
View file
Original file line number Diff line number Diff line change
@@ -149,7 +149,7 @@ int8_t I2Cdev::readWord(uint8_t devAddr, uint8_t regAddr, uint16_t *data, uint32
* @return Number of bytes read (-1 indicates failure)
*/
int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data, uint32_t timeout) {
int8_t count = 0;
uint8_t count = 0;

i2c_write_blocking(i2c_default, devAddr, &regAddr, 1, true);
count = i2c_read_timeout_us(i2c_default, devAddr, data, length, false, timeout * 1000);
@@ -166,7 +166,7 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
* @return Number of words read (-1 indicates failure)
*/
int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data, uint32_t timeout) {
int8_t count = 0;
uint8_t count = 0;
uint8_t data_buf[length*2];

i2c_write_blocking(i2c_default, devAddr, &regAddr, 1, true);