Skip to content

Merge over. #21

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 4 commits into from
Dec 6, 2023
Merged

Merge over. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0502674
use the c header for ints
gigapod Dec 6, 2023
333043e
fix type issues
gigapod Dec 6, 2023
be298e1
quite compiler noise
gigapod Dec 6, 2023
34a6906
had wrong macro
gigapod Dec 6, 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: 1 addition & 1 deletion src/sfeTk/sfeTkError.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#pragma once


#include <cstdint>
#include <stdint.h>

//
// General Concept
Expand Down
8 changes: 4 additions & 4 deletions src/sfeTkArdI2C.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ sfeTkError_t sfeTkArdI2C::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite
if (!_i2cPort)
return kSTkErrBusNullPtr;

return writeRegisterRegion(devReg, (uint8_t *)&dataToWrite, sizeof(u_int16_t));
return writeRegisterRegion(devReg, (uint8_t *)&dataToWrite, sizeof(uint16_t));
}

//---------------------------------------------------------------------------------
Expand All @@ -126,7 +126,7 @@ sfeTkError_t sfeTkArdI2C::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite
//
// Returns the number of bytes written, < 0 is an error
//
sfeTkError_t sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
int32_t sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
{
if (!_i2cPort)
return kSTkErrBusNullPtr;
Expand All @@ -135,7 +135,7 @@ sfeTkError_t sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *dat
_i2cPort->write(devReg);
_i2cPort->write(data, (int)length);

return _i2cPort->endTransmission() ? kSTkErrFail : kSTkErrOk;
return _i2cPort->endTransmission() ? length : kSTkErrOk;
}

//---------------------------------------------------------------------------------
Expand Down Expand Up @@ -204,7 +204,7 @@ int32_t sfeTkArdI2C::readRegisterRegion(uint8_t devReg, uint8_t *data, size_t nu
uint16_t nOrig = numBytes; // original number of bytes.
uint8_t nChunk;
uint16_t nReturned;
int i; // counter in loop
uint16_t i; // counter in loop
bool bFirstInter = true; // Flag for first iteration - used to send devRegister

while (numBytes > 0)
Expand Down
2 changes: 1 addition & 1 deletion src/sfeTkArdI2C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class sfeTkArdI2C : public sfeTkII2C

@retval returns number of bytes written, < 0 is an error code
*/
virtual int writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);
virtual int32_t writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);

/*--------------------------------------------------------------------------
@brief Reads a byte of data from the given register.
Expand Down
6 changes: 3 additions & 3 deletions src/sfeTkArdSPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ sfeTkError_t sfeTkArdSPI::init(SPIClass &spiPort, SPISettings &busSPISettings, u
sfeTkError_t sfeTkArdSPI::init(uint8_t csPin, bool bInit)
{
// If the transaction settings are not provided by the user they are built here.
SPISettings spiSettings = SPISettings(3000000, SPI_MSBFIRST, SPI_MODE3);
SPISettings spiSettings = SPISettings(3000000, MSBFIRST, SPI_MODE3);

// In addition of the port is not provided by the user, it defaults to SPI here.
return init(SPI, spiSettings, csPin, bInit);
Expand Down Expand Up @@ -126,7 +126,7 @@ sfeTkError_t sfeTkArdSPI::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite
//
// Returns the number of bytes written, < 0 is an error
//
int sfeTkArdSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
int32_t sfeTkArdSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
{
if (!_spiPort)
return kSTkErrBusNullPtr;
Expand Down Expand Up @@ -178,7 +178,7 @@ sfeTkError_t sfeTkArdSPI::readRegisterRegion(uint8_t devReg, uint8_t *data, size
// A leading "1" must be added to transfer with devRegister to indicate a "read"
_spiPort->transfer(devReg | kSPIReadBit);

for (int i = 0; i < numBytes; i++)
for (size_t i = 0; i < numBytes; i++)
*data++ = _spiPort->transfer(0x00);

// End transaction
Expand Down