summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorYehoshua Pesach Wallach <yehoshuapw@gmail.com>2021-12-13 12:47:52 +0200
committerYehoshua Pesach Wallach <yehoshuapw@gmail.com>2021-12-13 12:47:52 +0200
commit464b689a03bca06099fba316b4c6c66c619d5521 (patch)
tree56ee0498a93b0dae1444726ddb9875ff64d01498 /src/drivers
parent4cc95091ab07f0b90c078f087f3826e845443873 (diff)
changed ReadHrs and ReadAls to uint32, and did static_cast instead of hidden cast when using it
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/Hrs3300.cpp4
-rw-r--r--src/drivers/Hrs3300.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/Hrs3300.cpp b/src/drivers/Hrs3300.cpp
index 45458adc..cfc476cb 100644
--- a/src/drivers/Hrs3300.cpp
+++ b/src/drivers/Hrs3300.cpp
@@ -54,14 +54,14 @@ void Hrs3300::Disable() {
WriteRegister(static_cast<uint8_t>(Registers::Enable), value);
}
-uint16_t Hrs3300::ReadHrs() {
+uint32_t Hrs3300::ReadHrs() {
auto m = ReadRegister(static_cast<uint8_t>(Registers::C0DataM));
auto h = ReadRegister(static_cast<uint8_t>(Registers::C0DataH));
auto l = ReadRegister(static_cast<uint8_t>(Registers::C0dataL));
return ((l & 0x30) << 12) | (m << 8) | ((h & 0x0f) << 4) | (l & 0x0f);
}
-uint16_t Hrs3300::ReadAls() {
+uint32_t Hrs3300::ReadAls() {
auto m = ReadRegister(static_cast<uint8_t>(Registers::C1dataM));
auto h = ReadRegister(static_cast<uint8_t>(Registers::C1dataH));
auto l = ReadRegister(static_cast<uint8_t>(Registers::C1dataL));
diff --git a/src/drivers/Hrs3300.h b/src/drivers/Hrs3300.h
index 01310c62..8bbdc69a 100644
--- a/src/drivers/Hrs3300.h
+++ b/src/drivers/Hrs3300.h
@@ -30,8 +30,8 @@ namespace Pinetime {
void Init();
void Enable();
void Disable();
- uint16_t ReadHrs();
- uint16_t ReadAls();
+ uint32_t ReadHrs();
+ uint32_t ReadAls();
void SetGain(uint8_t gain);
void SetDrive(uint8_t drive);