2 files changed, 35 insertions, 4 deletions

diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp
index 97a8feb2..7dd32127 100644
--- a/src/components/motion/MotionController.cpp
+++ b/src/components/motion/MotionController.cpp
@@ -1,5 +1,5 @@
 #include "components/motion/MotionController.h"
-
+#include "os/os_cputime.h"
 using namespace Pinetime::Controllers;
 
 void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) {
@@ -7,7 +7,7 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
     service->OnNewStepCountValue(nbSteps);
   }
 
-  if(service != nullptr && (this->x != x || this->y != y || this->z != z)) {
+  if (service != nullptr && (this->x != x || this->y != y || this->z != z)) {
     service->OnNewMotionValues(x, y, z);
   }
 
@@ -21,7 +21,7 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
   }
 }
 
-bool MotionController::ShouldWakeUp(bool isSleeping) {
+bool MotionController::Should_RaiseWake(bool isSleeping) {
   if ((x + 335) <= 670 && z < 0) {
     if (not isSleeping) {
       if (y <= 0) {
@@ -43,6 +43,29 @@ bool MotionController::ShouldWakeUp(bool isSleeping) {
   }
   return false;
 }
+
+bool MotionController::Should_ShakeWake(uint16_t thresh) {
+  bool wake = false;
+  auto diff = xTaskGetTickCount() - lastShakeTime;
+  lastShakeTime = xTaskGetTickCount();
+  /* Currently Polling at 10hz, If this ever goes faster scalar and EMA might need adjusting */
+  int32_t speed = std::abs(z + (y / 2) + (x / 4) - lastYForShake - lastZForShake) / diff * 100;
+  //(.2 * speed) + ((1 - .2) * accumulatedspeed);
+  // implemented without floats as .25Alpha
+  accumulatedspeed = (speed / 5) + ((accumulatedspeed / 5) * 4);
+
+  if (accumulatedspeed > thresh) {
+    wake = true;
+  }
+  lastXForShake = x / 4;
+  lastYForShake = y / 2;
+  lastZForShake = z;
+  return wake;
+}
+int32_t MotionController::currentShakeSpeed() {
+  return accumulatedspeed;
+}
+
 void MotionController::IsSensorOk(bool isOk) {
   isSensorOk = isOk;
 }
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index 3eac7176..f80b11b9 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -35,8 +35,10 @@ namespace Pinetime {
       uint32_t GetTripSteps() const {
         return currentTripSteps;
       }
-      bool ShouldWakeUp(bool isSleeping);
 
+      bool Should_ShakeWake(uint16_t thresh);
+      bool Should_RaiseWake(bool isSleeping);
+      int32_t currentShakeSpeed();
       void IsSensorOk(bool isOk);
       bool IsSensorOk() const {
         return isSensorOk;
@@ -59,6 +61,12 @@ namespace Pinetime {
       bool isSensorOk = false;
       DeviceTypes deviceType = DeviceTypes::Unknown;
       Pinetime::Controllers::MotionService* service = nullptr;
+
+      int16_t lastXForShake = 0;
+      int16_t lastYForShake = 0;
+      int16_t lastZForShake = 0;
+      int32_t accumulatedspeed = 0;
+      uint32_t lastShakeTime = 0;
     };
   }
 }
\ No newline at end of file