Merge branch 'develop' of JF/PineTime into master

7 files changed, 168 insertions, 3 deletions

diff --git a/src/Components/Battery/BatteryController.cpp b/src/Components/Battery/BatteryController.cpp
index 7719bcbb..198ce5aa 100644
--- a/src/Components/Battery/BatteryController.cpp
+++ b/src/Components/Battery/BatteryController.cpp
@@ -36,8 +36,8 @@ void Battery::Update() {
   voltage = (value * 2.0f) / (1024/3.0f);
   percentRemaining = ((voltage - 3.55)*100)*3.9;
 
-  NRF_LOG_INFO("BATTERY " NRF_LOG_FLOAT_MARKER " %% - " NRF_LOG_FLOAT_MARKER " v", NRF_LOG_FLOAT(percentRemaining), NRF_LOG_FLOAT(voltage));
-  NRF_LOG_INFO("POWER Charging : %d - Power : %d", isCharging, isPowerPresent);
+//  NRF_LOG_INFO("BATTERY " NRF_LOG_FLOAT_MARKER " %% - " NRF_LOG_FLOAT_MARKER " v", NRF_LOG_FLOAT(percentRemaining), NRF_LOG_FLOAT(voltage));
+//  NRF_LOG_INFO("POWER Charging : %d - Power : %d", isCharging, isPowerPresent);
 }
 
 void Battery::SaadcEventHandler(nrfx_saadc_evt_t const * event) {
diff --git a/src/Components/Ble/BleController.cpp b/src/Components/Ble/BleController.cpp
index c2458087..5fa51688 100644
--- a/src/Components/Ble/BleController.cpp
+++ b/src/Components/Ble/BleController.cpp
@@ -1,3 +1,5 @@
+#include <cstring>
+#include <cstdlib>
 #include "BleController.h"
 
 using namespace Pinetime::Controllers;
@@ -9,3 +11,5 @@ void Ble::Connect() {
 void Ble::Disconnect() {
   isConnected = false;
 }
+
+
diff --git a/src/Components/Ble/BleController.h b/src/Components/Ble/BleController.h
index be491ee9..31d66986 100644
--- a/src/Components/Ble/BleController.h
+++ b/src/Components/Ble/BleController.h
@@ -1,15 +1,20 @@
 #pragma once
 
+#include <FreeRTOS.h>>
+#include <queue.h>
+
 namespace Pinetime {
   namespace Controllers {
     class Ble {
       public:
+
+        Ble() = default;
         bool IsConnected() const {return isConnected;}
         void Connect();
         void Disconnect();
-
       private:
         bool isConnected = false;
+
     };
   }
 }
\ No newline at end of file
diff --git a/src/Components/Ble/NotificationManager.cpp b/src/Components/Ble/NotificationManager.cpp
new file mode 100644
index 00000000..2e02cb15
--- /dev/null
+++ b/src/Components/Ble/NotificationManager.cpp
@@ -0,0 +1,29 @@
+#include <cstring>
+#include "NotificationManager.h"
+
+using namespace Pinetime::Controllers;
+
+void NotificationManager::Push(Pinetime::Controllers::NotificationManager::Categories category,
+                                                      const char *message, uint8_t messageSize) {
+  // TODO handle edge cases on read/write index
+  auto& notif = notifications[writeIndex];
+  std::memcpy(notif.message.data(), message, messageSize);
+  notif.message[messageSize] = '\0';
+  notif.category = category;
+
+  writeIndex = (writeIndex + 1 < TotalNbNotifications) ? writeIndex + 1 : 0;
+  if(!empty && writeIndex == readIndex)
+    readIndex = writeIndex + 1;
+}
+
+NotificationManager::Notification Pinetime::Controllers::NotificationManager::Pop() {
+// TODO handle edge cases on read/write index
+  NotificationManager::Notification notification = notifications[readIndex];
+
+  if(readIndex != writeIndex) {
+    readIndex = (readIndex + 1 < TotalNbNotifications) ? readIndex + 1 : 0;
+  }
+
+  // TODO Check move optimization on return
+  return notification;
+}
diff --git a/src/Components/Ble/NotificationManager.h b/src/Components/Ble/NotificationManager.h
new file mode 100644
index 00000000..8edd6828
--- /dev/null
+++ b/src/Components/Ble/NotificationManager.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <array>
+
+namespace Pinetime {
+  namespace Controllers {
+    class NotificationManager {
+      public:
+        enum class Categories {Unknown, SimpleAlert, Email, News, IncomingCall, MissedCall, Sms, VoiceMail, Schedule, HighProriotyAlert, InstantMessage };
+        static constexpr uint8_t MessageSize = 18;
+
+        struct Notification {
+          std::array<char, MessageSize> message;
+          Categories category = Categories::Unknown;
+        };
+
+      void Push(Categories category, const char* message, uint8_t messageSize);
+      Notification Pop();
+
+
+      private:
+        static constexpr uint8_t TotalNbNotifications = 5;
+        std::array<Notification, TotalNbNotifications> notifications;
+        uint8_t readIndex = 0;
+        uint8_t writeIndex = 0;
+        bool empty = true;
+    };
+  }
+}
\ No newline at end of file
diff --git a/src/Components/Brightness/BrightnessController.cpp b/src/Components/Brightness/BrightnessController.cpp
new file mode 100644
index 00000000..c8825d68
--- /dev/null
+++ b/src/Components/Brightness/BrightnessController.cpp
@@ -0,0 +1,70 @@
+#include <hal/nrf_gpio.h>
+#include "BrightnessController.h"
+
+using namespace Pinetime::Controllers;
+
+
+void BrightnessController::Init() {
+  nrf_gpio_cfg_output(pinLcdBacklight1);
+  nrf_gpio_cfg_output(pinLcdBacklight2);
+  nrf_gpio_cfg_output(pinLcdBacklight3);
+  Set(level);
+}
+
+void BrightnessController::Set(BrightnessController::Levels level) {
+  this->level = level;
+  switch(level) {
+    default:
+    case Levels::High:
+      nrf_gpio_pin_clear(pinLcdBacklight1);
+      nrf_gpio_pin_clear(pinLcdBacklight2);
+      nrf_gpio_pin_clear(pinLcdBacklight3);
+      break;
+    case Levels::Medium:
+      nrf_gpio_pin_clear(pinLcdBacklight1);
+      nrf_gpio_pin_clear(pinLcdBacklight2);
+      nrf_gpio_pin_set(pinLcdBacklight3);
+      break;
+    case Levels::Low:
+      nrf_gpio_pin_clear(pinLcdBacklight1);
+      nrf_gpio_pin_set(pinLcdBacklight2);
+      nrf_gpio_pin_set(pinLcdBacklight3);
+      break;
+    case Levels::Off:
+      nrf_gpio_pin_set(pinLcdBacklight1);
+      nrf_gpio_pin_set(pinLcdBacklight2);
+      nrf_gpio_pin_set(pinLcdBacklight3);
+      break;
+  }
+}
+
+void BrightnessController::Lower() {
+  switch(level) {
+    case Levels::High: Set(Levels::Medium); break;
+    case Levels::Medium: Set(Levels::Low); break;
+    case Levels::Low: Set(Levels::Off); break;
+    default: break;
+  }
+}
+
+void BrightnessController::Higher() {
+  switch(level) {
+    case Levels::Off: Set(Levels::Low); break;
+    case Levels::Low: Set(Levels::Medium); break;
+    case Levels::Medium: Set(Levels::High); break;
+    default: break;
+  }
+}
+
+BrightnessController::Levels BrightnessController::Level() const {
+  return level;
+}
+
+void BrightnessController::Backup() {
+  backupLevel = level;
+}
+
+void BrightnessController::Restore() {
+  Set(backupLevel);
+}
+
diff --git a/src/Components/Brightness/BrightnessController.h b/src/Components/Brightness/BrightnessController.h
new file mode 100644
index 00000000..b8354ec0
--- /dev/null
+++ b/src/Components/Brightness/BrightnessController.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <cstdint>
+
+namespace Pinetime {
+  namespace Controllers {
+    class BrightnessController {
+    public:
+      enum class Levels {Off, Low, Medium, High};
+      void Init();
+
+      void Set(Levels level);
+      Levels Level() const;
+      void Lower();
+      void Higher();
+
+      void Backup();
+      void Restore();
+
+    private:
+      static constexpr uint8_t pinLcdBacklight1 = 14;
+      static constexpr uint8_t pinLcdBacklight2 = 22;
+      static constexpr uint8_t pinLcdBacklight3 = 23;
+      Levels level = Levels::High;
+      Levels backupLevel = Levels::High;
+    };
+  }
+}