Skip to content

Commit 4ba0f03

Browse files
committed
Merge branch 'readregion_api_change' of https://github.com/sparkfun/SparkFun_Toolkit into readregion_api_change
2 parents 21e5587 + 26ad778 commit 4ba0f03

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# VSCode directories
2+
.vscode
3+

src/sfeTkArdI2C.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@ sfeTkError_t sfeTkArdI2C::readRegisterRegion(uint8_t devReg, uint8_t *data, size
220220
if (!_i2cPort)
221221
return kSTkErrBusNotInit;
222222

223+
// Buffer valid?
224+
if (!data)
225+
return kSTkErrBusNullBuffer;
226+
223227
readBytes = 0;
224228

225229
uint16_t nOrig = numBytes; // original number of bytes.
@@ -261,7 +265,7 @@ sfeTkError_t sfeTkArdI2C::readRegisterRegion(uint8_t devReg, uint8_t *data, size
261265

262266
} // end while
263267

264-
readBytes = nOrig - numBytes;
268+
readBytes = nOrig - numBytes; // Bytes read.
265269

266-
return kSTkErrOk;
270+
return (readBytes == nOrig) ? kSTkErrOk : kSTkErrBusUnderRead; // Success
267271
}

src/sfeTkArdI2C.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,12 @@ class sfeTkArdI2C : public sfeTkII2C
168168
@note This method is virtual to allow it to be overridden to support a device that requires a unique impl
169169
170170
@param devReg The device's register's address.
171-
@param data Data to write.
172-
@param numBytes - length of data
171+
@param data Data being read.
172+
@param numBytes Number of bytes to read.
173173
@param[out] readBytes - Number of bytes read
174174
175-
@retval kStkErrOk on success
175+
176+
@retval kSTkErrOk on success
176177
*/
177178
sfeTkError_t readRegisterRegion(uint8_t devReg, uint8_t *data, size_t numBytes, size_t &readBytes);
178179

0 commit comments

Comments
 (0)