Have isSleeping be checked by SystemTask, and fix incorrect array size

InfiniTimeOrg · Dec 13, 2021 · fab8269 · fab8269
1 parent 7d50102
commit fab8269
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp
@@ -39,11 +39,12 @@ bool MotionController::ShouldWakeUp(bool isSleeping) {
   }
   return false;
 }
-bool MotionController::ShouldSleep(bool isSleeping) {
+bool MotionController::ShouldSleep() {
   bool ret = false;
 
-  if (y >= lastYForSleep + 192 && !isSleeping)
+  if (y >= lastYForSleep + 192) {
     ret = true;
+  }
 
   lastYForSleep = (y > 320) ? y : 320;
 

diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
@@ -29,7 +29,7 @@ namespace Pinetime {
         return nbSteps;
       }
       bool ShouldWakeUp(bool isSleeping);
-      bool ShouldSleep(bool isSleeping);
+      bool ShouldSleep();
 
       void IsSensorOk(bool isOk);
       bool IsSensorOk() const {

diff --git a/src/displayapp/screens/settings/SettingWakeUp.h b/src/displayapp/screens/settings/SettingWakeUp.h
@@ -20,7 +20,7 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
         uint8_t optionsTotal;
-        lv_obj_t* cbOption[5];
+        lv_obj_t* cbOption[4];
         // When UpdateSelected is called, it uses lv_checkbox_set_checked,
         // which can cause extra events to be fired,
         // which might trigger UpdateSelected again, causing a loop.

diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
@@ -474,7 +474,7 @@ void SystemTask::UpdateMotion() {
     GoToRunning();
   }
   if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::LowerWrist)) {
-    if (motionController.ShouldSleep(isSleeping))
+    if (motionController.ShouldSleep() && !isSleeping)
       PushMessage(Messages::GoToSleep);
   }
 }