Add support for sleepSteps in MotionController

Author: JustScott

src/components/motion/MotionController.cpp

@@ -35,6 +35,9 @@ namespace {
   }
 }
 
+MotionController::MotionController(Controllers::Settings& settingsController) : settingsController {settingsController} {
+}
+
 void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) {
   if (this->nbSteps != nbSteps && service != nullptr) {
     service->OnNewStepCountValue(nbSteps);

src/components/motion/MotionController.h

@@ -6,12 +6,15 @@
 
 #include "drivers/Bma421.h"
 #include "components/ble/MotionService.h"
+#include "components/settings/Settings.h"
 #include "utility/CircularBuffer.h"
 
 namespace Pinetime {
   namespace Controllers {
     class MotionController {
     public:
+      MotionController(Controllers::Settings& settingsController);
+
       enum class DeviceTypes {
         Unknown,
         BMA421,
@@ -33,7 +36,10 @@ namespace Pinetime {
       }
 
       uint32_t NbSteps() const {
-        return nbSteps;
+        if (nbSteps > settingsController.sleepSteps) {
+          return nbSteps - settingsController.sleepSteps;
+        }
+        return 0;
       }
 
       void ResetTrip() {
@@ -100,6 +106,7 @@ namespace Pinetime {
 
       DeviceTypes deviceType = DeviceTypes::Unknown;
       Pinetime::Controllers::MotionService* service = nullptr;
+      Controllers::Settings& settingsController;
     };
   }
 }

src/components/settings/Settings.h

@@ -270,6 +270,7 @@ namespace Pinetime {
       }
 
       bool sleepDisabledBle = false;
+      uint32_t sleepSteps = 0;
 
       void setSleepOption(SleepOption option, bool enabled) {
         if (enabled != isSleepOptionOn(option)) {

src/main.cpp

@@ -103,7 +103,7 @@ Pinetime::Controllers::MotorController motorController {};
 Pinetime::Controllers::DateTime dateTimeController {settingsController};
 Pinetime::Drivers::Watchdog watchdog;
 Pinetime::Controllers::NotificationManager notificationManager;
-Pinetime::Controllers::MotionController motionController;
+Pinetime::Controllers::MotionController motionController {settingsController};
 Pinetime::Controllers::AlarmController alarmController {dateTimeController, fs};
 Pinetime::Controllers::TouchHandler touchHandler;
 Pinetime::Controllers::ButtonHandler buttonHandler;

src/systemtask/SystemTask.cpp

@@ -321,6 +321,7 @@ void SystemTask::Work() {
           // We might be sleeping (with TWI device disabled.
           // Remember we'll have to reset the counter next time we're awake
           stepCounterMustBeReset = true;
+          settingsController.sleepSteps = 0;
           break;
         case Messages::OnNewHour:
         case Messages::OnNewHalfHour: