Skip to content

Commit a6a3c18

Browse files
committed
Code review updates
In computing number of addresses, divide by size of elements Check err against OK constant
1 parent 6226419 commit a6a3c18

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/sfeQwiicUltrasonic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ sfeTkError_t sfeQwiicUltrasonic::triggerAndRead(uint16_t &distance)
3838
sfeTkError_t err = _theBus->readRegisterRegion(kQwiicUltrasonicRegisterTrigger, rawData, 2, bytesRead);
3939

4040
// Check whether the read was successful
41-
if (err)
41+
if (err != kSTkErrOk)
4242
return err;
4343

4444
// Store raw data
@@ -58,7 +58,7 @@ sfeTkError_t sfeQwiicUltrasonic::changeAddress(const uint8_t &address)
5858
sfeTkError_t err = _theBus->writeByte(address | 0x80);
5959

6060
// Check whether the write was successful
61-
if (err)
61+
if (err != kSTkErrOk)
6262
return err;
6363

6464
// Update the address in the bus

src/sfeQwiicUltrasonic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Available I2C addresses of the Qwiic Ultrasonic
77
const uint8_t kQwiicUltrasonicAddresses[] = {0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
88
0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F};
9-
const uint8_t kQwiicUltrasonicNumAddresses = sizeof(kQwiicUltrasonicAddresses);
9+
const uint8_t kQwiicUltrasonicNumAddresses = sizeof(kQwiicUltrasonicAddresses) / sizeof(uint8_t);
1010
const uint8_t kQwiicUltrasonicMinAddress = kQwiicUltrasonicAddresses[0];
1111
const uint8_t kQwiicUltrasonicMaxAddress = kQwiicUltrasonicAddresses[15];
1212
const uint8_t kQwiicUltrasonicDefaultAddress = 0x2F;

0 commit comments

Comments
 (0)