4 files changed, 86 insertions, 0 deletions

diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index 59982477..9c1f2684 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@@ -1,9 +1,14 @@
 #include "DateTimeController.h"
 #include <date/date.h>
 #include <libraries/log/nrf_log.h>
+#include <systemtask/SystemTask.h>
 
 using namespace Pinetime::Controllers;
 
+DateTime::DateTime(System::SystemTask& systemTask) : systemTask{systemTask} {
+
+}
+
 
 void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t dayOfWeek, uint8_t hour, uint8_t minute,
                        uint8_t second, uint32_t systickCounter) {
@@ -62,6 +67,14 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
   hour = time.hours().count();
   minute = time.minutes().count();
   second = time.seconds().count();
+
+  // Notify new day to SystemTask
+  if(hour == 0 and not isMidnightAlreadyNotified) {
+    isMidnightAlreadyNotified = true;
+    systemTask.PushMessage(System::SystemTask::Messages::OnNewDay);
+  } else if (hour != 0) {
+    isMidnightAlreadyNotified = false;
+  }
 }
 
 const char *DateTime::MonthShortToString() {
diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index 16bb59c9..fb0969d1 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/src/components/datetime/DateTimeController.h
@@ -4,12 +4,17 @@
 #include <chrono>
 
 namespace Pinetime {
+  namespace System {
+    class SystemTask;
+  }
   namespace Controllers {
     class DateTime {
       public:
         enum class Days : uint8_t {Unknown, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday};
         enum class Months : uint8_t {Unknown, January, February, March, April, May, June, July, August, September, October, November, December};
 
+        DateTime(System::SystemTask& systemTask);
+
         void SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t dayOfWeek, uint8_t hour, uint8_t minute, uint8_t second, uint32_t systickCounter);
         void UpdateTime(uint32_t systickCounter);
         uint16_t Year() const { return year; }
@@ -31,6 +36,7 @@ namespace Pinetime {
         std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const { return currentDateTime; }
         std::chrono::seconds Uptime() const { return uptime; }
       private:
+        System::SystemTask& systemTask;
         uint16_t year = 0;
         Months month = Months::Unknown;
         uint8_t day = 0;
@@ -43,6 +49,8 @@ namespace Pinetime {
         std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> currentDateTime;
         std::chrono::seconds uptime {0};
 
+        bool isMidnightAlreadyNotified = false;
+
         static char const *DaysString[];
         static char const *DaysStringShort[];
         static char const *DaysStringLow[];
diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp
new file mode 100644
index 00000000..e9ee314b
--- /dev/null
+++ b/src/components/motion/MotionController.cpp
@@ -0,0 +1,36 @@
+#include "MotionController.h"
+
+using namespace Pinetime::Controllers;
+
+void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) {
+  this->x = x;
+  this->y = y;
+  this->z = z;
+  this->nbSteps = nbSteps;
+}
+
+bool MotionController::ShouldWakeUp(bool isSleeping) {
+  if ((x + 335) <= 670 && z < 0) {
+    if (not isSleeping) {
+      if (y <= 0) {
+        return false;
+      } else {
+        lastYForWakeUp = 0;
+        return false;
+      }
+    }
+
+    if (y >= 0) {
+      lastYForWakeUp = 0;
+      return false;
+    }
+    if (y + 230 < lastYForWakeUp) {
+      lastYForWakeUp = y;
+      return true;
+    }
+  }
+  return false;
+}
+void MotionController::IsSensorOk(bool isOk) {
+  isSensorOk = isOk;
+}
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
new file mode 100644
index 00000000..5881997f
--- /dev/null
+++ b/src/components/motion/MotionController.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <cstdint>
+
+namespace Pinetime {
+  namespace Controllers {
+    class MotionController {
+    public:
+      void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps);
+
+      uint16_t X() const { return x; }
+      uint16_t Y() const { return y; }
+      uint16_t Z() const { return z; }
+      uint32_t NbSteps() const { return nbSteps; }
+      bool ShouldWakeUp(bool isSleeping);
+
+      void IsSensorOk(bool isOk);
+      bool IsSensorOk() const { return isSensorOk; }
+
+    private:
+      uint32_t nbSteps;
+      int16_t x;
+      int16_t y;
+      int16_t z;
+      int16_t lastYForWakeUp = 0;
+      bool isSensorOk = false;
+    };
+  }
+}
\ No newline at end of file