Skip to content

Commit ad09daf

Browse files
committed
changed the return value from writeRegisterRegion - more consistant
1 parent 6dcea3f commit ad09daf

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

src/sfeTk/sfeTkIBus.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ class sfeTkIBus
7676
param devReg The device's register's address.
7777
@param data Data to write.
7878
79-
@retval int returns the number of bytes written, or kSTkErrFail on error
79+
@retval sfeTkError_t kSTkErrOk on successful execution
8080
8181
*/
82-
virtual int32_t writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length) = 0;
82+
virtual sfeTkError_t writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length) = 0;
8383

8484
/*--------------------------------------------------------------------------
8585
@brief Read a single byte from the given register

src/sfeTkArdI2C.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ sfeTkError_t sfeTkArdI2C::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite
126126
//
127127
// Returns the number of bytes written, < 0 is an error
128128
//
129-
int32_t sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
129+
sfeTkError_t sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
130130
{
131131
if (!_i2cPort)
132132
return kSTkErrBusNullPtr;
@@ -135,7 +135,7 @@ int32_t sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *data, si
135135
_i2cPort->write(devReg);
136136
_i2cPort->write(data, (int)length);
137137

138-
return _i2cPort->endTransmission() ? length : kSTkErrOk;
138+
return _i2cPort->endTransmission() ? kSTkErrFail : kSTkErrOk;
139139
}
140140

141141
//---------------------------------------------------------------------------------

src/sfeTkArdI2C.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class sfeTkArdI2C : public sfeTkII2C
9999
@param devReg The device's register's address.
100100
@param data Data to write.
101101
102-
@retval returns on error on success
102+
@retval returns kStkErrOk on success
103103
*/
104104
sfeTkError_t writeRegisterByte(uint8_t devReg, uint8_t data);
105105

@@ -110,7 +110,7 @@ class sfeTkArdI2C : public sfeTkII2C
110110
@param devReg The device's register's address.
111111
@param data Data to write.
112112
113-
@retval returns on error on success
113+
@retval returns kStkErrOk on success
114114
*/
115115
sfeTkError_t writeRegisterWord(uint8_t devReg, uint16_t data);
116116

@@ -123,9 +123,9 @@ class sfeTkArdI2C : public sfeTkII2C
123123
@param devReg The device's register's address.
124124
@param data Data to write.
125125
126-
@retval returns number of bytes written, < 0 is an error code
126+
@retval kStkErrOk on success
127127
*/
128-
virtual int32_t writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);
128+
virtual sfeTkError_t writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);
129129

130130
/*--------------------------------------------------------------------------
131131
@brief Reads a byte of data from the given register.
@@ -135,7 +135,7 @@ class sfeTkArdI2C : public sfeTkII2C
135135
@param devReg The device's register's address.
136136
@param data Data to read.
137137
138-
@retval on error on success
138+
@retval kStkErrOk on success
139139
*/
140140
sfeTkError_t readRegisterByte(uint8_t devReg, uint8_t &data);
141141

@@ -160,7 +160,7 @@ class sfeTkArdI2C : public sfeTkII2C
160160
@param devReg The device's register's address.
161161
@param data Data to write.
162162
163-
@retval 0 on success, < 0 on error - see error code
163+
@retval kStkErrOk on success
164164
*/
165165
sfeTkError_t readRegisterRegion(uint8_t devReg, uint8_t *data, size_t numBytes);
166166

src/sfeTkArdSPI.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ sfeTkError_t sfeTkArdSPI::init(bool bInit)
8686
//
8787
// Writes a byte to a given register.
8888
//
89-
// Returns true on success, false on failure
89+
// Returns kSTkErrOk on success
9090
//
9191
sfeTkError_t sfeTkArdSPI::writeRegisterByte(uint8_t devReg, uint8_t dataToWrite)
9292
{
@@ -113,7 +113,7 @@ sfeTkError_t sfeTkArdSPI::writeRegisterByte(uint8_t devReg, uint8_t dataToWrite)
113113
//
114114
// Writes a world to a given register.
115115
//
116-
// Returns true on success, false on failure
116+
// Returns kSTkErrOk on success
117117
//
118118
sfeTkError_t sfeTkArdSPI::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite)
119119
{
@@ -124,9 +124,9 @@ sfeTkError_t sfeTkArdSPI::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite
124124
//
125125
// Writes an array of bytes to a given register on the target address
126126
//
127-
// Returns the number of bytes written, < 0 is an error
127+
// Returns kSTkErrOk on success
128128
//
129-
int32_t sfeTkArdSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
129+
sfeTkError_t sfeTkArdSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
130130
{
131131
if (!_spiPort)
132132
return kSTkErrBusNullPtr;
@@ -145,7 +145,7 @@ int32_t sfeTkArdSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data, si
145145
digitalWrite(cs(), HIGH);
146146
_spiPort->endTransaction();
147147

148-
return length;
148+
return kSTkErrOk;
149149
}
150150

151151
sfeTkError_t sfeTkArdSPI::readRegisterByte(uint8_t devReg, uint8_t &data)
@@ -162,7 +162,7 @@ sfeTkError_t sfeTkArdSPI::readRegisterWord(uint8_t devReg, uint16_t &data)
162162
//
163163
// Reads an array of bytes to a given register on the target address
164164
//
165-
// Returns the number of bytes read, < 0 is an error
165+
// Returns kSTkErrOk on success
166166
//
167167
sfeTkError_t sfeTkArdSPI::readRegisterRegion(uint8_t devReg, uint8_t *data, size_t numBytes)
168168
{

src/sfeTkArdSPI.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ class sfeTkArdSPI : public sfeTkISPI
104104
@param devReg The device's register's address.
105105
@param data Data to write.
106106
107-
@retval int32_t - number of bytes written, < 0 = error value
107+
@retval sfeTkError_t - kSTkErrOk on success
108108
*/
109-
virtual int32_t writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);
109+
virtual sfeTkError_t writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);
110110

111111
/*--------------------------------------------------------------------------
112112
@brief Read a single byte from the given register

0 commit comments

Comments
 (0)