Improve and simplify Raise to Wake algorithm

Squash commit of the following commits:

Adjust trigger values for Raise to Wake

Also handle isSleeping in SystemTask

Tweak the raise to wake values a bit more

Make lastY variable more generic and improve raise to wake more

Fix incorrect function call in SystemTask

Remove LastY from motion app

Overhaul raise wake to work more consistently

Also adds 2 new lines to the motion app, just for
testing purposes. White is deltaY and purple is
deltaZ.

Remove define statements and tweak values

src/components/motion/MotionController.cpp

@@ -11,6 +11,8 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
     service->OnNewMotionValues(x, y, z);
   }
 
+  deltaY = y - this->y;
+  deltaZ = z - this->z;
   this->x = x;
   this->y = y;
   this->z = z;
@@ -21,27 +23,27 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
   }
 }
 
-bool MotionController::Should_RaiseWake(bool isSleeping) {
-  if ((x + 335) <= 670 && z < 0) {
-    if (not isSleeping) {
-      if (y <= 0) {
-        return false;
-      } else {
-        lastYForWakeUp = 0;
-        return false;
-      }
-    }
+bool MotionController::ShouldRaiseWake() const {
+  if (x < -raiseWakeXThresh || x > raiseWakeXThresh || y > raiseWakeYThresh) {
+    return false;
+  }
 
-    if (y >= 0) {
-      lastYForWakeUp = 0;
+  if (std::abs(y) > std::abs(z)) {
+    if (deltaZ < raiseWakeSpeed) {
       return false;
     }
-    if (y + 230 < lastYForWakeUp) {
-      lastYForWakeUp = y;
-      return true;
+    return true;
+  }
+  if (z < 0) {
+    if (deltaY > -raiseWakeSpeed) {
+      return false;
     }
+    return true;
+  }
+  if (deltaY < raiseWakeSpeed) {
+    return false;
   }
-  return false;
+  return true;
 }
 
 bool MotionController::Should_ShakeWake(uint16_t thresh) {

src/components/motion/MotionController.h

@@ -25,6 +25,12 @@ namespace Pinetime {
       int16_t Z() const {
         return z;
       }
+      int16_t DeltaY() const {
+        return deltaY;
+      }
+      int16_t DeltaZ() const {
+        return deltaZ;
+      }
       uint32_t NbSteps() const {
         return nbSteps;
       }
@@ -36,8 +42,8 @@ namespace Pinetime {
         return currentTripSteps;
       }
 
+      bool ShouldRaiseWake() const;
       bool Should_ShakeWake(uint16_t thresh);
-      bool Should_RaiseWake(bool isSleeping);
       int32_t currentShakeSpeed();
       void IsSensorOk(bool isOk);
       bool IsSensorOk() const {
@@ -54,10 +60,14 @@ namespace Pinetime {
     private:
       uint32_t nbSteps;
       uint32_t currentTripSteps = 0;
-      int16_t x;
-      int16_t y;
-      int16_t z;
-      int16_t lastYForWakeUp = 0;
+      int16_t x = 0;
+      int16_t y = 0;
+      int16_t z = 0;
+      int16_t deltaY = 0;
+      int16_t deltaZ = 0;
+      const int16_t raiseWakeXThresh = 512;
+      const int16_t raiseWakeYThresh = 0;
+      const int16_t raiseWakeSpeed = 192;
       bool isSensorOk = false;
       DeviceTypes deviceType = DeviceTypes::Unknown;
       Pinetime::Controllers::MotionService* service = nullptr;
@@ -69,4 +79,4 @@ namespace Pinetime {
       uint32_t lastShakeTime = 0;
     };
   }
-}
+}

src/systemtask/SystemTask.cpp

@@ -495,8 +495,8 @@ void SystemTask::UpdateMotion() {
   motionController.IsSensorOk(motionSensor.IsOk());
   motionController.Update(motionValues.x, motionValues.y, motionValues.z, motionValues.steps);
 
-  if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) &&
-      motionController.Should_RaiseWake(state == SystemTaskState::Sleeping)) {
+  if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) && state == SystemTaskState::Sleeping &&
+      motionController.ShouldRaiseWake()) {
     GoToRunning();
   }
   if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) &&