feedc0de/Adafruit_BMP085_Unified
1
0
Fork 0
forked from adafruit/Adafruit_BMP085_Unified
Code Pull Requests Activity

optimizations and fixes

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-07-13 21:36:50 +02:00
parent 862f0474ec
commit c2b9b3e15c
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Adafruit_BMP085_U.cpp
View File

@@ -101,8 +101,9 @@ static bool read8(byte reg, uint8_t *value) {
if (const auto result = Wire.endTransmission(); result != I2C_ERROR_OK) { DBGPRNT("fail %hhu", result); succ = false; } if (const auto result = Wire.endTransmission(); result != I2C_ERROR_OK) { DBGPRNT("fail %hhu", result); succ = false; }
if (const auto result = Wire.requestFrom((uint8_t)BMP085_ADDRESS, (byte)1); result != 1) { DBGPRNT("fail %hhu", result); succ = false; } if (const auto result = Wire.requestFrom((uint8_t)BMP085_ADDRESS, (byte)1); result != 1) { DBGPRNT("fail %hhu", result); succ = false; }
if (const auto result = WIRE_READ(); result == -1) { DBGPRNT("fail %i", result); succ = false; } if (const auto result = WIRE_READ(); result == -1) { DBGPRNT("fail %i", result); succ = false; }
else *value = result; else if (succ) *value = result;
//if (const auto result = Wire.endTransmission(); result != I2C_ERROR_OK) { DBGPRNT("fail %hhu", result); succ = false; } //if (const auto result = Wire.endTransmission(); result != I2C_ERROR_OK) { DBGPRNT("fail %hhu", result); succ = false; }
Wire.endTransmission(); Wire.endTransmission();
@@ -127,7 +128,8 @@ static bool read16(byte reg, uint16_t *value) {
const auto result1 = WIRE_READ(); const auto result1 = WIRE_READ();
if (result0 == -1) { DBGPRNT("fail %i", result0); succ = false; } if (result0 == -1) { DBGPRNT("fail %i", result0); succ = false; }
else if (result1 == -1) { DBGPRNT("fail %i", result1); succ = false; } else if (result1 == -1) { DBGPRNT("fail %i", result1); succ = false; }
else { *value = (result0 << 8) | result1; }
if (succ) { *value = (result0 << 8) | result1; }
//if (const auto result = Wire.endTransmission(); result != I2C_ERROR_OK) { DBGPRNT("fail %hhu", result); succ = false; } //if (const auto result = Wire.endTransmission(); result != I2C_ERROR_OK) { DBGPRNT("fail %hhu", result); succ = false; }
Wire.endTransmission(); Wire.endTransmission();
@@ -144,7 +146,7 @@ static bool readS16(byte reg, int16_t *value) {
bool succ{true}; bool succ{true};
uint16_t i; uint16_t i;
if (!read16(reg, &i)) { DBGPRNT("fail"); succ = false; } if (!read16(reg, &i)) { DBGPRNT("fail"); succ = false; }
else *value = (int16_t)i; if (succ) *value = (int16_t)i;
return succ; return succ;
} }
@@ -269,19 +271,6 @@ int32_t Adafruit_BMP085_Unified::computeB5(int32_t ut) {
return X1 + X2; return X1 + X2;
} }
/***************************************************************************
CONSTRUCTOR
***************************************************************************/
/**************************************************************************/
/*!
@brief Instantiates a new Adafruit_BMP085_Unified class
*/
/**************************************************************************/
Adafruit_BMP085_Unified::Adafruit_BMP085_Unified(int32_t sensorID) {
_sensorID = sensorID;
}
/*************************************************************************** /***************************************************************************
PUBLIC FUNCTIONS PUBLIC FUNCTIONS
***************************************************************************/ ***************************************************************************/

4
Adafruit_BMP085_U.h
View File

@@ -85,8 +85,8 @@ typedef struct {
*/ */
class Adafruit_BMP085_Unified : public Adafruit_Sensor { class Adafruit_BMP085_Unified : public Adafruit_Sensor {
public: public:
Adafruit_BMP085_Unified( Adafruit_BMP085_Unified(int32_t sensorID = -1) : //!< @param sensorID ID of the BMP085 sensor
int32_t sensorID = -1); //!< @param sensorID ID of the BMP085 sensor _sensorID{sensorID} {}
/*! /*!
* @brief Starts I2C connection * @brief Starts I2C connection