Skip to content

Add error checks for all I2C reads and writes and return error values #26

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

Open
waynepiekarski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add error checks for all I2C reads and writes and return error values #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71da9f5
Add error checking to all I2C endTransmission() and requestFrom() calls
waynepiekarski May 6, 2021
238a552
Fix ambiguous casting warning so second int argument matches the uint…
waynepiekarski May 6, 2021
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
41 changes: 30 additions & 11 deletions src/MS5837.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ bool MS5837::init(TwoWire &wirePort) {
// Reset the MS5837, per datasheet
_i2cPort->beginTransmission(MS5837_ADDR);
_i2cPort->write(MS5837_RESET);
_i2cPort->endTransmission();
if (_i2cPort->endTransmission() != 0) {
return false;
}

// Wait for reset to complete
delay(10);
Expand All @@ -43,9 +45,13 @@ bool MS5837::init(TwoWire &wirePort) {
for ( uint8_t i = 0 ; i < 7 ; i++ ) {
_i2cPort->beginTransmission(MS5837_ADDR);
_i2cPort->write(MS5837_PROM_READ+i*2);
_i2cPort->endTransmission();
if (_i2cPort->endTransmission() != 0) {
return false;
}

_i2cPort->requestFrom(MS5837_ADDR,2);
if (_i2cPort->requestFrom(MS5837_ADDR,(uint8_t)2) != 2) {
return false;
}
C[i] = (_i2cPort->read() << 8) | _i2cPort->read();
}

Expand Down Expand Up @@ -95,25 +101,31 @@ void MS5837::setFluidDensity(float density) {
fluidDensity = density;
}

void MS5837::read() {
bool MS5837::read() {
//Check that _i2cPort is not NULL (i.e. has the user forgoten to call .init or .begin?)
if (_i2cPort == NULL)
{
return;
return false;
}

// Request D1 conversion
_i2cPort->beginTransmission(MS5837_ADDR);
_i2cPort->write(MS5837_CONVERT_D1_8192);
_i2cPort->endTransmission();
if (_i2cPort->endTransmission() != 0) {
return false;
}

delay(20); // Max conversion time per datasheet

_i2cPort->beginTransmission(MS5837_ADDR);
_i2cPort->write(MS5837_ADC_READ);
_i2cPort->endTransmission();
if (_i2cPort->endTransmission() != 0) {
return false;
}

_i2cPort->requestFrom(MS5837_ADDR,3);
if (_i2cPort->requestFrom(MS5837_ADDR,(uint8_t)3) != 3) {
return false;
}
D1_pres = 0;
D1_pres = _i2cPort->read();
D1_pres = (D1_pres << 8) | _i2cPort->read();
Expand All @@ -122,21 +134,28 @@ void MS5837::read() {
// Request D2 conversion
_i2cPort->beginTransmission(MS5837_ADDR);
_i2cPort->write(MS5837_CONVERT_D2_8192);
_i2cPort->endTransmission();
if (_i2cPort->endTransmission() != 0) {
return false;
}

delay(20); // Max conversion time per datasheet

_i2cPort->beginTransmission(MS5837_ADDR);
_i2cPort->write(MS5837_ADC_READ);
_i2cPort->endTransmission();
if (_i2cPort->endTransmission() != 0) {
return false;
}

_i2cPort->requestFrom(MS5837_ADDR,3);
if (_i2cPort->requestFrom(MS5837_ADDR,(uint8_t)3) != 3) {
return false;
}
D2_temp = 0;
D2_temp = _i2cPort->read();
D2_temp = (D2_temp << 8) | _i2cPort->read();
D2_temp = (D2_temp << 8) | _i2cPort->read();

calculate();
return true;
}

void MS5837::calculate() {
Expand Down
5 changes: 4 additions & 1 deletion src/MS5837.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class MS5837 {

MS5837();

/** Returns false if an error occurred, otherwise true for success.
*/
bool init(TwoWire &wirePort = Wire);
bool begin(TwoWire &wirePort = Wire); // Calls init()

Expand All @@ -67,8 +69,9 @@ class MS5837 {
void setFluidDensity(float density);

/** The read from I2C takes up to 40 ms, so use sparingly is possible.
* Returns false if an I2C error occurred, otherwise true for success.
*/
void read();
bool read();

/** Pressure returned in mbar or mbar*conversion rate.
*/
Expand Down