Merge pull request #876 from yehoshuapw/hrs-driver-changes

Hrs driver changes
InfiniTimeOrg · Jan 26, 2022 · 9e9010c · 9e9010c
2 parents 458f5b8 + 464b689
commit 9e9010c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/drivers/Hrs3300.cpp b/src/drivers/Hrs3300.cpp
@@ -54,18 +54,18 @@ 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 (m << 8) | ((h & 0x0f) << 4) | (l & 0x0f) | ((l & 0x30) << 12);
+  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));
-  return (m << 3) | ((h & 0x3f) << 11) | (l & 0x07);
+  return ((h & 0x3f) << 11) | (m << 3) | (l & 0x07);
 }
 
 void Hrs3300::SetGain(uint8_t gain) {

diff --git 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);
 

diff --git a/src/heartratetask/HeartRateTask.cpp b/src/heartratetask/HeartRateTask.cpp
@@ -65,8 +65,7 @@ void HeartRateTask::Work() {
     }
 
     if (measurementStarted) {
-      auto hrs = heartRateSensor.ReadHrs();
-      ppg.Preprocess(hrs);
+      ppg.Preprocess(static_cast<float>(heartRateSensor.ReadHrs()));
       auto bpm = ppg.HeartRate();
 
       if (lastBpm == 0 && bpm == 0)