Skip to content

Adderr #28

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

Merged
merged 10 commits into from
Dec 13, 2023
Merged

Adderr #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5da9146
Add git files.
SFE-Brudnerd Dec 5, 2023
e83827b
Merge pull request #20 from sparkfun/main
SFE-Brudnerd Dec 6, 2023
6612943
Merge pull request #21 from sparkfun/main
SFE-Brudnerd Dec 6, 2023
dbd32be
Merge pull request #22 from sparkfun/main
SFE-Brudnerd Dec 7, 2023
5b6509d
Merge pull request #24 from sparkfun/main
SFE-Brudnerd Dec 7, 2023
cf48269
Merge pull request #26 from sparkfun/main
SFE-Brudnerd Dec 12, 2023
9b7a93a
Update readRegisterRegion.
SFE-Brudnerd Dec 12, 2023
39a5116
Made ref instead of ptr.
SFE-Brudnerd Dec 12, 2023
aba6692
retype readRegisterRegion
SFE-Brudnerd Dec 12, 2023
a3fd5c2
Merge branch 'readregion_api_change' into adderr
gigapod Dec 12, 2023
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
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# VSCode directories
.vscode

8 changes: 6 additions & 2 deletions src/sfeTkArdI2C.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,10 @@ sfeTkError_t sfeTkArdI2C::readRegisterRegion(uint8_t devReg, uint8_t *data, size
if (!_i2cPort)
return kSTkErrBusNotInit;

// Buffer valid?
if (!data)
return kSTkErrBusNullBuffer;

readBytes = 0;

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

} // end while

readBytes = nOrig - numBytes;
readBytes = nOrig - numBytes; // Bytes read.

return kSTkErrOk;
return (readBytes == nOrig) ? kSTkErrOk : kSTkErrBusUnderRead; // Success
}
7 changes: 4 additions & 3 deletions src/sfeTkArdI2C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,12 @@ class sfeTkArdI2C : public sfeTkII2C
@note This method is virtual to allow it to be overridden to support a device that requires a unique impl

@param devReg The device's register's address.
@param data Data to write.
@param numBytes - length of data
@param data Data being read.
@param numBytes Number of bytes to read.
@param[out] readBytes - Number of bytes read

@retval kStkErrOk on success

@retval kSTkErrOk on success
*/
sfeTkError_t readRegisterRegion(uint8_t devReg, uint8_t *data, size_t numBytes, size_t &readBytes);

Expand Down