From 71da9f5e565a734aa2ec57728e9761fd1ae33540 Mon Sep 17 00:00:00 2001
From: Wayne Piekarski <wayne@tinmith.net>
Date: Wed, 5 May 2021 20:35:18 -0700
Subject: [PATCH 1/2] Add error checking to all I2C endTransmission() and
 requestFrom() calls

---
 src/MS5837.cpp | 41 ++++++++++++++++++++++++++++++-----------
 src/MS5837.h   |  5 ++++-
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/MS5837.cpp b/src/MS5837.cpp
index 3431e81..848742d 100644
--- a/src/MS5837.cpp
+++ b/src/MS5837.cpp
@@ -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);
@@ -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,2) != 2) {
+			return false;
+		}
 		C[i] = (_i2cPort->read() << 8) | _i2cPort->read();
 	}
 
@@ -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,3) != 3) {
+		return false;
+	}
 	D1_pres = 0;
 	D1_pres = _i2cPort->read();
 	D1_pres = (D1_pres << 8) | _i2cPort->read();
@@ -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,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() {
diff --git a/src/MS5837.h b/src/MS5837.h
index 77c72f6..edde3b1 100644
--- a/src/MS5837.h
+++ b/src/MS5837.h
@@ -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()
 
@@ -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.
 	 */

From 238a552b20d1c8723c6be336766f179c41e0b59d Mon Sep 17 00:00:00 2001
From: Wayne Piekarski <wayne@tinmith.net>
Date: Wed, 5 May 2021 20:47:27 -0700
Subject: [PATCH 2/2] Fix ambiguous casting warning so second int argument
 matches the uint8_t of the first argument

---
 src/MS5837.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MS5837.cpp b/src/MS5837.cpp
index 848742d..e3876c7 100644
--- a/src/MS5837.cpp
+++ b/src/MS5837.cpp
@@ -49,7 +49,7 @@ bool MS5837::init(TwoWire &wirePort) {
 			return false;
 		}
 
-		if (_i2cPort->requestFrom(MS5837_ADDR,2) != 2) {
+		if (_i2cPort->requestFrom(MS5837_ADDR,(uint8_t)2) != 2) {
 			return false;
 		}
 		C[i] = (_i2cPort->read() << 8) | _i2cPort->read();
@@ -123,7 +123,7 @@ bool MS5837::read() {
 		return false;
 	}
 
-	if (_i2cPort->requestFrom(MS5837_ADDR,3) != 3) {
+	if (_i2cPort->requestFrom(MS5837_ADDR,(uint8_t)3) != 3) {
 		return false;
 	}
 	D1_pres = 0;
@@ -146,7 +146,7 @@ bool MS5837::read() {
 		return false;
 	}
 
-	if (_i2cPort->requestFrom(MS5837_ADDR,3) != 3) {
+	if (_i2cPort->requestFrom(MS5837_ADDR,(uint8_t)3) != 3) {
 		return false;
 	}
 	D2_temp = 0;