Merge branch 'develop' of JF/PineTime into master

2 files changed, 8 insertions, 8 deletions

diff --git a/src/drivers/Hrs3300.cpp b/src/drivers/Hrs3300.cpp
index c14fe7a..ec620af 100644
--- a/src/drivers/Hrs3300.cpp
+++ b/src/drivers/Hrs3300.cpp
@@ -36,8 +36,8 @@ void Hrs3300::Init() {
   // HRS and ALS both in 16-bit mode
   WriteRegister(static_cast<uint8_t>(Registers::Res), 0x88);
 
-  // 64x gain
-  WriteRegister(static_cast<uint8_t>(Registers::Hgain), 0x10);
+  // 8x gain, non default, reduced value for better readings
+  WriteRegister(static_cast<uint8_t>(Registers::Hgain), 0xc);
 }
 
 void Hrs3300::Enable() {
@@ -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
index 01310c6..8bbdc69 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);