Skip to content

Commit 2046a04

Browse files
committed
Revert (most) writeRegisterByte changes
1 parent e45932d commit 2046a04

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/SparkFun_Qwiic_KX13X.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ int QwDevKX13X::writeRegisterRegion(uint8_t reg, uint8_t *data, uint16_t len)
16231623
//
16241624
int QwDevKX13X::writeRegisterByte(uint8_t reg, uint8_t data)
16251625
{
1626-
return (_sfeBus->writeRegisterByte(_i2cAddress, reg, data));
1626+
return (_sfeBus->writeRegisterByte(_i2cAddress, reg, data) ? 0 : -1);
16271627
}
16281628

16291629
//***************************************** KX132 *********************************************************

src/sfe_bus.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ bool QwI2C::ping(uint8_t i2c_address)
121121
//
122122
// Write a byte to a register
123123

124-
int QwI2C::writeRegisterByte(uint8_t i2c_address, uint8_t offset, uint8_t dataToWrite)
124+
bool QwI2C::writeRegisterByte(uint8_t i2c_address, uint8_t offset, uint8_t dataToWrite)
125125
{
126126

127127
if (!_i2cPort)
@@ -130,7 +130,7 @@ int QwI2C::writeRegisterByte(uint8_t i2c_address, uint8_t offset, uint8_t dataTo
130130
_i2cPort->beginTransmission(i2c_address);
131131
_i2cPort->write(offset);
132132
_i2cPort->write(dataToWrite);
133-
return _i2cPort->endTransmission() == 0 ? 0 : -1; // 0 = success, -1 = error
133+
return (_i2cPort->endTransmission() == 0); // true = success, false = error
134134
}
135135

136136

@@ -285,11 +285,11 @@ bool SfeSPI::ping(uint8_t i2c_address)
285285
//
286286
// Write a byte to a register
287287

288-
int SfeSPI::writeRegisterByte(uint8_t i2c_address, uint8_t offset, uint8_t dataToWrite)
288+
bool SfeSPI::writeRegisterByte(uint8_t i2c_address, uint8_t offset, uint8_t dataToWrite)
289289
{
290290

291291
if( !_spiPort )
292-
return -1;
292+
return false;
293293

294294
// Apply settings
295295
_spiPort->beginTransaction(_sfeSPISettings);
@@ -303,7 +303,7 @@ int SfeSPI::writeRegisterByte(uint8_t i2c_address, uint8_t offset, uint8_t dataT
303303
digitalWrite(_cs, HIGH);
304304
_spiPort->endTransaction();
305305

306-
return 0;
306+
return true;
307307
}
308308

309309

src/sfe_bus.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class QwIDeviceBus
6262

6363
virtual bool ping(uint8_t address) = 0;
6464

65-
virtual int writeRegisterByte(uint8_t address, uint8_t offset, uint8_t data) = 0;
65+
virtual bool writeRegisterByte(uint8_t address, uint8_t offset, uint8_t data) = 0;
6666

6767
virtual int writeRegisterRegion(uint8_t address, uint8_t offset, const uint8_t* data, uint16_t length) = 0;
6868

@@ -84,7 +84,7 @@ class QwI2C : public QwIDeviceBus
8484

8585
bool ping(uint8_t address);
8686

87-
int writeRegisterByte(uint8_t address, uint8_t offset, uint8_t data);
87+
bool writeRegisterByte(uint8_t address, uint8_t offset, uint8_t data);
8888

8989
int writeRegisterRegion(uint8_t address, uint8_t offset, const uint8_t* data, uint16_t length);
9090

@@ -111,7 +111,7 @@ class SfeSPI : public QwIDeviceBus
111111

112112
bool ping(uint8_t address);
113113

114-
int writeRegisterByte(uint8_t address, uint8_t offset, uint8_t data);
114+
bool writeRegisterByte(uint8_t address, uint8_t offset, uint8_t data);
115115

116116
int writeRegisterRegion(uint8_t address, uint8_t offset, const uint8_t* data, uint16_t length);
117117

0 commit comments

Comments
 (0)