Skip to content

Commit 89dea8a

Browse files
authored
Merge pull request #6 from sparkfun/main
Catch the development branch to main
2 parents 42ae38d + 96f7fa8 commit 89dea8a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ The following examples are provided with the library
8585

8686
## Documentation
8787

88-
The full API and use documentation for this library is provided [here](http://docs.sparkfun.com/SparkFun_Qwiic_Ultrasonic_Arduino_Library/). For a quick reference, the main methods available in the library are listed [here](https://docs.sparkfun.com/SparkFun_Qwiic_Ultrasonic_Arduino_Library/functions.html).
88+
89+
The full API and use documentation for this library is provided [here](http://docs.sparkfun.com/SparkFun_Qwiic_Ultrasonic_Arduino_Library/). For a quick reference, the main methods available in the library are listed [here](https://docs.sparkfun.com/SparkFun_Qwiic_Ultrasonic_Arduino_Library/class_qwiic_ultrasonic.html).
8990

9091
Curious about the hardware this board works with - visit the SparkFun Qwiic Ultrasonic Distance Sensor [hardware repository](https://github.com/sparkfun/SparkFun_Ultrasonic_Distance_Sensor-Qwiic).
9192

docs/doxygen/doxygen-config

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ALWAYS_DETAILED_SEC = YES
171171
# operators of the base classes will not be shown.
172172
# The default value is: NO.
173173

174-
INLINE_INHERITED_MEMB = NO
174+
INLINE_INHERITED_MEMB = YES
175175

176176
# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
177177
# before files name in the file list and in the header files. If set to NO the

src/sfTk/sfDevUltrasonicDist.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ sfTkError_t sfDevUltrasonicDist::triggerAndRead(uint16_t &distance)
5555
uint8_t rawData[2] = {};
5656

5757
// Get the distance
58-
sfTkError_t err = _theBus->readRegisterRegion(kUltrasonicDistanceReadCommand, rawData, numBytes, bytesRead);
58+
sfTkError_t err = _theBus->readRegister(kUltrasonicDistanceReadCommand, rawData, numBytes, bytesRead);
5959

6060
// Check whether the read was successful
6161
if (err != ksfTkErrOk)
@@ -82,7 +82,7 @@ sfTkError_t sfDevUltrasonicDist::changeAddress(uint8_t &address)
8282
return ksfTkErrFail;
8383

8484
// Write the new address to the device. The first bit must be set to 1
85-
err = _theBus->writeByte(address | 0x80);
85+
err = _theBus->writeUInt8(address | 0x80);
8686
}
8787
else if (_fwVersion == kQwiicUltrasonicFWLatest)
8888
{
@@ -96,7 +96,7 @@ sfTkError_t sfDevUltrasonicDist::changeAddress(uint8_t &address)
9696
const uint8_t toWrite[2] = {kUltrasonicAddressChangeCommand, tempAddress};
9797

9898
// Write the new address to the device
99-
err = _theBus->writeRegion(toWrite, numBytes);
99+
err = _theBus->writeData(toWrite, numBytes);
100100
}
101101
else
102102
{

0 commit comments

Comments
 (0)