From d13dd6dee3e6194a2f3ed2a1adfbbd32ced525a3 Mon Sep 17 00:00:00 2001
From: Florian Kraupa <fgrauper@gmail.com>
Date: Wed, 12 May 2021 20:23:04 +0200
Subject: implemented continuous vibration pattern for incoming calls


diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index a834ab6..2a14f4b 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -3,7 +3,8 @@
 #include "systemtask/SystemTask.h"
 #include "app_timer.h"
 
-APP_TIMER_DEF(vibTimer);
+APP_TIMER_DEF(shortVibTimer);
+APP_TIMER_DEF(longVibTimer);
 
 using namespace Pinetime::Controllers;
 
@@ -14,19 +15,42 @@ void MotorController::Init() {
   nrf_gpio_cfg_output(pinMotor);
   nrf_gpio_pin_set(pinMotor);
   app_timer_init();
-  app_timer_create(&vibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrate);
+  
+  app_timer_create(&shortVibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrate);
+  app_timer_create(&longVibTimer, APP_TIMER_MODE_REPEATED, vibrate);
+  isBusy = false;
 }
 
-void MotorController::SetDuration(uint8_t motorDuration) {
+void MotorController::RunForDuration(uint8_t motorDuration) {
 
-  if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF)
+  if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF || isBusy)
     return;
 
   nrf_gpio_pin_clear(pinMotor);
   /* Start timer for motorDuration miliseconds and timer triggers vibrate() when it finishes*/
-  app_timer_start(vibTimer, APP_TIMER_TICKS(motorDuration), NULL);
+  app_timer_start(shortVibTimer, APP_TIMER_TICKS(motorDuration), NULL);
 }
 
-void MotorController::vibrate(void* p_context) {
+void MotorController::startRunning(uint8_t motorDuration) {
+  if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF || isBusy )
+    return;
+  //prevent other vibrations while running
+  isBusy = true;
+  nrf_gpio_pin_clear(pinMotor);
+  app_timer_start(longVibTimer, APP_TIMER_TICKS(motorDuration), NULL);
+}
+
+void MotorController::stopRunning() {
+  
+  app_timer_stop(longVibTimer);
   nrf_gpio_pin_set(pinMotor);
+  isBusy = false;
+}
+
+void MotorController::vibrate(void* p_context) {
+  if (nrf_gpio_pin_out_read(pinMotor) == 0) {
+    nrf_gpio_pin_set(pinMotor);
+  } else {
+    nrf_gpio_pin_clear(pinMotor);
+  }
 }
\ No newline at end of file
diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
index df61af7..be076ad 100644
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -12,11 +12,14 @@ namespace Pinetime {
     public:
       MotorController(Controllers::Settings& settingsController);
       void Init();
-      void SetDuration(uint8_t motorDuration);
+      void RunForDuration(uint8_t motorDuration);
+      void startRunning(uint8_t motorDuration);
+      void stopRunning();
 
     private:
       Controllers::Settings& settingsController;
       static void vibrate(void* p_context);
-    };
+      bool isBusy;
+      };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index a6c4a3e..731f3d0 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -256,12 +256,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
 
     case Apps::Notifications:
       currentScreen = std::make_unique<Screens::Notifications>(
-        this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Normal);
+        this, notificationManager, systemTask.nimble().alertService(), motorController, Screens::Notifications::Modes::Normal);
       ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::NotificationsPreview:
       currentScreen = std::make_unique<Screens::Notifications>(
-        this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Preview);
+        this, notificationManager, systemTask.nimble().alertService(), motorController, Screens::Notifications::Modes::Preview);
       ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
 
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index f0fd2f6..482247e 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -11,8 +11,13 @@ extern lv_font_t jetbrains_mono_bold_20;
 Notifications::Notifications(DisplayApp* app,
                              Pinetime::Controllers::NotificationManager& notificationManager,
                              Pinetime::Controllers::AlertNotificationService& alertNotificationService,
+                             Controllers::MotorController& motorController,
                              Modes mode)
-  : Screen(app), notificationManager {notificationManager}, alertNotificationService {alertNotificationService}, mode {mode} {
+  : Screen(app),
+  notificationManager {notificationManager},
+  alertNotificationService {alertNotificationService},
+  motorController{motorController},
+  mode {mode} {
   notificationManager.ClearNewNotificationFlag();
   auto notification = notificationManager.GetLastNotification();
   if (notification.valid) {
@@ -23,7 +28,8 @@ Notifications::Notifications(DisplayApp* app,
                                                      notification.category,
                                                      notificationManager.NbNotifications(),
                                                      mode,
-                                                     alertNotificationService);
+                                                     alertNotificationService,
+                                                     motorController);
     validDisplay = true;
   } else {
     currentItem = std::make_unique<NotificationItem>("Notification",
@@ -32,10 +38,13 @@ Notifications::Notifications(DisplayApp* app,
                                                      notification.category,
                                                      notificationManager.NbNotifications(),
                                                      Modes::Preview,
-                                                     alertNotificationService);
+                                                     alertNotificationService,
+                                                     motorController);
   }
 
   if (mode == Modes::Preview) {
+    
+    
 
     timeoutLine = lv_line_create(lv_scr_act(), nullptr);
 
@@ -63,7 +72,10 @@ bool Notifications::Refresh() {
     timeoutLinePoints[1].x = pos;
     lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
   }
-
+  //make sure we stop any vibrations before exiting
+  if (!running) {
+    motorController.stopRunning();
+  }
   return running;
 }
 
@@ -92,7 +104,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        previousNotification.category,
                                                        notificationManager.NbNotifications(),
                                                        mode,
-                                                       alertNotificationService);
+                                                       alertNotificationService,
+                                                       motorController);
     }
       return true;
     case Pinetime::Applications::TouchEvents::SwipeUp: {
@@ -117,7 +130,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        nextNotification.category,
                                                        notificationManager.NbNotifications(),
                                                        mode,
-                                                       alertNotificationService);
+                                                       alertNotificationService,
+                                                       motorController);
     }
       return true;
     case Pinetime::Applications::TouchEvents::LongTap: {
@@ -152,8 +166,9 @@ Notifications::NotificationItem::NotificationItem(const char* title,
                                                   Controllers::NotificationManager::Categories category,
                                                   uint8_t notifNb,
                                                   Modes mode,
-                                                  Pinetime::Controllers::AlertNotificationService& alertNotificationService)
-  : notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService} {
+                                                  Pinetime::Controllers::AlertNotificationService& alertNotificationService,
+                                                  Controllers::MotorController& motorController)
+  : notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService}, motorController{motorController} {
 
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
 
@@ -236,8 +251,10 @@ Notifications::NotificationItem::NotificationItem(const char* title,
       label_mute = lv_label_create(bt_mute, nullptr);
       lv_label_set_text(label_mute, Symbols::volumMute);
       lv_obj_set_style_local_bg_color(bt_mute, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
+  
     } break;
   }
+  
 
   lv_obj_t* backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
@@ -249,21 +266,21 @@ Notifications::NotificationItem::NotificationItem(const char* title,
 void Notifications::NotificationItem::OnAcceptIncomingCall(lv_event_t event) {
   if (event != LV_EVENT_CLICKED)
     return;
-
+  motorController.stopRunning();
   alertNotificationService.AcceptIncomingCall();
 }
 
 void Notifications::NotificationItem::OnMuteIncomingCall(lv_event_t event) {
   if (event != LV_EVENT_CLICKED)
     return;
-
+  motorController.stopRunning();
   alertNotificationService.MuteIncomingCall();
 }
 
 void Notifications::NotificationItem::OnRejectIncomingCall(lv_event_t event) {
   if (event != LV_EVENT_CLICKED)
     return;
-
+  motorController.stopRunning();
   alertNotificationService.RejectIncomingCall();
 }
 
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 51ca81d..ae83e8e 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include "Screen.h"
 #include "components/ble/NotificationManager.h"
+#include "components/motor/MotorController.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -19,6 +20,7 @@ namespace Pinetime {
         explicit Notifications(DisplayApp* app,
                                Pinetime::Controllers::NotificationManager& notificationManager,
                                Pinetime::Controllers::AlertNotificationService& alertNotificationService,
+                               Controllers::MotorController& motorController,
                                Modes mode);
         ~Notifications() override;
 
@@ -33,7 +35,8 @@ namespace Pinetime {
                            Controllers::NotificationManager::Categories,
                            uint8_t notifNb,
                            Modes mode,
-                           Pinetime::Controllers::AlertNotificationService& alertNotificationService);
+                           Pinetime::Controllers::AlertNotificationService& alertNotificationService,
+                           Controllers::MotorController& motorController);
           ~NotificationItem();
           bool Refresh() {
             return false;
@@ -60,6 +63,7 @@ namespace Pinetime {
           lv_obj_t* bottomPlaceholder;
           Modes mode;
           Pinetime::Controllers::AlertNotificationService& alertNotificationService;
+          Controllers::MotorController& motorController;
         };
 
       private:
@@ -72,6 +76,8 @@ namespace Pinetime {
         Modes mode = Modes::Normal;
         std::unique_ptr<NotificationItem> currentItem;
         Controllers::NotificationManager::Notification::Id currentId;
+        Controllers::MotorController& motorController;
+        
         bool validDisplay = false;
 
         lv_point_t timeoutLinePoints[2] {{0, 1}, {239, 1}};
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 3994794..7681546 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -140,7 +140,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
 
     if (lv_obj_get_state(btn3, LV_BTN_PART_MAIN) & LV_STATE_CHECKED) {
       settingsController.SetVibrationStatus(Controllers::Settings::Vibration::ON);
-      motorController.SetDuration(35);
+      motorController.RunForDuration(35);
       lv_label_set_text_static(btn3_lvl, Symbols::notificationsOn);
     } else {
       settingsController.SetVibrationStatus(Controllers::Settings::Vibration::OFF);
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 6d695e2..0d43b2f 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -225,7 +225,11 @@ void SystemTask::Work() {
         case Messages::OnNewNotification:
           if (isSleeping && !isWakingUp)
             GoToRunning();
-          motorController.SetDuration(35);
+          if (notificationManager.GetLastNotification().category == Controllers::NotificationManager::Categories::IncomingCall) {
+            motorController.startRunning(50);
+          } else {
+            motorController.RunForDuration(35);
+          }
           displayApp->PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
           break;
         case Messages::BleConnected:
-- 
cgit v0.10.2


From 5da65494b3da1a69d08f7b7e6c5242f6ce666e32 Mon Sep 17 00:00:00 2001
From: Florian Kraupa <fgrauper@gmail.com>
Date: Thu, 13 May 2021 00:08:40 +0200
Subject: only activate the timeout on call notification previews after they
 have been interacted with


diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 482247e..60349a6 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -29,7 +29,8 @@ Notifications::Notifications(DisplayApp* app,
                                                      notificationManager.NbNotifications(),
                                                      mode,
                                                      alertNotificationService,
-                                                     motorController);
+                                                     motorController,
+                                                     &timeoutTickCountEnd);
     validDisplay = true;
   } else {
     currentItem = std::make_unique<NotificationItem>("Notification",
@@ -39,7 +40,8 @@ Notifications::Notifications(DisplayApp* app,
                                                      notificationManager.NbNotifications(),
                                                      Modes::Preview,
                                                      alertNotificationService,
-                                                     motorController);
+                                                     motorController,
+                                                     &timeoutTickCountEnd);
   }
 
   if (mode == Modes::Preview) {
@@ -63,7 +65,7 @@ Notifications::~Notifications() {
 }
 
 bool Notifications::Refresh() {
-  if (mode == Modes::Preview) {
+  if (mode == Modes::Preview && !currentItem->timeoutOnHold) {
     auto tick = xTaskGetTickCount();
     int32_t pos = 240 - ((tick - timeoutTickCountStart) / ((timeoutTickCountEnd - timeoutTickCountStart) / 240));
     if (pos < 0)
@@ -105,7 +107,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        notificationManager.NbNotifications(),
                                                        mode,
                                                        alertNotificationService,
-                                                       motorController);
+                                                       motorController,
+                                                       &timeoutTickCountEnd);
     }
       return true;
     case Pinetime::Applications::TouchEvents::SwipeUp: {
@@ -131,7 +134,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        notificationManager.NbNotifications(),
                                                        mode,
                                                        alertNotificationService,
-                                                       motorController);
+                                                       motorController,
+                                                       &timeoutTickCountEnd);
     }
       return true;
     case Pinetime::Applications::TouchEvents::LongTap: {
@@ -167,8 +171,10 @@ Notifications::NotificationItem::NotificationItem(const char* title,
                                                   uint8_t notifNb,
                                                   Modes mode,
                                                   Pinetime::Controllers::AlertNotificationService& alertNotificationService,
-                                                  Controllers::MotorController& motorController)
-  : notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService}, motorController{motorController} {
+                                                  Controllers::MotorController& motorController,
+                                                  uint32_t* timeoutEnd)
+  : notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService},
+  motorController{motorController}, timeoutEnd{timeoutEnd} {
 
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
 
@@ -251,7 +257,7 @@ Notifications::NotificationItem::NotificationItem(const char* title,
       label_mute = lv_label_create(bt_mute, nullptr);
       lv_label_set_text(label_mute, Symbols::volumMute);
       lv_obj_set_style_local_bg_color(bt_mute, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
-  
+      timeoutOnHold = true;
     } break;
   }
   
@@ -266,24 +272,31 @@ Notifications::NotificationItem::NotificationItem(const char* title,
 void Notifications::NotificationItem::OnAcceptIncomingCall(lv_event_t event) {
   if (event != LV_EVENT_CLICKED)
     return;
-  motorController.stopRunning();
+  callPreviewInteraction();
   alertNotificationService.AcceptIncomingCall();
 }
 
 void Notifications::NotificationItem::OnMuteIncomingCall(lv_event_t event) {
   if (event != LV_EVENT_CLICKED)
     return;
-  motorController.stopRunning();
+  callPreviewInteraction();
   alertNotificationService.MuteIncomingCall();
 }
 
 void Notifications::NotificationItem::OnRejectIncomingCall(lv_event_t event) {
   if (event != LV_EVENT_CLICKED)
     return;
-  motorController.stopRunning();
+  callPreviewInteraction();
   alertNotificationService.RejectIncomingCall();
 }
 
+inline void Notifications::NotificationItem::callPreviewInteraction() {
+  *timeoutEnd = xTaskGetTickCount()  + (5 * 1024);
+  timeoutOnHold = false;
+  motorController.stopRunning();
+}
+
+
 Notifications::NotificationItem::~NotificationItem() {
   lv_obj_clean(lv_scr_act());
 }
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index ae83e8e..89b676e 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -36,7 +36,8 @@ namespace Pinetime {
                            uint8_t notifNb,
                            Modes mode,
                            Pinetime::Controllers::AlertNotificationService& alertNotificationService,
-                           Controllers::MotorController& motorController);
+                           Controllers::MotorController& motorController,
+                           uint32_t* timeoutEnd);
           ~NotificationItem();
           bool Refresh() {
             return false;
@@ -44,8 +45,10 @@ namespace Pinetime {
           void OnAcceptIncomingCall(lv_event_t event);
           void OnMuteIncomingCall(lv_event_t event);
           void OnRejectIncomingCall(lv_event_t event);
-
+          bool timeoutOnHold = false;
         private:
+          void callPreviewInteraction();
+          
           uint8_t notifNr = 0;
           uint8_t notifNb = 0;
           char pageText[4];
@@ -61,6 +64,7 @@ namespace Pinetime {
           lv_obj_t* label_mute;
           lv_obj_t* label_reject;
           lv_obj_t* bottomPlaceholder;
+          uint32_t* timeoutEnd;
           Modes mode;
           Pinetime::Controllers::AlertNotificationService& alertNotificationService;
           Controllers::MotorController& motorController;
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 0d43b2f..2b5e7bb 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -226,7 +226,7 @@ void SystemTask::Work() {
           if (isSleeping && !isWakingUp)
             GoToRunning();
           if (notificationManager.GetLastNotification().category == Controllers::NotificationManager::Categories::IncomingCall) {
-            motorController.startRunning(50);
+            motorController.startRunning(500);
           } else {
             motorController.RunForDuration(35);
           }
-- 
cgit v0.10.2


From 56af4a0b830cd93ff12753042cdf105b65d0bcc8 Mon Sep 17 00:00:00 2001
From: Florian Kraupa <fgrauper@gmail.com>
Date: Thu, 13 May 2021 00:35:36 +0200
Subject: cleaned up the code and reduced the size of the diff by removing
 things like additional whitespaces


diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index 2a14f4b..6f02a58 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -21,7 +21,7 @@ void MotorController::Init() {
   isBusy = false;
 }
 
-void MotorController::RunForDuration(uint8_t motorDuration) {
+void MotorController::runForDuration(uint8_t motorDuration) {
 
   if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF || isBusy)
     return;
diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
index be076ad..5daeb8c 100644
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -12,7 +12,7 @@ namespace Pinetime {
     public:
       MotorController(Controllers::Settings& settingsController);
       void Init();
-      void RunForDuration(uint8_t motorDuration);
+      void runForDuration(uint8_t motorDuration);
       void startRunning(uint8_t motorDuration);
       void stopRunning();
 
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 60349a6..e4abc67 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -13,11 +13,11 @@ Notifications::Notifications(DisplayApp* app,
                              Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                              Controllers::MotorController& motorController,
                              Modes mode)
-  : Screen(app),
-  notificationManager {notificationManager},
-  alertNotificationService {alertNotificationService},
-  motorController{motorController},
-  mode {mode} {
+    : Screen(app),
+      notificationManager{notificationManager},
+      alertNotificationService{alertNotificationService},
+      motorController{motorController},
+      mode{mode} {
   notificationManager.ClearNewNotificationFlag();
   auto notification = notificationManager.GetLastNotification();
   if (notification.valid) {
@@ -45,8 +45,6 @@ Notifications::Notifications(DisplayApp* app,
   }
 
   if (mode == Modes::Preview) {
-    
-    
 
     timeoutLine = lv_line_create(lv_scr_act(), nullptr);
 
@@ -75,9 +73,8 @@ bool Notifications::Refresh() {
     lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
   }
   //make sure we stop any vibrations before exiting
-  if (!running) {
+  if (!running)
     motorController.stopRunning();
-  }
   return running;
 }
 
@@ -173,9 +170,8 @@ Notifications::NotificationItem::NotificationItem(const char* title,
                                                   Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                                   Controllers::MotorController& motorController,
                                                   uint32_t* timeoutEnd)
-  : notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService},
-  motorController{motorController}, timeoutEnd{timeoutEnd} {
-
+    : notifNr{notifNr}, notifNb{notifNb}, mode{mode}, alertNotificationService{alertNotificationService},
+      motorController{motorController}, timeoutEnd{timeoutEnd} {
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
 
   lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x222222));
@@ -260,7 +256,6 @@ Notifications::NotificationItem::NotificationItem(const char* title,
       timeoutOnHold = true;
     } break;
   }
-  
 
   lv_obj_t* backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
@@ -291,7 +286,7 @@ void Notifications::NotificationItem::OnRejectIncomingCall(lv_event_t event) {
 }
 
 inline void Notifications::NotificationItem::callPreviewInteraction() {
-  *timeoutEnd = xTaskGetTickCount()  + (5 * 1024);
+  *timeoutEnd = xTaskGetTickCount() + (5 * 1024);
   timeoutOnHold = false;
   motorController.stopRunning();
 }
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 89b676e..99c95a8 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -45,6 +45,7 @@ namespace Pinetime {
           void OnAcceptIncomingCall(lv_event_t event);
           void OnMuteIncomingCall(lv_event_t event);
           void OnRejectIncomingCall(lv_event_t event);
+          
           bool timeoutOnHold = false;
         private:
           void callPreviewInteraction();
@@ -81,7 +82,6 @@ namespace Pinetime {
         std::unique_ptr<NotificationItem> currentItem;
         Controllers::NotificationManager::Notification::Id currentId;
         Controllers::MotorController& motorController;
-        
         bool validDisplay = false;
 
         lv_point_t timeoutLinePoints[2] {{0, 1}, {239, 1}};
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 7681546..501aee4 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -140,7 +140,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
 
     if (lv_obj_get_state(btn3, LV_BTN_PART_MAIN) & LV_STATE_CHECKED) {
       settingsController.SetVibrationStatus(Controllers::Settings::Vibration::ON);
-      motorController.RunForDuration(35);
+      motorController.runForDuration(35);
       lv_label_set_text_static(btn3_lvl, Symbols::notificationsOn);
     } else {
       settingsController.SetVibrationStatus(Controllers::Settings::Vibration::OFF);
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 2b5e7bb..24fe4f4 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -228,7 +228,7 @@ void SystemTask::Work() {
           if (notificationManager.GetLastNotification().category == Controllers::NotificationManager::Categories::IncomingCall) {
             motorController.startRunning(500);
           } else {
-            motorController.RunForDuration(35);
+            motorController.runForDuration(35);
           }
           displayApp->PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
           break;
-- 
cgit v0.10.2


From 9e8dd9a1e63523f4e3ed322978e5b5e079c50375 Mon Sep 17 00:00:00 2001
From: Florian Kraupa <fgrauper@gmail.com>
Date: Thu, 13 May 2021 01:51:43 +0200
Subject: NotificationItem now also redefines the start of the timeout


diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index e4abc67..e393e7b 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -30,7 +30,8 @@ Notifications::Notifications(DisplayApp* app,
                                                      mode,
                                                      alertNotificationService,
                                                      motorController,
-                                                     &timeoutTickCountEnd);
+                                                     &timeoutTickCountEnd,
+                                                     &timeoutTickCountStart);
     validDisplay = true;
   } else {
     currentItem = std::make_unique<NotificationItem>("Notification",
@@ -41,7 +42,8 @@ Notifications::Notifications(DisplayApp* app,
                                                      Modes::Preview,
                                                      alertNotificationService,
                                                      motorController,
-                                                     &timeoutTickCountEnd);
+                                                     &timeoutTickCountEnd,
+                                                     &timeoutTickCountStart);
   }
 
   if (mode == Modes::Preview) {
@@ -105,7 +107,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        mode,
                                                        alertNotificationService,
                                                        motorController,
-                                                       &timeoutTickCountEnd);
+                                                       &timeoutTickCountEnd,
+                                                       &timeoutTickCountStart);
     }
       return true;
     case Pinetime::Applications::TouchEvents::SwipeUp: {
@@ -132,7 +135,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        mode,
                                                        alertNotificationService,
                                                        motorController,
-                                                       &timeoutTickCountEnd);
+                                                       &timeoutTickCountEnd,
+                                                       &timeoutTickCountStart);
     }
       return true;
     case Pinetime::Applications::TouchEvents::LongTap: {
@@ -169,9 +173,10 @@ Notifications::NotificationItem::NotificationItem(const char* title,
                                                   Modes mode,
                                                   Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                                   Controllers::MotorController& motorController,
-                                                  uint32_t* timeoutEnd)
+                                                  uint32_t* timeoutEnd,
+                                                  uint32_t* timeoutStart)
     : notifNr{notifNr}, notifNb{notifNb}, mode{mode}, alertNotificationService{alertNotificationService},
-      motorController{motorController}, timeoutEnd{timeoutEnd} {
+      motorController{motorController}, timeoutEnd{timeoutEnd}, timeoutStart{timeoutStart} {
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
 
   lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x222222));
@@ -286,7 +291,8 @@ void Notifications::NotificationItem::OnRejectIncomingCall(lv_event_t event) {
 }
 
 inline void Notifications::NotificationItem::callPreviewInteraction() {
-  *timeoutEnd = xTaskGetTickCount() + (5 * 1024);
+  *timeoutStart = xTaskGetTickCount();
+  *timeoutEnd = *timeoutStart + (5 * 1024);
   timeoutOnHold = false;
   motorController.stopRunning();
 }
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 99c95a8..32bd077 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -37,7 +37,8 @@ namespace Pinetime {
                            Modes mode,
                            Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                            Controllers::MotorController& motorController,
-                           uint32_t* timeoutEnd);
+                           uint32_t* timeoutEnd,
+                           uint32_t* timeoutStart);
           ~NotificationItem();
           bool Refresh() {
             return false;
@@ -66,6 +67,7 @@ namespace Pinetime {
           lv_obj_t* label_reject;
           lv_obj_t* bottomPlaceholder;
           uint32_t* timeoutEnd;
+          uint32_t* timeoutStart;
           Modes mode;
           Pinetime::Controllers::AlertNotificationService& alertNotificationService;
           Controllers::MotorController& motorController;
-- 
cgit v0.10.2


From 378fa6b4016b65e2d7b128fdc3ce89c4ca779a4d Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 15:23:26 +0200
Subject: Reset


diff --git a/.clang-tidy b/.clang-tidy
index 8a7d38f..d603680 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -22,9 +22,5 @@ Checks: '*,
   -hicpp-no-assembler,
   -hicpp-avoid-c-arrays,
   -hicpp-uppercase-literal-suffix,
-  -hicpp-no-array-decay,
   -cert-err58-cpp,
-  -cert-err60-cpp'
-CheckOptions:
-  - key: readability-function-cognitive-complexity.Threshold
-    value: 100
\ No newline at end of file
+  -cert-err60-cpp'
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c529f3..f777013 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,22 +55,10 @@ if(BUILD_DFU)
   set(BUILD_DFU true)
 endif()
 
-set(PROJECT_GIT_COMMIT_HASH "")
-
-execute_process(COMMAND git rev-parse --short HEAD
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                OUTPUT_VARIABLE PROJECT_GIT_COMMIT_HASH
-                RESULT_VARIABLE PROJECT_GIT_COMMIT_HASH_SUCCESS)
-
-string(STRIP ${PROJECT_GIT_COMMIT_HASH} PROJECT_GIT_COMMIT_HASH)
-
-message("PROJECT_GIT_COMMIT_HASH_SUCCESS? " ${PROJECT_GIT_COMMIT_HASH_SUCCESS})
-
 message("BUILD CONFIGURATION")
 message("-------------------")
 message("    * Version : " ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 message("    * Toolchain : " ${ARM_NONE_EABI_TOOLCHAIN_PATH})
-message("    * GitRef(S) : " ${PROJECT_GIT_COMMIT_HASH})
 message("    * NRF52 SDK : " ${NRF5_SDK_PATH})
 set(PROGRAMMER "???")
 if(USE_JLINK)
diff --git a/README.md b/README.md
index 396d746..34f6e84 100644
--- a/README.md
+++ b/README.md
@@ -72,8 +72,7 @@ As of now, here is the list of achievements of this project:
 ## Documentation
 
 ### Getting started
- - [Getting started with InfiniTime 1.0 (quick user guide, update bootloader and InfiniTime,...)](doc/gettingStarted/gettingStarted-1.0.md)
- - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/ota-gadgetbridge-nrfconnect.md)
+ - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/gettingStarted.md)
 
 ### Develop
  - [Generate the fonts and symbols](src/displayapp/fonts/README.md)
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md
index afd526e..b70bdfc 100644
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@@ -3,7 +3,6 @@
 To build this project, you'll need:
  - A cross-compiler : [ARM-GCC (9-2020-q2-update)](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads/9-2020-q2-update)
  - The NRF52 SDK 15.3.0 : [nRF-SDK v15.3.0](https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip)
- - The `cbor` and `intelhex` modules for Python 3
  - A reasonably recent version of CMake (I use 3.16.5)
 
 ## Build steps 
@@ -222,4 +221,4 @@ Loading section .sec6, size 0x10000 lma 0x30000
 Loading section .sec7, size 0xdf08 lma 0x40000
 Start address 0x0, load size 314200
 Transfer rate: 45 KB/sec, 969 bytes/write.
-```
+```
\ No newline at end of file
diff --git a/doc/contribute.md b/doc/contribute.md
index 09d2077..7958eea 100644
--- a/doc/contribute.md
+++ b/doc/contribute.md
@@ -2,13 +2,13 @@
 ## Report bugs
 You use your Pinetime and find a bug in the firmware? [Create an issue on Github](https://github.com/JF002/InfiniTime/issues) explaining the bug, how to reproduce it, the version of the firmware you use...
 ## Write and improve documentation
-Documentation might be incomplete, or not clear enough, and it is always possible to improve it with better wording, pictures, photo, video,...
+Documentation might be incomplete, or not clear enough, and it is always possible to improve it with better wording, pictures, photo, video,... 
 
 As the documentation is part of the source code, you can submit your improvements to the documentation by submitting a pull request (see below).
 ## Fix bugs, add functionalities and improve the code
 You want to fix a bug, add a cool new functionality or improve the code? See *How to submit a pull request below*.
 ## Spread the word
-The Pinetime is a cool open source project that deserves to be known. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open-source firmware for a smartwatch!
+Pinetime is a cool open source project that deserves to be know. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open-source firmware for a smartwatch!
 
 # How to submit a pull request ?
 
@@ -21,28 +21,28 @@ The Pinetime is a cool open source project that deserves to be known. Talk about
  - Write documentation related to your new feature is applicable;
  - Create the pull-request and write a great description about it : what does your PR do, why, how,... Add pictures and video if possible;
  - Wait for someone to review your PR and take part in the review process;
- - Your PR will eventually be merged :)
+ - You PR will eventually be merged :)
 
-Your contribution is more than welcome!
+Your contribution is more than welcome! 
 
 If you want to fix a bug, add a functionality or improve the code, you'll first need to create a branch from the **develop** branch (see [this page about the branching model](./branches.md)). This branch is called a feature branch, and you should choose a name that explains what you are working on (ex: "add-doc-about-contributions"). In this branch, **focus on only one topic, bug or feature**. For example, if you created this branch to work on the UI of a specific application, do not commit modifications about the SPI driver. If you want to work on multiple topics, create one branch per topic.
 
 When your feature branch is ready, **make sure it actually works** and **do not forget to write documentation** about it if it's relevant.
 
-I **strongly discourage to create a PR containing modifications that haven't been tested**. If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedback about your code.
+I **strongly discourage to create a PR containing modifications that haven't been tested**. If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedbacks about your code.
 
 Also, before submitting your PR, check the coding style of your code against the **coding conventions** detailed below. This project also provides [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy) configuration files. You can use them to ensure correct formatting of your code.
 
 Do not forget to check the files you are going to commit and remove those who are not necessary (config files from your IDE, for example). Remove old comments, commented code,...
 
-Then, you can submit a pull-request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how is it designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of your work.
+Then, you can submit a pull-request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how is it designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of you work.
 
-Other contributors can post comments about the pull request, maybe ask for more info or adjustments in the code.
+Other contributors can post comments about the pull request, maybe ask for more info or adjustements in the code.
 
-Once the pull request is reviewed and accepted, it'll be merge in **develop** and will be released in the next release version of the firmware.
+Once the pull request is reviewed an accepted, it'll be merge in **develop** and will be released in the next release version of the firmware.
 
 ## Why  all these rules?
-Reviewing pull-requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Every little thing you do to make their lives easier will **increase the chances your PR will be merge quickly**.
+Reviewing pull-requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Every little thing you do to make their lifes easier will **increase the chances your PR will be merge quickly**.
 
 When reviewing PR, the author and contributors will first look at the **description**. If it's easy to understand what the PR does, why the modification is needed or interesting and how it's done, a good part of the work is already done : we understand the PR and its context.
 
@@ -58,12 +58,12 @@ It's totally normal for a PR to need some more work even after it was created, t
 ## Language
 The language of this project is **C++**, and all new code must be written in C++. (Modern) C++ provides a lot of useful tools and functionalities that are beneficial for embedded software development like `constexpr`, `template` and anything that provides zero-cost abstraction.  
 
-It's OK to include C code if this code comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK.
+It's OK to include C code if this code comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK. 
 
 ## Coding style
-The most important rule to follow is to try to keep the code as easy to read and maintain as possible.
+The most important rule to follow is to try to keep the code as easy to read and maintain as possible. 
 
- - **Indentation** : 2 spaces, no tabulation
+ - **Identation** : 2 spaces, no tabulation
  - **Opening brace** at the end of the line
  - **Naming** : Choose self-describing variable name
     - **class** : PascalCase
diff --git a/doc/gettingStarted/appmenu-071.jpg b/doc/gettingStarted/appmenu-071.jpg
deleted file mode 100644
index dee7c8f..0000000
Binary files a/doc/gettingStarted/appmenu-071.jpg and /dev/null differ
diff --git a/doc/gettingStarted/appmenu.jpg b/doc/gettingStarted/appmenu.jpg
deleted file mode 100644
index 1e52fe7..0000000
Binary files a/doc/gettingStarted/appmenu.jpg and /dev/null differ
diff --git a/doc/gettingStarted/bootloader-1.0.jpg b/doc/gettingStarted/bootloader-1.0.jpg
deleted file mode 100644
index 7b63918..0000000
Binary files a/doc/gettingStarted/bootloader-1.0.jpg and /dev/null differ
diff --git a/doc/gettingStarted/gettingStarted-1.0.md b/doc/gettingStarted/gettingStarted-1.0.md
deleted file mode 100644
index 2ac22b9..0000000
--- a/doc/gettingStarted/gettingStarted-1.0.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# Getting started with InfiniTime 1.0
-On April 22 2021, InfiniTime and Pine64 [announced the release of InfiniTime 1.0](https://www.pine64.org/2021/04/22/its-time-infinitime-1-0/) and the availability of PineTime smartwatches as *enthusiast grade end-user product*. This page aims to guide you with your first step with your new PineTime.
-
-## Firmware, InfiniTime, Bootloader, Recovery firmware, OTA, DFU... What is it?
-You might have already seen these words by reading the announcement, release notes, or [the wiki guide](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0) and, you may find them misleading if you're not familiar with the project.
-
-Basically, a **firmware** is just a software running on the embedded hardware of a device, the PineTime in this case.
-**InfiniTime** is based on 3 distinct **firmwares**:
- - **[InfiniTime](https://github.com/JF002/InfiniTime)** itself, this is the *application firmware* running on the PineTime. This is the main firmware which provides most of the functionalities you'll use on a daily basis : bluetooth low-energy (BLE) connectivity, applications, watchfaces,...
- - **[The bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader)** is responsible for safely applying **updates** of the *application firmware*, reverting them in case of issues and load the recovery firmware when requested.
- - **The recovery firmware** is a specific *application firmware* than can be loaded by the bootloader on user request. This firmware can be useful in case of serious issue, when the main application firmware cannot perform an OTA update correctly. Currently, this  recovery firmware is based on [InfiniTime 0.14.1](https://github.com/JF002/InfiniTime/releases/tag/0.14.1).
-
-**OTA** and **DFU** refer to the update of the firmware over BLE (**B**luetooth **L**ow **E**nergy). **OTA** means **O**ver **T**he **A**ir, this is a functionality that allows the user to update the firmware how their device using a wireless communication like BLE. When we talk about **DFU** (**D**igital **F**irmware **U**pdate), we refer to the file format and protocol used to send the update of the firmware to the watch over-the-air. InfiniTime implement the (legacy) DFU protocol from Nordic Semiconductor (NRF).
-
-## How to check the version of InfiniTime and the bootloader?
-Since September 2020, all PineTimes (devkits or sealed) are flashed using the **[first iteration of the bootloader](https://github.com/lupyuen/pinetime-rust-mynewt/releases/tag/v4.1.7)** and **[InfiniTime 0.7.1](https://github.com/JF002/InfiniTime/releases/tag/0.7.1)**. There was no recovery firmware at that time.
-
-The bootloader only runs when the watch starts (from an empty battery, for example) or after a reset (after a succesful OTA or a manual reset - long push on the button). 
-
-You can recognize this first iteration of the bootloader with it greenish **PINETIME** logo.
-
-![Old bootloader logo](oldbootloaderlogo.jpg)
-
-You can check the version of InfiniTime by opening the app *SystemInfo*. For version < 1.0:
-
-![InfiniTime 0.7.1 Application menu](appmenu-071.jpg)
-![InfiniTime 0.7.1 version](version-071.jpg)
-
-And for version >= 1.0 :
-
-![InfiniTime 1.0 version](version-1.0.jpg)
-
-
-PineTime shipped from June 2020 (to be confirmed) will be flashed with the [new version of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0), the [recovery firmware](https://github.com/JF002/InfiniTime/releases/tag/0.14.1) and [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/tag/1.0.0).
-
-The bootloader is easily recognizable with it white pine cone that is progressively drawn in green. It also displays its own version on the bottom (1.0.0 as of now).
-
-![Bootloader 1.0](bootloader-1.0.jpg)
-
-## How to update your PineTime?
-To update your PineTime, you can use one of the compatible companion applications. Here are the main ones:
-
- - **[Amazfish](https://github.com/piggz/harbour-amazfish)** (Desktop Linux, mobile Linux, SailfishOS, runs on the PinebookPro and the Pinephone)
- - **[Gadgetbridge](https://www.gadgetbridge.org/)** (Android)
- - **[Siglo](https://github.com/alexr4535/siglo)** (Linux, GTK based)
- - **NRFConnect** (closed source, Android & iOS).
-
-See [this page](ota-gadgetbridge-nrfconnect.md) for more info about the OTA procedure using Gadgetbrige and NRFCOnnect.
-
-### From InfiniTime 0.7.1 / old bootloader
-If your PineTime is currently running InfiniTime 0.7.1 and the old bootloader, we strongly recommend you update them to more recent version (Bootloader 1.0.0 and InfiniTime 1.0.0 as of now). We also recommend you install the recovery firmware once the bootloader is up-do-date.
-
-Using the companion app of your choice, you'll need to apply the OTA procedure for these 3 firmwares in this sequence (failing to follow this specific order might temporarily or permanently brick your device):
- 
- 1. Flash the latest version of InfiniTime. The file to upload is named **pinetime-mcuboot-app-dfu-x.y.z.zip**. Here is the link to [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/download/1.0.0/pinetime-mcuboot-app-dfu-1.0.0.zip).
- 2. Update the bootloader by applying the OTA procedure with the file named [**reloader-mcuboot.zip** from the repo of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/download/1.0.0/reloader-mcuboot.zip). 
- 3. Install the recovery firmware by applying the OTA procedure with the file named [**pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip** from the version 0.14.1 of InfiniTime](https://github.com/JF002/InfiniTime/releases/download/0.14.1/pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip).
-
-You'll find more info about this process in [this wiki page](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0). You can also see the procedure in video [here](https://video.codingfield.com/videos/watch/831077c5-16f3-47b4-9b2b-c4bbfecc6529) and [here (from Amazfish)](https://video.codingfield.com/videos/watch/f7bffb3d-a6a1-43c4-8f01-f4aeff4adf9e)
-
-### From version > 1.0
-If you are already running the new "1.0.0" bootloader, all you have to do is update your version of InfiniTime when it'll be available. We'll write specific instructions when (if) we release a new version of the bootloader.
-
-### Firmware validation
-The bootloader requires a (manual) validation of the firmware. If the watch reset with an updated firmware that was not validated, the bootloader will consider it as non-functionning and will revert to the previous version of the firmware. This is a safety feature to prevent bricking your device with a faulty firmware.
-
-You can validate your updated firmware on InfiniTime >= 1.0 by following this simple procedure:
- 
- - From the watchface, swipe **right** to display the *Quick Actions menu*
- - Open the **Settings** app by tapping the *gear* icon on the bottom right
- - Swipe down and tap on the entry named **Firmware**
- - This app shows the version that is currently running. If it's not validated yet, it displays 2 buttons:
-    - **Validate** to validate your firmware
-    - **Reset** to reset the watch and revert to the previously running version of the firmware
-    
-## InfiniTime 1.0 quick user guide
-### Setting the time
-By default, InfiniTime starts on the digital watchface. It'll probably display the epoch time (1 Jan 1970, 00:00). The time will be automatically synchronized once you connect on of the companion app to your PineTime using BLE connectivity. InfiniTime does not provide any way to manually set the time for now.
-
-### Navigation in the menu
-
-![Quick actions](quickactions.jpg)
-![Settings](settings.jpg)
-![Application menu](appmenu.jpg)
-
- - Swipe **down** to display the notification panel. Notification sent by your companion app will be displayed in this panel.
- - Swipe **up** to display the application menus. Apps (stopwatch, music, step, games,...) can be started from this menu.
- - Swipe **right** to display the Quick Actions menu. This menu allows you to
-    - Set the brightness of the display
-    - Start the **flashlight** app
-    - Enable/disable vibrations on notifications (Do Not Disturb mode)
-    - Enter the **settings** menu
- - Settings 
-    - Display timeout
-    - Wake up event (Tap, wrist rotation)
-    - Time format (12/24H)
-    - Default watchface (digital / analog)
-    - Battery info
-    - Firmware validation
-    - About (system info, firmware version,...)
-
-### Bootloader
-
-Most of the time, the bootloader just runs without your intervention (update and load the firmware).
-
-However, you can enable 2 functionalities using the push button:
- 
- - Push the button until the pine cone is drawn in **blue** to force the rollback of the previous version of the firmware, even if you've already validated the updated one
- - Push the button until the pine cone is drawn in **red** to load the recovery firmware. This recovery firmware only provides BLE connectivity and OTA functionality.
-
-More info about the bootloader in [its project page](https://github.com/JF002/pinetime-mcuboot-bootloader/blob/master/README.md).
-
diff --git a/doc/gettingStarted/oldbootloaderlogo.jpg b/doc/gettingStarted/oldbootloaderlogo.jpg
deleted file mode 100644
index b4d0cdf..0000000
Binary files a/doc/gettingStarted/oldbootloaderlogo.jpg and /dev/null differ
diff --git a/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md b/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
deleted file mode 100644
index 1187a9b..0000000
--- a/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Flash and upgrade InfiniTime
-If you just want to flash or upgrade InfiniTime on your PineTime, this page is for you!
-
-- [InfiniTime releases and versions](#infinitime-releases-and-versions)
-- [How to upgrade Over-The-Air (OTA)](#how-to-upgrade-over-the-air-ota)
-    - [Using Gadgetbridge](#using-gadgetbridge)
-    - [Using NRFConnect](#Using-nrfconnect)
-- [How to flash InfiniTime using the SWD interface](#how-to-flash-infinitime-using-the-swd-interface)
-
-## InfiniTime releases and versions
-All releases of InfiniTime are available on the [release page of the GitHub repo](https://github.com/JF002/InfiniTime/releases).
-
-Versions that are tagged as **RELEASE CANDIDATE** are pre-release versions, that are available for testing before actually releasing a new stable version. If you want to help us debug the project and provide stable versions to other user, you can use them. If you want stable and tested version, you should not flash these release candidate version.
-
-Release files are available under the *Assets* button.
-
-## How to upgrade Over-The-Air (OTA)
-OTA is the easiest method to upgrade InfiniTime. Note that it's only possible is your PineTime is already running InfiniTime (>= 0.7.1).
-
-2 companion apps provide support for OTA : 
- - [Gadgetbridge](https://gadgetbridge.org/) (open source, runs on Android, [available on F-Droid](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/)). 
- - [NRFConnect](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Connect-for-mobile) (close source, runs on Android and iOS).
- 
-Both applications need you to download the **DFU file** of InfiniTime. This file contains the new version of InfiniTime that will be flashed into your device. It's called **dfu-x.y.z.zip** (ex: dfu-0.9.0.zip) in the release note.
-![Dfu file](dfuFile.png )
-
-### Using Gadgetbridge
-Launch Gadgetbridge and tap on the **"+"** button on the bottom right to add a new device:
-
-![Gadgetbridge 0](gadgetbridge0.jpg)
-
-Wait for the scan to complete, your PineTime should be detected:
-
-![Gadgetbridge 1](gadgetbridge1.jpg)
-
-Tap on it. Gadgdetbridge will pair and connect to your device:
-
-![Gadgetbridge 2](gadgetbridge2.jpg)
-
-Now that Gadgetbridge is connected to your PineTime, use a file browser application (I'm using Seafile to browse my NAS) and browse to the DFU file (image-xxx.zip) you downloaded previously. Tap on it and open it using the Gadgetbridge application/firmware installer:
-
-![Gadgetbridge 3](gadgetbridge3.jpg)
-
-Read carefully the warning and tap **Install**:
-
-![Gadgetbridge 4](gadgetbridge4.jpg)
-
-Wait for the transfer to finish. Your PineTime should reset and reboot with the new version of InfiniTime!
-
-![Gadgetbridge 5](gadgetbridge5.jpg)
-
-### Using NRFConnect
-Open NRFConnect. Swipe down in the *Scanner* tab and wait for your device to appear:
-
-![NRFConnect 0](nrfconnect0.jpg)
-
-Tap on the *Connect* button on the right of your device. NRFConnect will connect to your PineTime and discover its characteristics. Tap on the **DFU** button on the top right:
-
-![NRFConnect 1](nrfconnect1.jpg)
-
-Select **Distribution packet (ZIP)**:
-
-![NRFConnect 2](nrfconnect2.jpg)
-
-Browse to the DFU file you downloaded previously, the DFU transfer will start automatically. When the transfer is finished, your PineTime will reset and restart on the new version of InfiniTime!
-
-![NRFConnect 3](nrfconnect3.jpg)
-
-## How to flash InfiniTime using the SWD interface
-Download the files **bootloader.bin**, **image-x.y.z.bin** and **pinetime-graphics-x.y.z.bin** from the release page:
-
-![Image file](imageFile.png )
-
-The bootloader reads a boot logo from the external SPI flash memory. The first step consists in flashing a tool in the MCU that will flash the boot logo into this SPI flash memory. This first step is optional but recommanded (the bootloader will display garbage on screen for a few second if you don't do it).
-Using your SWD tool, flash **pinetime-graphics-x.y.z.bin** at offset **0x0000**. Reset the MCU and wait for a few second, until the logo is completely drawn on the display.
-
-Then, using your SWD tool, flash those file at specific offset:
-
- - bootloader.bin : **0x0000**
- - image-x.y.z.bin : **0x8000**
-
-Reset and voilà, you're running InfiniTime on your PineTime!
- 
-If you are using OpenOCD with a STLinkV2, you can find more info [on this page](../openOCD.md).
-
-## How to synchronize the time
-
-### Using Gadgetbridge
-Good news! Gadgetbridge **automatically** synchronizes the time when connecting to your PineTime!
-
-### Using NRFConnect
-You must enable the **CTS** *GATT server* into NRFConnect so that InfiniTime can synchronize the time with your smartphone.
-
-Launch NRFConnect, tap the sandwich button on the top left and select *Configure GATT server*:
-
-![NRFConnect CTS 0](nrfconnectcts0.jpg)
-
-
-Tap *Add service* and select the server configuration *Current Time service*. Tap OK and connect to your PineTime, it should automcatically sync the time once the connection is established!
-
-![NRFConnect CTS 1](nrfconnectcts1.jpg)
diff --git a/doc/gettingStarted/quickactions.jpg b/doc/gettingStarted/quickactions.jpg
deleted file mode 100644
index 0d92b13..0000000
Binary files a/doc/gettingStarted/quickactions.jpg and /dev/null differ
diff --git a/doc/gettingStarted/settings.jpg b/doc/gettingStarted/settings.jpg
deleted file mode 100644
index 510b29e..0000000
Binary files a/doc/gettingStarted/settings.jpg and /dev/null differ
diff --git a/doc/gettingStarted/version-071.jpg b/doc/gettingStarted/version-071.jpg
deleted file mode 100644
index bc9bc5b..0000000
Binary files a/doc/gettingStarted/version-071.jpg and /dev/null differ
diff --git a/doc/gettingStarted/version-1.0.jpg b/doc/gettingStarted/version-1.0.jpg
deleted file mode 100644
index bcfc8c6..0000000
Binary files a/doc/gettingStarted/version-1.0.jpg and /dev/null differ
diff --git a/docker/.gitpod.Dockerfile b/docker/.gitpod.Dockerfile
index 4fbc7be..2f7099a 100644
--- a/docker/.gitpod.Dockerfile
+++ b/docker/.gitpod.Dockerfile
@@ -19,11 +19,8 @@ RUN apt-get update -qq \
       libffi-dev \
       libssl-dev \
       python3-dev \
-      git \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
-# Git needed for PROJECT_GIT_COMMIT_HASH variable setting
-
 # Needs to be installed as root
 RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0a4f69f..a6caa24 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,11 +19,8 @@ RUN apt-get update -qq \
       libssl-dev \
       python3-dev \
       python \
-      git \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
-# Git needed for PROJECT_GIT_COMMIT_HASH variable setting
-
 RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index acbfba1..5c6af93 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -406,7 +406,6 @@ list(APPEND SOURCE_FILES
         displayapp/screens/FlashLight.cpp
         displayapp/screens/List.cpp
         displayapp/screens/BatteryInfo.cpp
-        displayapp/screens/Steps.cpp
 
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp
@@ -415,12 +414,12 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingTimeFormat.cpp
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
-        displayapp/screens/settings/SettingSteps.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
+        displayapp/screens/PineTimeStyle.cpp
 
         ##
 
@@ -468,7 +467,7 @@ list(APPEND SOURCE_FILES
         displayapp/fonts/jetbrains_mono_extrabold_compressed.c
         displayapp/fonts/jetbrains_mono_bold_20.c
         displayapp/fonts/jetbrains_mono_76.c
-        displayapp/fonts/jetbrains_mono_42.c
+        displayapp/fonts/open_sans_light.c
         displayapp/fonts/lv_font_sys_48.c
         displayapp/lv_pinetime_theme.c
 
diff --git a/src/Version.h.in b/src/Version.h.in
index 8cd39c9..6ff5938 100644
--- a/src/Version.h.in
+++ b/src/Version.h.in
@@ -8,13 +8,11 @@ namespace Pinetime {
       static constexpr uint32_t Major() {return major;}
       static constexpr uint32_t Minor() {return minor;}
       static constexpr uint32_t Patch() {return patch;}
-      static constexpr const char* GitCommitHash() {return commitHash;}
       static constexpr const char* VersionString() {return versionString;}
     private:
       static constexpr uint32_t major = @PROJECT_VERSION_MAJOR@;
       static constexpr uint32_t minor = @PROJECT_VERSION_MINOR@;
       static constexpr uint32_t patch = @PROJECT_VERSION_PATCH@;
-      static constexpr const char* commitHash = "@PROJECT_GIT_COMMIT_HASH@";
       static constexpr const char* versionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
   };
 }
\ No newline at end of file
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index 3a23826..bf64481 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -8,13 +8,13 @@ namespace Pinetime {
     public:
       void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps);
 
-      int16_t X() const {
+      uint16_t X() const {
         return x;
       }
-      int16_t Y() const {
+      uint16_t Y() const {
         return y;
       }
-      int16_t Z() const {
+      uint16_t Z() const {
         return z;
       }
       uint32_t NbSteps() const {
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 4409425..18c87fd 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -86,14 +86,6 @@ namespace Pinetime {
         return settings.brightLevel;
       };
 
-      void SetStepsGoal( uint32_t goal ) { 
-        if ( goal != settings.stepsGoal ) 
-          settingsChanged = true;
-        settings.stepsGoal = goal; 
-      };
-      
-      uint32_t GetStepsGoal() const { return settings.stepsGoal; };
-
     private:
       Pinetime::Drivers::SpiNorFlash& spiNorFlash;
       struct SettingsData {
@@ -103,7 +95,7 @@ namespace Pinetime {
 
         uint8_t clockFace = 0;
 
-        uint32_t stepsGoal = 10000;
+        uint32_t stepsGoal = 1000;
         uint32_t screenTimeOut = 15000;
 
         WakeUpMode wakeUpMode = WakeUpMode::None;
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 09a2018..936a3ae 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -21,14 +21,12 @@ namespace Pinetime {
       Navigation,
       StopWatch,
       Motion,
-      Steps,
       QuickSettings,
       Settings,
       SettingWatchFace,
       SettingTimeFormat,
       SettingDisplay,
-      SettingWakeUp,
-      SettingSteps
+      SettingWakeUp
     };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index a6c4a3e..3a20c76 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -25,7 +25,6 @@
 #include "displayapp/screens/Twos.h"
 #include "displayapp/screens/FlashLight.h"
 #include "displayapp/screens/BatteryInfo.h"
-#include "displayapp/screens/Steps.h"
 
 #include "drivers/Cst816s.h"
 #include "drivers/St7789.h"
@@ -38,7 +37,6 @@
 #include "displayapp/screens/settings/SettingTimeFormat.h"
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
-#include "displayapp/screens/settings/SettingSteps.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Applications::Display;
@@ -67,7 +65,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     notificationManager {notificationManager},
     heartRateController {heartRateController},
     settingsController {settingsController},
-    motorController {motorController},
+    motorController{motorController},
     motionController {motionController} {
   msgQueue = xQueueCreate(queueSize, itemSize);
   // Start clock when smartwatch boots
@@ -75,9 +73,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
 }
 
 void DisplayApp::Start() {
-  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle)) {
+  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle))
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
-  }
 }
 
 void DisplayApp::Process(void* instance) {
@@ -88,7 +85,7 @@ void DisplayApp::Process(void* instance) {
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
-  while (true) {
+  while (1) {
     app->Refresh();
   }
 }
@@ -216,7 +213,7 @@ void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction)
   LoadApp(app, direction);
 }
 
-void DisplayApp::ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
+void DisplayApp::returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
   returnToApp = app;
   returnDirection = direction;
   returnTouchEvent = touchEvent;
@@ -227,12 +224,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
   SetFullRefresh(direction);
 
   // default return to launcher
-  ReturnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+  returnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
 
   switch (app) {
     case Apps::Launcher:
       currentScreen = std::make_unique<Screens::ApplicationList>(this, settingsController, batteryController, dateTimeController);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::None:
     case Apps::Clock:
@@ -248,7 +245,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
 
     case Apps::FirmwareValidation:
       currentScreen = std::make_unique<Screens::FirmwareValidation>(this, validator);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::FirmwareUpdate:
       currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController);
@@ -257,58 +254,54 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Notifications:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Normal);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::NotificationsPreview:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Preview);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
 
     // Settings
     case Apps::QuickSettings:
-      currentScreen = std::make_unique<Screens::QuickSettings>(
-        this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
-      ReturnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
+      currentScreen =
+        std::make_unique<Screens::QuickSettings>(this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
+      returnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
       break;
     case Apps::Settings:
       currentScreen = std::make_unique<Screens::Settings>(this, settingsController);
-      ReturnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWatchFace:
       currentScreen = std::make_unique<Screens::SettingWatchFace>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingTimeFormat:
       currentScreen = std::make_unique<Screens::SettingTimeFormat>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWakeUp:
       currentScreen = std::make_unique<Screens::SettingWakeUp>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingDisplay:
       currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
-      break;
-    case Apps::SettingSteps: 
-      currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SysInfo:
       currentScreen =
         std::make_unique<Screens::SystemInfo>(this, dateTimeController, batteryController, brightnessController, bleController, watchdog);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
       //
 
     case Apps::FlashLight:
       currentScreen = std::make_unique<Screens::FlashLight>(this, systemTask, brightnessController);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
+      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
       break;
     case Apps::StopWatch:
       currentScreen = std::make_unique<Screens::StopWatch>(this);
@@ -334,9 +327,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
       break;
-    case Apps::Steps: 
-      currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
-      break;
   }
   currentApp = app;
 }
@@ -359,9 +349,8 @@ TouchEvents DisplayApp::OnTouchEvent() {
   if (info.isTouch) {
     switch (info.gesture) {
       case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        if (touchMode == TouchModes::Gestures) {
+        if (touchMode == TouchModes::Gestures)
           lvgl.SetNewTapEvent(info.x, info.y);
-        }
         return TouchEvents::Tap;
       case Pinetime::Drivers::Cst816S::Gestures::LongPress:
         return TouchEvents::LongTap;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index ffe27cf..75e5275 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -103,7 +103,7 @@ namespace Pinetime {
       static void Process(void* instance);
       void InitHw();
       void Refresh();
-      void ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
+      void returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
       void LoadApp(Apps app, DisplayApp::FullRefreshDirections direction);
     };
   }
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index a132a47..6db987f 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -37,7 +37,7 @@ void DisplayApp::Process(void* instance) {
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
   app->InitHw();
-  while (true) {
+  while (1) {
     app->Refresh();
   }
 }
@@ -51,11 +51,10 @@ void DisplayApp::Refresh() {
   if (xQueueReceive(msgQueue, &msg, 200)) {
     switch (msg) {
       case Display::Messages::UpdateBleConnection:
-        if (bleController.IsConnected()) {
+        if (bleController.IsConnected())
           DisplayLogo(colorBlue);
-        } else {
+        else
           DisplayLogo(colorWhite);
-        }
         break;
       case Display::Messages::BleFirmwareUpdateStarted:
         DisplayLogo(colorGreen);
diff --git a/src/displayapp/fonts/jetbrains_mono_42.c b/src/displayapp/fonts/jetbrains_mono_42.c
deleted file mode 100644
index 6f25f5a..0000000
--- a/src/displayapp/fonts/jetbrains_mono_42.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Size: 42 px
- * Bpp: 1
- * Opts: 
- ******************************************************************************/
-
-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-#ifndef JETBRAINS_MONO_42
-#define JETBRAINS_MONO_42 1
-#endif
-
-#if JETBRAINS_MONO_42
-
-/*-----------------
- *    BITMAPS
- *----------------*/
-
-/*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
-    /* U+0025 "%" */
-    0x1f, 0x80, 0x7, 0x3f, 0xc0, 0xe, 0x7f, 0xe0,
-    0x1c, 0xf0, 0xf0, 0x1c, 0xe0, 0x70, 0x38, 0xe0,
-    0x70, 0x70, 0xe0, 0x70, 0x70, 0xe0, 0x70, 0xe0,
-    0xe0, 0x71, 0xc0, 0xe0, 0x71, 0xc0, 0xf0, 0xf3,
-    0x80, 0x7f, 0xe7, 0x0, 0x3f, 0xc7, 0x0, 0x1f,
-    0x8e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x3c, 0x0,
-    0x0, 0x38, 0x0, 0x0, 0x71, 0xf8, 0x0, 0xe3,
-    0xfc, 0x0, 0xe7, 0xfe, 0x1, 0xcf, 0xf, 0x3,
-    0x8e, 0x7, 0x3, 0x8e, 0x7, 0x7, 0xe, 0x7,
-    0xe, 0xe, 0x7, 0xe, 0xe, 0x7, 0x1c, 0xe,
-    0x7, 0x38, 0xf, 0xf, 0x38, 0x7, 0xfe, 0x70,
-    0x3, 0xfc, 0xe0, 0x1, 0xf8,
-
-    /* U+0030 "0" */
-    0x3, 0xf8, 0x1, 0xff, 0xc0, 0xff, 0xfe, 0x1f,
-    0x7, 0xc7, 0xc0, 0x7c, 0xf0, 0x7, 0xbc, 0x0,
-    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xfe, 0x0, 0x3f,
-    0xc0, 0x7, 0xf8, 0x0, 0xff, 0xe, 0x1f, 0xe3,
-    0xe3, 0xfc, 0x7c, 0x7f, 0x8f, 0x8f, 0xf0, 0xe1,
-    0xfe, 0x0, 0x3f, 0xc0, 0x7, 0xf8, 0x0, 0xff,
-    0x0, 0x1f, 0xe0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
-    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
-    0x1f, 0x7, 0xc3, 0xff, 0xf8, 0x1f, 0xfc, 0x0,
-    0xfe, 0x0,
-
-    /* U+0031 "1" */
-    0x3, 0xf0, 0x0, 0xfe, 0x0, 0x3f, 0xc0, 0x1f,
-    0xf8, 0x7, 0xcf, 0x1, 0xf1, 0xe0, 0x3c, 0x3c,
-    0x7, 0x7, 0x80, 0x80, 0xf0, 0x0, 0x1e, 0x0,
-    0x3, 0xc0, 0x0, 0x78, 0x0, 0xf, 0x0, 0x1,
-    0xe0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
-    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0, 0x78, 0x0,
-    0xf, 0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x7,
-    0x80, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x3, 0xc0,
-    0x0, 0x78, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xf8,
-
-    /* U+0032 "2" */
-    0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfe, 0x1f,
-    0x7, 0xc7, 0xc0, 0x3c, 0xf0, 0x7, 0xbc, 0x0,
-    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xe0, 0x0, 0x3c,
-    0x0, 0x7, 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x0,
-    0xf, 0x80, 0x1, 0xe0, 0x0, 0x7c, 0x0, 0x1f,
-    0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7e, 0x0,
-    0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0, 0x3e,
-    0x0, 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0,
-    0x3e, 0x0, 0x7, 0xff, 0xfe, 0xff, 0xff, 0xdf,
-    0xff, 0xf8,
-
-    /* U+0033 "3" */
-    0x7f, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xfe, 0x0,
-    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf,
-    0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e, 0x0,
-    0x7, 0x80, 0x1, 0xfe, 0x0, 0x3f, 0xf0, 0x7,
-    0xff, 0x0, 0x3, 0xf0, 0x0, 0x1e, 0x0, 0x3,
-    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
-    0x0, 0x1e, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
-    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
-    0x1f, 0x7, 0xc3, 0xff, 0xf0, 0x1f, 0xfc, 0x0,
-    0xfe, 0x0,
-
-    /* U+0034 "4" */
-    0x0, 0x1e, 0x0, 0xf, 0x80, 0x3, 0xc0, 0x1,
-    0xe0, 0x0, 0x78, 0x0, 0x3c, 0x0, 0x1f, 0x0,
-    0x7, 0x80, 0x3, 0xc0, 0x1, 0xf0, 0x0, 0x78,
-    0x0, 0x3e, 0x0, 0xf, 0x0, 0x7, 0x80, 0xf3,
-    0xe0, 0x3c, 0xf0, 0xf, 0x7c, 0x3, 0xde, 0x0,
-    0xff, 0x0, 0x3f, 0xc0, 0xf, 0xf0, 0x3, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x3,
-    0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0,
-    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c,
-
-    /* U+0035 "5" */
-    0x7f, 0xff, 0x9f, 0xff, 0xe7, 0xff, 0xf9, 0xe0,
-    0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x80, 0x1,
-    0xe0, 0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x8f,
-    0x81, 0xef, 0xf8, 0x7f, 0xff, 0x1f, 0x87, 0xe7,
-    0xc0, 0x79, 0xe0, 0x1f, 0x0, 0x3, 0xc0, 0x0,
-    0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0, 0x3, 0xc0,
-    0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0xf0, 0x3,
-    0xde, 0x1, 0xe7, 0x80, 0x78, 0xf8, 0x7e, 0x3f,
-    0xff, 0x3, 0xff, 0x80, 0x3f, 0x0,
-
-    /* U+0036 "6" */
-    0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x78, 0x0,
-    0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e, 0x0, 0x3,
-    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x70,
-    0x0, 0xf, 0x0, 0x1, 0xe7, 0xc0, 0x1f, 0xff,
-    0x3, 0xff, 0xfc, 0x3f, 0xf, 0xc7, 0xc0, 0x3e,
-    0x78, 0x1, 0xe7, 0x80, 0x1f, 0xf0, 0x0, 0xff,
-    0x0, 0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
-    0x0, 0xff, 0x0, 0xf, 0xf8, 0x1, 0xe7, 0x80,
-    0x1e, 0x7c, 0x3, 0xe3, 0xf0, 0xfc, 0x1f, 0xff,
-    0x80, 0xff, 0xf0, 0x1, 0xf8, 0x0,
-
-    /* U+0037 "7" */
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x0, 0x1e, 0xf0, 0x1, 0xef, 0x0, 0x1e, 0xf0,
-    0x3, 0xcf, 0x0, 0x3c, 0x0, 0x3, 0x80, 0x0,
-    0x78, 0x0, 0x7, 0x80, 0x0, 0xf0, 0x0, 0xf,
-    0x0, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x1, 0xe0,
-    0x0, 0x3c, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0,
-    0x7, 0x80, 0x0, 0x78, 0x0, 0x7, 0x80, 0x0,
-    0xf0, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e,
-    0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x3, 0xc0,
-    0x0, 0x7c, 0x0, 0x7, 0x80, 0x0,
-
-    /* U+0038 "8" */
-    0x1, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
-    0xf0, 0xfc, 0x3c, 0x3, 0xc7, 0xc0, 0x3e, 0x78,
-    0x1, 0xe7, 0x80, 0x1e, 0x78, 0x1, 0xe7, 0x80,
-    0x1e, 0x3c, 0x3, 0xc3, 0xe0, 0x7c, 0x1f, 0xf,
-    0x80, 0xff, 0xf0, 0x3, 0xfc, 0x0, 0x7f, 0xe0,
-    0xf, 0xff, 0x3, 0xe0, 0x7c, 0x3c, 0x3, 0xc7,
-    0x80, 0x1e, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
-    0x0, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x80,
-    0x1f, 0x7c, 0x3, 0xe7, 0xe0, 0x7e, 0x3f, 0xff,
-    0xc0, 0xff, 0xf0, 0x3, 0xfc, 0x0,
-
-    /* U+0039 "9" */
-    0x3, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
-    0xe0, 0xfc, 0x7c, 0x3, 0xe7, 0x80, 0x1e, 0xf8,
-    0x1, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x0,
-    0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf8, 0x1,
-    0xf7, 0x80, 0x1e, 0x7c, 0x3, 0xe3, 0xe0, 0x7e,
-    0x3f, 0xff, 0xc1, 0xff, 0xfc, 0x7, 0xe7, 0x80,
-    0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0,
-    0x1e, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0, 0x7,
-    0x80, 0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0,
-    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0,
-
-    /* U+003A ":" */
-    0x7d, 0xff, 0xff, 0xff, 0xef, 0x80, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
-    0xf7, 0xff, 0xff, 0xff, 0xbe
-};
-
-
-/*---------------------
- *  GLYPH DESCRIPTION
- *--------------------*/
-
-static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
-    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-    {.bitmap_index = 0, .adv_w = 403, .box_w = 24, .box_h = 31, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 93, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 167, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 4, .ofs_y = 0},
-    {.bitmap_index = 241, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 315, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 389, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 459, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 529, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 607, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 685, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 763, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 841, .adv_w = 403, .box_w = 7, .box_h = 24, .ofs_x = 9, .ofs_y = 0}
-};
-
-/*---------------------
- *  CHARACTER MAPPING
- *--------------------*/
-
-
-
-/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
-    {
-        .range_start = 37, .range_length = 1, .glyph_id_start = 1,
-        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
-    },
-    {
-        .range_start = 48, .range_length = 11, .glyph_id_start = 2,
-        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
-    }
-};
-
-
-
-/*--------------------
- *  ALL CUSTOM DATA
- *--------------------*/
-
-#if LV_VERSION_CHECK(8, 0, 0)
-/*Store all the custom data of the font*/
-static  lv_font_fmt_txt_glyph_cache_t cache;
-static const lv_font_fmt_txt_dsc_t font_dsc = {
-#else
-static lv_font_fmt_txt_dsc_t font_dsc = {
-#endif
-    .glyph_bitmap = glyph_bitmap,
-    .glyph_dsc = glyph_dsc,
-    .cmaps = cmaps,
-    .kern_dsc = NULL,
-    .kern_scale = 0,
-    .cmap_num = 2,
-    .bpp = 1,
-    .kern_classes = 0,
-    .bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
-    .cache = &cache
-#endif
-};
-
-
-/*-----------------
- *  PUBLIC FONT
- *----------------*/
-
-/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
-const lv_font_t jetbrains_mono_42 = {
-#else
-lv_font_t jetbrains_mono_42 = {
-#endif
-    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
-    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height = 31,          /*The maximum line height required by the font*/
-    .base_line = 0,             /*Baseline measured from the bottom of the line*/
-#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
-    .subpx = LV_FONT_SUBPX_NONE,
-#endif
-#if LV_VERSION_CHECK(7, 4, 0)
-    .underline_position = -7,
-    .underline_thickness = 2,
-#endif
-    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
-};
-
-
-
-#endif /*#if JETBRAINS_MONO_42*/
-
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 1eb3699..7e38b3f 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
     {Symbols::stopWatch, Apps::StopWatch},
     {Symbols::music, Apps::Music},
     {Symbols::map, Apps::Navigation},
-    {Symbols::shoe, Apps::Steps},
+    {Symbols::shoe, Apps::Motion},
     {Symbols::heartBeat, Apps::HeartRate},
     {"", Apps::None},
   }};
@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
     {Symbols::paintbrush, Apps::Paint},
     {Symbols::paddle, Apps::Paddle},
     {"2", Apps::Twos},
-    {"M", Apps::Motion},
+    {"", Apps::None},
     {"", Apps::None},
     {"", Apps::None},
   }};
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 1429984..e0c1f62 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -14,6 +14,7 @@
 #include "../DisplayApp.h"
 #include "WatchFaceDigital.h"
 #include "WatchFaceAnalog.h"
+#include "PineTimeStyle.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -42,6 +43,9 @@ Clock::Clock(DisplayApp* app,
                [this]() -> std::unique_ptr<Screen> {
                  return WatchFaceAnalogScreen();
                },
+               [this]() -> std::unique_ptr<Screen> {
+                 return PineTimeStyleScreen();
+               },
                // Examples for more watch faces
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
@@ -80,6 +84,16 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
     app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
+std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
+  return std::make_unique<Screens::PineTimeStyle>(app,
+                                                     dateTimeController,
+                                                     batteryController,
+                                                     bleController,
+                                                     notificatioManager,
+                                                     settingsController,
+                                                     heartRateController);
+}
+
 /*
 // Examples for more watch faces
 std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
@@ -91,4 +105,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
\ No newline at end of file
+*/
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 9879985..920d58b 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -47,9 +47,10 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
 
-        ScreenList<2> screens;
+        ScreenList<3> screens;
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
+        std::unique_ptr<Screen> PineTimeStyleScreen();
 
         // Examples for more watch faces
         // std::unique_ptr<Screen> WatchFaceMinimalScreen();
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index ad37a3d..873a22f 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -27,17 +27,6 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
   sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
   lv_label_set_text(labelVersionValue, version);
 
-  labelShortRefInfo = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(labelShortRefInfo, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 25);
-  lv_label_set_text(labelShortRefInfo, "ShortRef : ");
-  lv_label_set_align(labelShortRefInfo, LV_LABEL_ALIGN_LEFT);
-
-  labelShortRefValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(labelShortRefValue, labelShortRefInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
-  lv_label_set_recolor(labelShortRefValue, true);
-  sprintf(shortref, "%s", Version::GitCommitHash());
-  lv_label_set_text(labelShortRefValue, shortref);
-
   labelIsValidated = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(labelIsValidated, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 50);
   lv_label_set_recolor(labelIsValidated, true);
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 303c215..67662fd 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -25,10 +25,7 @@ namespace Pinetime {
 
         lv_obj_t* labelVersionInfo;
         lv_obj_t* labelVersionValue;
-        lv_obj_t* labelShortRefInfo;
-        lv_obj_t* labelShortRefValue;
         char version[9];
-        char shortref[9];
         lv_obj_t* labelIsValidated;
         lv_obj_t* buttonValidate;
         lv_obj_t* labelButtonValidate;
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index a8bb3c1..e719626 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -3,6 +3,8 @@
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
 
 Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionController& motionController)
   : Screen(app), motionController {motionController} {
@@ -27,16 +29,13 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
   lv_chart_init_points(chart, ser3, 0);
   lv_chart_refresh(chart); /*Required after direct set*/
 
-  label = lv_label_create(lv_scr_act(), NULL);
-  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", 0, 0, 0);
-  lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
-  lv_label_set_recolor(label, true);
-  
   labelStep = lv_label_create(lv_scr_act(), NULL);
   lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
-  lv_label_set_text(labelStep, "Steps ---");
+  lv_label_set_text(labelStep, "Steps: ");
 
+  labelStepValue = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_align(labelStepValue, labelStep, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+  lv_label_set_text(labelStepValue, "-");
 }
 
 Motion::~Motion() {
@@ -48,10 +47,8 @@ bool Motion::Refresh() {
   lv_chart_set_next(chart, ser2, motionController.Y());
   lv_chart_set_next(chart, ser3, motionController.Z());
 
-  lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps());
-
-  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
-  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+  snprintf(nbStepsBuffer, nbStepsBufferSize, "%lu", motionController.NbSteps());
+  lv_label_set_text(labelStepValue, nbStepsBuffer);
 
   return running;
 }
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index 132b20e..1100786 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -26,9 +26,9 @@ namespace Pinetime {
         lv_chart_series_t* ser1;
         lv_chart_series_t* ser2;
         lv_chart_series_t* ser3;
-        lv_obj_t* label;
 
         lv_obj_t* labelStep;
+        lv_obj_t* labelStepValue;
         static constexpr uint8_t nbStepsBufferSize = 9;
         char nbStepsBuffer[nbStepsBufferSize + 1];
         bool running = true;
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 1f11375..f0fd2f6 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -176,17 +176,7 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   lv_obj_set_style_local_text_color(alert_type, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x888888));
   if (title == nullptr)
     title = "Notification";
-  char* pchar;
-  pchar = strchr(title, '\n');
-  while (pchar != nullptr) {
-    *pchar = ' ';
-    pchar =
-    pchar = strchr(pchar + 1, '\n');
-  }
   lv_label_set_text(alert_type, title);
-  lv_label_set_long_mode(alert_type, LV_LABEL_LONG_SROLL_CIRC);
-  lv_label_set_anim_speed(alert_type, 3);
-  lv_obj_set_width(alert_type, 180);
   lv_obj_align(alert_type, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 16);
 
   /////////
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
deleted file mode 100644
index b485c97..0000000
--- a/src/displayapp/screens/Steps.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "Steps.h"
-#include <lvgl/lvgl.h>
-#include "../DisplayApp.h"
-#include "Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-Steps::Steps(
-    Pinetime::Applications::DisplayApp *app, 
-    Controllers::MotionController& motionController,
-    Controllers::Settings &settingsController) 
-      : Screen(app), 
-      motionController{motionController},
-      settingsController{settingsController} {
-
-  stepsArc = lv_arc_create(lv_scr_act(), nullptr);
-
-  lv_obj_set_style_local_bg_opa(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, LV_OPA_0);  
-  lv_obj_set_style_local_border_width(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 2);  
-  lv_obj_set_style_local_radius(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 0);  
-  lv_obj_set_style_local_line_color(stepsArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, lv_color_hex(0x0000FF));  
-  lv_arc_set_end_angle(stepsArc, 200);
-  lv_obj_set_size(stepsArc, 220, 220);
-  lv_arc_set_range(stepsArc, 0, 500);
-  lv_obj_align(stepsArc, nullptr, LV_ALIGN_CENTER, 0, 0);
-
-  stepsCount = motionController.NbSteps();
-
-  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
-
-  lSteps = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
-  lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);   
-  lv_label_set_text_fmt(lSteps, "%li", stepsCount); 
-  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
-
-  lv_obj_t * lstepsL = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_label_set_text_static(lstepsL, "Steps"); 
-  lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
-
-  lv_obj_t * lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
-  lv_label_set_text_fmt(lstepsGoal,"Goal\n%i", settingsController.GetStepsGoal()); 
-  lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(lstepsGoal, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 60);
-
-  lv_obj_t * backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
-  lv_obj_set_size(backgroundLabel, 240, 240);
-  lv_obj_set_pos(backgroundLabel, 0, 0);
-  lv_label_set_text_static(backgroundLabel, "");
-
-}
-
-Steps::~Steps() {
-  lv_obj_clean(lv_scr_act());
-}
-
-bool Steps::Refresh() {
-  
-  stepsCount = motionController.NbSteps();
-
-  lv_label_set_text_fmt(lSteps,"%li", stepsCount);
-  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
-     
-  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
-
-  return running;
-}
-
-
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
deleted file mode 100644
index 9c135e2..0000000
--- a/src/displayapp/screens/Steps.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <lvgl/lvgl.h>
-#include "Screen.h"
-#include <components/motion/MotionController.h>
-
-namespace Pinetime {
-
-  namespace Controllers {
-    class Settings;
-  }
-
-  namespace Applications {
-    namespace Screens {
-
-      class Steps : public Screen {
-        public:
-          Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings &settingsController);
-          ~Steps() override;
-
-          bool Refresh() override;
-          
-
-        private:          
-
-          Controllers::MotionController& motionController;
-          Controllers::Settings& settingsController;
-
-          lv_obj_t * lSteps;
-          lv_obj_t * lStepsIcon;
-          lv_obj_t * stepsArc;
-
-          uint32_t stepsCount;
-
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index d7cd20c..e06981a 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -115,9 +115,8 @@ bool StopWatch::Refresh() {
     // Init state when an user first opens the app
     // and when a stop/reset button is pressed
     case States::Init: {
-      if (btnStopLap != nullptr) {
+      if (btnStopLap) {
         lv_obj_del(btnStopLap);
-        btnStopLap = nullptr;
       }
       // The initial default value
       lv_label_set_text(time, "00:00");
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index e4ef691..f6e8d61 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -69,14 +69,12 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
   lv_label_set_text_fmt(label,
                         "#FFFF00 InfiniTime#\n\n"
                         "#444444 Version# %ld.%ld.%ld\n\n"
-                        "#444444 Short Ref# %s\n\n"
                         "#444444 Build date#\n"
-                        "%s\n"
-                        "%s\n",
+                        "\t%s\n"
+                        "\t%s\n",
                         Version::Major(),
                         Version::Minor(),
                         Version::Patch(),
-                        Version::GitCommitHash(),
                         __DATE__,
                         __TIME__);
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -244,4 +242,4 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen5() {
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
   return std::unique_ptr<Screen>(new Screens::Label(4, 5, app, label));
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
deleted file mode 100644
index b7c024f..0000000
--- a/src/displayapp/screens/settings/SettingSteps.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "SettingSteps.h"
-#include <lvgl/lvgl.h>
-#include "displayapp/DisplayApp.h"
-#include "displayapp/screens/Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-namespace {
-  static void event_handler(lv_obj_t * obj, lv_event_t event) {
-    SettingSteps* screen = static_cast<SettingSteps *>(obj->user_data);
-    screen->UpdateSelected(obj, event);
-  }
-}
-
-SettingSteps::SettingSteps(
-  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
-  Screen(app),
-  settingsController{settingsController}
-{
-
-  lv_obj_t * container1 = lv_cont_create(lv_scr_act(), nullptr);
-
-  //lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
-  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
-  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
-  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
-  lv_obj_set_pos(container1, 30, 60);
-  lv_obj_set_width(container1, LV_HOR_RES - 50);
-  lv_obj_set_height(container1, LV_VER_RES - 60);
-  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
-
-  lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);  
-  lv_label_set_text_static(title,"Daily steps goal");
-  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
-
-  lv_obj_t * icon = lv_label_create(lv_scr_act(), NULL);
-  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  
-  lv_label_set_text_static(icon, Symbols::shoe);
-  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
-
-
-  stepValue = lv_label_create(lv_scr_act(), NULL);
-  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
-  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-
-  btnPlus = lv_btn_create(lv_scr_act(), NULL);
-  btnPlus->user_data = this;
-  lv_obj_set_size(btnPlus, 80, 50);
-  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
-  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
-  lv_obj_set_event_cb(btnPlus, event_handler);
-
-  btnMinus = lv_btn_create(lv_scr_act(), NULL);
-  btnMinus->user_data = this;
-  lv_obj_set_size(btnMinus, 80, 50);
-  lv_obj_set_event_cb(btnMinus, event_handler);
-  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
-  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
-
-}
-
-SettingSteps::~SettingSteps() {
-  lv_obj_clean(lv_scr_act());
-  settingsController.SaveSettings();
-}
-
-bool SettingSteps::Refresh() {
-  return running;
-}
-
-
-void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
-  uint32_t value = settingsController.GetStepsGoal();
-  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
-    value += 1000;
-    if ( value <= 500000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-
-  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
-    value -= 1000;
-    if ( value >= 1000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
deleted file mode 100644
index 0a4c205..0000000
--- a/src/displayapp/screens/settings/SettingSteps.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <lvgl/lvgl.h>
-#include "components/settings/Settings.h"
-#include "displayapp/screens/Screen.h"
-
-namespace Pinetime {
-
-  namespace Applications {
-    namespace Screens {
-
-      class SettingSteps : public Screen{
-        public:
-          SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
-          ~SettingSteps() override;
-
-          bool Refresh() override;
-          void UpdateSelected(lv_obj_t *object, lv_event_t event);
-         
-        private:          
-
-          Controllers::Settings& settingsController;
-
-          lv_obj_t * stepValue;
-          lv_obj_t * btnPlus;
-          lv_obj_t * btnMinus;
-          
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 457cebf..3914a04 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -59,6 +59,15 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
   }
 
   optionsTotal++;
+    cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text_static(cbOption[optionsTotal], " PineTimeStyle");
+  cbOption[optionsTotal]->user_data = this;
+  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
+  if (settingsController.GetClockFace() == 2) {
+    lv_checkbox_set_checked(cbOption[optionsTotal], true);
+  }
+
+  optionsTotal++;
 }
 
 SettingWatchFace::~SettingWatchFace() {
@@ -81,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 1930a22..6f65d69 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -21,7 +21,7 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
         uint8_t optionsTotal;
-        lv_obj_t* cbOption[2];
+        lv_obj_t* cbOption[3];
       };
     }
   }
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 2c72c83..e24be3d 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -44,7 +44,9 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
     {Symbols::clock, "Wake Up", Apps::SettingWakeUp},
     {Symbols::clock, "Time format", Apps::SettingTimeFormat},
     {Symbols::clock, "Watch face", Apps::SettingWatchFace},
-  }};
+  }
+
+  };
 
   return std::unique_ptr<Screen>(new Screens::List(0, 2, app, settingsController, applications));
 }
@@ -52,11 +54,13 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
 std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   std::array<Screens::List::Applications, 4> applications {{
-    {Symbols::shoe, "Steps", Apps::SettingSteps},
     {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
     {Symbols::check, "Firmware", Apps::FirmwareValidation},
     {Symbols::list, "About", Apps::SysInfo},
-  }};
+    {"", "", Apps::None},
+  }
+
+  };
 
   return std::unique_ptr<Screen>(new Screens::List(1, 2, app, settingsController, applications));
 }
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index 761baba..e774091 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -415,8 +415,8 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
 
 #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(jetbrains_mono_bold_20) \
                                LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \
-                               LV_FONT_DECLARE(jetbrains_mono_42) \
                                LV_FONT_DECLARE(jetbrains_mono_76) \
+                               LV_FONT_DECLARE(open_sans_light) \
                                LV_FONT_DECLARE(lv_font_sys_48)
 
 /* Enable it if you have fonts with a lot of characters.
@@ -758,4 +758,4 @@ typedef void* lv_obj_user_data_t;
 
 /*--END OF LV_CONF_H--*/
 
-#endif /*LV_CONF_H*/
\ No newline at end of file
+#endif /*LV_CONF_H*/
diff --git a/src/logging/NrfLogger.cpp b/src/logging/NrfLogger.cpp
index 1c048f2..70a00e6 100644
--- a/src/logging/NrfLogger.cpp
+++ b/src/logging/NrfLogger.cpp
@@ -12,9 +12,8 @@ void NrfLogger::Init() {
 
   NRF_LOG_DEFAULT_BACKENDS_INIT();
 
-  if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread)) {
+  if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread))
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
-  }
 }
 
 void NrfLogger::Process(void*) {
@@ -22,7 +21,7 @@ void NrfLogger::Process(void*) {
 // Suppress endless loop diagnostic
 #pragma clang diagnostic push
 #pragma ide diagnostic ignored "EndlessLoop"
-  while (true) {
+  while (1) {
     NRF_LOG_FLUSH();
     vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
   }
-- 
cgit v0.10.2


From a4968b502990f4a9e848c5240be2ee73348dd38e Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 15:25:38 +0200
Subject: PineTimeStyle


diff --git a/src/displayapp/fonts/open_sans_light.c b/src/displayapp/fonts/open_sans_light.c
new file mode 100644
index 0000000..15f0ddf
--- /dev/null
+++ b/src/displayapp/fonts/open_sans_light.c
@@ -0,0 +1,1261 @@
+/*******************************************************************************
+ * Size: 150 px
+ * Bpp: 1
+ * Opts: 
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef OPEN_SANS_LIGHT
+#define OPEN_SANS_LIGHT 1
+#endif
+
+#if OPEN_SANS_LIGHT
+
+/*-----------------
+ *    BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0030 "0" */
+    0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xff,
+    0xff, 0xf8, 0x0, 0x0, 0x0, 0xf, 0xff, 0xe0,
+    0x3, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8,
+    0x0, 0x3, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0x7,
+    0xfe, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0,
+    0x7f, 0xc0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xf8,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe0, 0x0, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0xf, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x81, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xe0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x87, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x3f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x1f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf9,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xcf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xbf, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfd, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf9, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xcf, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x9f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x7f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x87, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfe, 0x7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x3f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfc, 0x7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x80, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0x0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x1f, 0xf0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0xf, 0xf8,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x3f,
+    0xf0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
+    0xff, 0xc0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0,
+    0x3, 0xff, 0x80, 0x0, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0xf, 0xff, 0x0, 0x0, 0x7f, 0xf8, 0x0,
+    0x0, 0x0, 0x3f, 0xff, 0x0, 0x1f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xf8,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xc0, 0x0, 0x0, 0x0,
+
+    /* U+0031 "1" */
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0,
+    0xf, 0xff, 0xc0, 0x0, 0x3, 0xff, 0xf8, 0x0,
+    0x0, 0xff, 0xbf, 0x0, 0x0, 0x7f, 0xe7, 0xe0,
+    0x0, 0x1f, 0xf8, 0xfc, 0x0, 0x7, 0xfe, 0x1f,
+    0x80, 0x3, 0xff, 0x83, 0xf0, 0x0, 0xff, 0xc0,
+    0xfe, 0x0, 0x3f, 0xf0, 0x1f, 0xc0, 0x1f, 0xfc,
+    0x3, 0xf8, 0x7, 0xff, 0x0, 0x7f, 0x1, 0xff,
+    0x80, 0xf, 0xe0, 0xff, 0xe0, 0x1, 0xfc, 0x3f,
+    0xf8, 0x0, 0x3f, 0x8f, 0xfc, 0x0, 0x7, 0xf7,
+    0xff, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x0, 0x1f,
+    0xff, 0xf0, 0x0, 0x3, 0xfb, 0xf8, 0x0, 0x0,
+    0x7f, 0x3e, 0x0, 0x0, 0xf, 0xe3, 0x80, 0x0,
+    0x1, 0xfc, 0x20, 0x0, 0x0, 0x3f, 0x80, 0x0,
+    0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0,
+    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0xf,
+    0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0,
+    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc,
+    0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x7,
+    0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0,
+    0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0,
+    0x0, 0x7f, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0,
+    0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0x80,
+    0x0, 0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe,
+    0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3,
+    0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0,
+    0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0,
+    0x0, 0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0, 0x0,
+    0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0,
+    0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f,
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x1,
+    0xfc, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0,
+    0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0xf, 0xe0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x3f,
+    0x80, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0, 0x0,
+    0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0,
+    0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0,
+    0x0, 0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0,
+    0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0,
+    0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f,
+    0xc0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
+    0x1, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0,
+    0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0,
+    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0xf,
+    0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0,
+    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc,
+    0x0, 0x0, 0x0, 0x3f, 0x80,
+
+    /* U+0032 "2" */
+    0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xff, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x0, 0x1f, 0xff, 0xf0, 0x1, 0xff,
+    0xfe, 0x0, 0x0, 0xf, 0xff, 0xc0, 0x0, 0x3,
+    0xff, 0xe0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0,
+    0x1f, 0xfe, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0xff, 0xe0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0xf, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xc0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xfc, 0x0, 0xf, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xc0, 0x1, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x10, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xf0,
+
+    /* U+0033 "3" */
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff, 0xff,
+    0xf8, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xe0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x0,
+    0xff, 0xff, 0x0, 0x0, 0x3f, 0xff, 0xc0, 0x0,
+    0x0, 0xff, 0xf8, 0x0, 0x7, 0xff, 0xe0, 0x0,
+    0x0, 0x3, 0xff, 0xc0, 0x1, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x3f, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x7, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x1, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0xe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff,
+    0xff, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfe,
+    0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xc0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf8, 0xf, 0x80, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xe0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xfc, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x0,
+    0x7f, 0xff, 0x80, 0xf, 0xff, 0xff, 0x80, 0x0,
+    0xff, 0xff, 0xe0, 0x0, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xfc, 0x0, 0x1, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x0, 0x0, 0x7, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff,
+    0xff, 0xff, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xff, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0xff, 0x80, 0x0, 0x0, 0x0,
+
+    /* U+0034 "4" */
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfb, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfd, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfc, 0x7e, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xfe, 0x3f, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x1f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe,
+    0xf, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0x7, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x3, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x1, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x80, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0x80, 0x7e, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x3f, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x1f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xc0, 0xf, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x7, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x3, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x1,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xe0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x7e, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x3f, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0,
+    0x1f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf8, 0x0, 0xf, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x7, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x3, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x1, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x7e, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x3f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x1f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x0, 0x0, 0xf, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xfe, 0x0, 0x0, 0x7, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x3,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x0, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0x7e, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x3f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x1f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0xf, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x7, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0,
+    0x3, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xc0,
+    0x0, 0x0, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x7e,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x3f, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0,
+    0x0, 0x0, 0x0, 0x1f, 0x80, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0xf, 0xc0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x7,
+    0xe0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0x3, 0xf0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x1, 0xf8, 0x0, 0x0, 0x0,
+    0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0,
+    0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7e, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0x80, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xf, 0xc0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xe0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xf0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xf8, 0x0, 0x0,
+    0x0, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc,
+    0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7e, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x80, 0x0,
+    0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xc0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xe0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf0, 0x0, 0x0, 0x3f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x1, 0xf8, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xfc, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7e, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0x80, 0x0, 0x0,
+
+    /* U+0035 "5" */
+    0x1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0,
+    0x0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
+    0x0, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x80, 0x1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xf8, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xfe, 0x0, 0x7f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x3f, 0x8f, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xff,
+    0xfc, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xc0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xfc, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xc0, 0x0, 0xf, 0xff, 0xf0, 0x0,
+    0x3f, 0xff, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x7f, 0xff, 0x80, 0x0, 0x18, 0x0, 0x0,
+    0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x3,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0,
+    0x3f, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xe0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf0,
+    0x3, 0xff, 0x80, 0x0, 0x0, 0x1, 0xff, 0xf8,
+    0x0, 0xff, 0xfc, 0x0, 0x0, 0x3, 0xff, 0xfc,
+    0x0, 0x3f, 0xff, 0xfc, 0x0, 0xf, 0xff, 0xfc,
+    0x0, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0,
+    0x0, 0x0, 0x0,
+
+    /* U+0036 "6" */
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xff,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff,
+    0xff, 0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff,
+    0xff, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x7, 0xff,
+    0xfc, 0x0, 0xf, 0xc0, 0x0, 0x0, 0x0, 0xff,
+    0xfe, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x3, 0xff,
+    0xe0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x1, 0xff,
+    0xff, 0xf0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x7f,
+    0xff, 0xff, 0xf0, 0x0, 0x0, 0xfe, 0x0, 0xf,
+    0xff, 0xff, 0xff, 0xf0, 0x0, 0xf, 0xf0, 0x1,
+    0xff, 0xff, 0xff, 0xff, 0xc0, 0x0, 0x7f, 0x0,
+    0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x3, 0xf8,
+    0x3, 0xff, 0xf0, 0x1, 0xff, 0xfe, 0x0, 0x1f,
+    0xc0, 0x7f, 0xf8, 0x0, 0x0, 0xff, 0xf8, 0x0,
+    0xfe, 0x7, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xe0,
+    0x7, 0xf0, 0x7f, 0xc0, 0x0, 0x0, 0x3, 0xff,
+    0x80, 0x3f, 0x87, 0xf8, 0x0, 0x0, 0x0, 0x7,
+    0xfe, 0x1, 0xfc, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x1f, 0xf8, 0xf, 0xe7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x7f, 0x7f, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0x3, 0xff, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfc, 0x1f, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf0, 0xff, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x8f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x7f, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf3, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x9f,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xf3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x9f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xbf, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfd, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xef, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfb, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xdf, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x9f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe7, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc7, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x3f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x7, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x80, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xe0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x3, 0xfe, 0x0, 0x1, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x7, 0xfc,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0,
+    0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x3, 0xff, 0xc0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
+    0x0, 0xf, 0xff, 0x80, 0x0, 0x1f, 0xff, 0x0,
+    0x0, 0x0, 0x1f, 0xff, 0xc0, 0xf, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff,
+    0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xe0, 0x0, 0x0, 0x0,
+
+    /* U+0037 "7" */
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0,
+
+    /* U+0038 "8" */
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff,
+    0xf0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff,
+    0xff, 0xc0, 0x0, 0x0, 0xf, 0xff, 0xf0, 0x1,
+    0xff, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0,
+    0x1, 0xff, 0xf0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
+    0x0, 0x3, 0xff, 0x80, 0x0, 0x7, 0xfe, 0x0,
+    0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0xff, 0xc0,
+    0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x1f, 0xf8,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x3f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x7,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0,
+    0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0,
+    0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x1, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf0, 0x1f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x1, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x1f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x1f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xe0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xc0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xf8, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x80, 0x1, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x1f, 0xf8, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0x7f, 0xc0, 0x0, 0x7, 0xff, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x1, 0xff,
+    0xe0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0xf,
+    0xff, 0x80, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0,
+    0x7f, 0xfe, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0,
+    0x1, 0xff, 0xf8, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0xf, 0xff, 0xe0, 0x3f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xff, 0x9f, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xe7,
+    0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf8,
+    0xf, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x3f, 0xfe,
+    0x0, 0x3f, 0xff, 0xc0, 0x0, 0x0, 0x7, 0xff,
+    0x80, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x1, 0xff,
+    0xe0, 0x0, 0x3, 0xff, 0xf8, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x7,
+    0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0xff, 0xf0, 0x0,
+    0x1f, 0xf8, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
+    0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc,
+    0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xff, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xf0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x81, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf8, 0x3f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xc3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x7f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xe7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfe, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfe, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe7, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc3, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x81,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0,
+    0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x0, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xe0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xfc, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0x80, 0x3, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
+    0x1f, 0xfe, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0,
+    0xf, 0xff, 0xc0, 0x0, 0x3, 0xff, 0xfe, 0x0,
+    0xf, 0xff, 0xf8, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xff,
+    0xff, 0xff, 0xff, 0xc0, 0x0, 0x0, 0x1, 0xff,
+    0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xff, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xff, 0xf8, 0x0, 0x0, 0x0,
+
+    /* U+0039 "9" */
+    0x0, 0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x7, 0xff, 0xf0, 0x3,
+    0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf0, 0x0,
+    0x3, 0xff, 0xc0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x0,
+    0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x7f, 0xc0,
+    0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0xf, 0xf8,
+    0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x3f,
+    0xe0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfc, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xfe, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0x87, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf8, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0x87, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xcf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xcf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xef, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xfe, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xef, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xfe, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xef, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xfe, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xf3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xf1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xff, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xf7, 0xf0, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0xfe, 0x7f, 0x7, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc7, 0xf0, 0x7f, 0xe0, 0x0, 0x0,
+    0x0, 0x3, 0xf8, 0x7f, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0xff, 0xf, 0xf0, 0x1f, 0xfc, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0xff, 0x0, 0xff, 0xf0,
+    0x0, 0x0, 0x7, 0xfc, 0xf, 0xf0, 0x7, 0xff,
+    0xc0, 0x0, 0x3, 0xff, 0x80, 0xfe, 0x0, 0x3f,
+    0xff, 0xc0, 0x3, 0xff, 0xf0, 0xf, 0xe0, 0x1,
+    0xff, 0xff, 0xff, 0xff, 0xfc, 0x0, 0xfe, 0x0,
+    0x7, 0xff, 0xff, 0xff, 0xff, 0x0, 0xf, 0xe0,
+    0x0, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x0, 0xfe,
+    0x0, 0x0, 0x7f, 0xff, 0xff, 0xf0, 0x0, 0xf,
+    0xe0, 0x0, 0x0, 0xff, 0xff, 0xf8, 0x0, 0x1,
+    0xfe, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0xf8, 0x0, 0x0, 0x1, 0x80, 0x0, 0x0, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0xff,
+    0xff, 0xc0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xfc, 0x0, 0x0, 0x0, 0x1, 0xff, 0xff,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff,
+    0xff, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xff, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0
+};
+
+
+/*---------------------
+ *  GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+    {.bitmap_index = 0, .adv_w = 1370, .box_w = 69, .box_h = 110, .ofs_x = 8, .ofs_y = -1},
+    {.bitmap_index = 949, .adv_w = 1370, .box_w = 35, .box_h = 107, .ofs_x = 15, .ofs_y = 0},
+    {.bitmap_index = 1418, .adv_w = 1370, .box_w = 67, .box_h = 108, .ofs_x = 8, .ofs_y = 0},
+    {.bitmap_index = 2323, .adv_w = 1370, .box_w = 68, .box_h = 110, .ofs_x = 7, .ofs_y = -1},
+    {.bitmap_index = 3258, .adv_w = 1370, .box_w = 81, .box_h = 108, .ofs_x = 3, .ofs_y = -1},
+    {.bitmap_index = 4352, .adv_w = 1370, .box_w = 66, .box_h = 108, .ofs_x = 10, .ofs_y = -1},
+    {.bitmap_index = 5243, .adv_w = 1370, .box_w = 69, .box_h = 110, .ofs_x = 9, .ofs_y = -1},
+    {.bitmap_index = 6192, .adv_w = 1370, .box_w = 69, .box_h = 106, .ofs_x = 8, .ofs_y = 0},
+    {.bitmap_index = 7107, .adv_w = 1370, .box_w = 68, .box_h = 110, .ofs_x = 9, .ofs_y = -1},
+    {.bitmap_index = 8042, .adv_w = 1370, .box_w = 68, .box_h = 110, .ofs_x = 8, .ofs_y = -1}
+};
+
+/*---------------------
+ *  CHARACTER MAPPING
+ *--------------------*/
+
+
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+    {
+        .range_start = 48, .range_length = 10, .glyph_id_start = 1,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    }
+};
+
+
+
+/*--------------------
+ *  ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+    .glyph_bitmap = glyph_bitmap,
+    .glyph_dsc = glyph_dsc,
+    .cmaps = cmaps,
+    .kern_dsc = NULL,
+    .kern_scale = 0,
+    .cmap_num = 1,
+    .bpp = 1,
+    .kern_classes = 0,
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ *  PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t open_sans_light = {
+#else
+lv_font_t open_sans_light = {
+#endif
+    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
+    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
+    .line_height = 110,          /*The maximum line height required by the font*/
+    .base_line = 1,             /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+    .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0)
+    .underline_position = -11,
+    .underline_thickness = 7,
+#endif
+    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if OPEN_SANS_LIGHT*/
+
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
new file mode 100644
index 0000000..b249416
--- /dev/null
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -0,0 +1,294 @@
+#include "PineTimeStyle.h"
+
+#include <date/date.h>
+#include <lvgl/lvgl.h>
+#include <cstdio>
+#include "BatteryIcon.h"
+#include "BleIcon.h"
+#include "NotificationIcon.h"
+#include "Symbols.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/heartrate/HeartRateController.h"
+#include "components/settings/Settings.h"
+#include "../DisplayApp.h"
+
+/*
+ * PineTimeStyle watchface for Infinitime created by Kieran Cawthray
+ * Based on WatchFaceDigital
+ * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
+ */
+
+using namespace Pinetime::Applications::Screens;
+
+PineTimeStyle::PineTimeStyle(DisplayApp* app,
+                             Controllers::DateTime& dateTimeController,
+                             Controllers::Battery& batteryController,
+                             Controllers::Ble& bleController,
+                             Controllers::NotificationManager& notificatioManager,
+                             Controllers::Settings& settingsController,
+                             Controllers::HeartRateController& heartRateController)
+  : Screen(app),
+    currentDateTime {{}},
+    dateTimeController {dateTimeController},
+    batteryController {batteryController},
+    bleController {bleController},
+    notificatioManager {notificatioManager},
+    settingsController {settingsController},
+    heartRateController {heartRateController} {
+
+  /* This sets the watchface number to return to after leaving the menu*/
+  settingsController.SetClockFace(2);
+
+  displayedChar[0] = 0;
+  displayedChar[1] = 0;
+  displayedChar[2] = 0;
+  displayedChar[3] = 0;
+  displayedChar[4] = 0;
+
+  /*Create a 200px wide background rectangle*/
+
+  timebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(timebar, 200, 240);
+  lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
+
+  /*Display the time*/
+
+  timeDD1 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD1, "12");
+  lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
+
+  timeDD2 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD2, "34");
+  lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
+
+  /*Create a 40px wide bar down the right side of the screen*/
+
+  sidebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(sidebar, 40, 240);
+  lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
+
+  /*Display icons*/
+
+  batteryIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(batteryIcon, Symbols::batteryFull);
+  lv_obj_align(batteryIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
+
+  batteryPlug = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  //lv_label_set_text(batteryPlug, Symbols::plug);
+  lv_obj_align(batteryPlug, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
+
+  bleIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  //lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
+  lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
+
+  notificationIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  //lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
+  lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
+
+  /* Calendar icon */
+
+  calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarOuter, 34, 34);
+  lv_obj_align(calendarOuter, sidebar, LV_ALIGN_CENTER, 0, 0);
+
+  calendarInner = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xffffff));
+  lv_obj_set_style_local_radius(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarInner, 27, 27);
+  lv_obj_align(calendarInner, calendarOuter, LV_ALIGN_CENTER, 0, 0);
+
+  calendarBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar1, 3, 12);
+  lv_obj_align(calendarBar1, calendarOuter, LV_ALIGN_IN_TOP_MID, -6, -3);
+
+  calendarBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar2, 3, 12);
+  lv_obj_align(calendarBar2, calendarOuter, LV_ALIGN_IN_TOP_MID, 6, -3);
+
+  calendarCrossBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar1, 8, 3);
+  lv_obj_align(calendarCrossBar1, calendarBar1, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  calendarCrossBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar2, 8, 3);
+  lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  /*Display date*/
+
+  dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDayOfWeek, "THU");
+  lv_obj_align(dateDayOfWeek, sidebar, LV_ALIGN_CENTER, 0, -34);
+
+  dateDay = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDay, "25");
+  lv_obj_align(dateDay, sidebar, LV_ALIGN_CENTER, 0, 3);
+
+  dateMonth = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateMonth, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateMonth, "MAR");
+  lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
+
+  /*Display heartrate info*/
+
+  heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(heartbeatIcon, Symbols::heartBeat);
+  lv_obj_align(heartbeatIcon, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -30);
+
+  heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(heartbeatValue, "---");
+  lv_obj_align(heartbeatValue, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
+}
+
+PineTimeStyle::~PineTimeStyle() {
+  lv_obj_clean(lv_scr_act());
+}
+
+bool PineTimeStyle::Refresh() {
+  batteryPercentRemaining = batteryController.PercentRemaining();
+  if (batteryPercentRemaining.IsUpdated()) {
+    auto batteryPercent = batteryPercentRemaining.Get();
+    if (batteryController.IsCharging()) {
+      auto isCharging = batteryController.IsCharging() || batteryController.IsPowerPresent();
+      lv_label_set_text(batteryPlug, BatteryIcon::GetPlugIcon(isCharging));
+      lv_obj_realign(batteryPlug);
+      lv_label_set_text(batteryIcon, "");
+    } else {
+      lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
+      lv_label_set_text(batteryPlug, "");
+    }
+  }
+
+  bleState = bleController.IsConnected();
+  if (bleState.IsUpdated()) {
+    if (bleState.Get() == true) {
+      lv_label_set_text(bleIcon, BleIcon::GetIcon(true));
+      lv_obj_realign(bleIcon);
+    } else {
+      lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
+    }
+  }
+
+  notificationState = notificatioManager.AreNewNotificationsAvailable();
+  if (notificationState.IsUpdated()) {
+    if (notificationState.Get() == true) {
+      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
+      lv_obj_realign(notificationIcon);
+      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, -8, 25);
+    } else {
+      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
+      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
+    }
+  }
+
+  currentDateTime = dateTimeController.CurrentDateTime();
+
+  if (currentDateTime.IsUpdated()) {
+    auto newDateTime = currentDateTime.Get();
+
+    auto dp = date::floor<date::days>(newDateTime);
+    auto time = date::make_time(newDateTime - dp);
+    auto yearMonthDay = date::year_month_day(dp);
+
+    auto year = (int) yearMonthDay.year();
+    auto month = static_cast<Pinetime::Controllers::DateTime::Months>((unsigned) yearMonthDay.month());
+    auto day = (unsigned) yearMonthDay.day();
+    auto dayOfWeek = static_cast<Pinetime::Controllers::DateTime::Days>(date::weekday(yearMonthDay).iso_encoding());
+
+    int hour = time.hours().count();
+    auto minute = time.minutes().count();
+
+    char minutesChar[3];
+    sprintf(minutesChar, "%02d", static_cast<int>(minute));
+
+    char hoursChar[3];
+    sprintf(hoursChar, "%02d", hour);
+
+    if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
+        minutesChar[1] != displayedChar[3]) {
+      displayedChar[0] = hoursChar[0];
+      displayedChar[1] = hoursChar[1];
+      displayedChar[2] = minutesChar[0];
+      displayedChar[3] = minutesChar[1];
+
+      char hourStr[3];
+      char minStr[3];
+
+      /*Display the time as 2 pairs of digits*/
+      sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
+      lv_label_set_text(timeDD1, hourStr);
+
+      sprintf(minStr, "%c%c", minutesChar[0], minutesChar[1]);
+      lv_label_set_text(timeDD2, minStr);
+    }
+
+    if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
+      char dayOfWeekStr[4];
+      char dayStr[3];
+      char monthStr[4];
+
+      sprintf(dayOfWeekStr, "%s", dateTimeController.DayOfWeekShortToString());
+      sprintf(dayStr, "%d", day);
+      sprintf(monthStr, "%s", dateTimeController.MonthShortToString());
+
+      lv_label_set_text(dateDayOfWeek, dayOfWeekStr);
+      lv_label_set_text(dateDay, dayStr);
+      lv_obj_realign(dateDay);
+      lv_label_set_text(dateMonth, monthStr);
+
+      currentYear = year;
+      currentMonth = month;
+      currentDayOfWeek = dayOfWeek;
+      currentDay = day;
+    }
+  }
+
+  heartbeat = heartRateController.HeartRate();
+  heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
+  if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
+    char heartbeatBuffer[4];
+    if (heartbeatRunning.Get())
+      sprintf(heartbeatBuffer, "%d", heartbeat.Get());
+    else
+      sprintf(heartbeatBuffer, "---");
+
+    lv_label_set_text(heartbeatValue, heartbeatBuffer);
+    lv_obj_realign(heartbeatValue);
+  }
+
+  return running;
+}
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
new file mode 100644
index 0000000..5575241
--- /dev/null
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <lvgl/src/lv_core/lv_obj.h>
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include "Screen.h"
+#include "ScreenList.h"
+#include "components/datetime/DateTimeController.h"
+
+namespace Pinetime {
+  namespace Controllers {
+    class Settings;
+    class Battery;
+    class Ble;
+    class NotificationManager;
+    class HeartRateController;
+  }
+
+  namespace Applications {
+    namespace Screens {
+      class PineTimeStyle : public Screen {
+      public:
+        PineTimeStyle(DisplayApp* app,
+                      Controllers::DateTime& dateTimeController,
+                      Controllers::Battery& batteryController,
+                      Controllers::Ble& bleController,
+                      Controllers::NotificationManager& notificatioManager,
+                      Controllers::Settings& settingsController,
+                      Controllers::HeartRateController& heartRateController);
+        ~PineTimeStyle() override;
+
+        bool Refresh() override;
+
+        void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
+
+      private:
+        char displayedChar[5];
+
+        uint16_t currentYear = 1970;
+        Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
+        Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
+        uint8_t currentDay = 0;
+
+        DirtyValue<int> batteryPercentRemaining {};
+        DirtyValue<bool> bleState {};
+        DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
+        DirtyValue<uint8_t> heartbeat {};
+        DirtyValue<bool> heartbeatRunning {};
+        DirtyValue<bool> notificationState {};
+
+        lv_obj_t* timebar;
+        lv_obj_t* sidebar;
+        lv_obj_t* timeDD1;
+        lv_obj_t* timeDD2;
+        lv_obj_t* dateDayOfWeek;
+        lv_obj_t* dateDay;
+        lv_obj_t* dateMonth;
+        lv_obj_t* backgroundLabel;
+        lv_obj_t* batteryIcon;
+        lv_obj_t* bleIcon;
+        lv_obj_t* batteryPlug;
+        lv_obj_t* calendarOuter;
+        lv_obj_t* calendarInner;
+        lv_obj_t* calendarBar1;
+        lv_obj_t* calendarBar2;
+        lv_obj_t* calendarCrossBar1;
+        lv_obj_t* calendarCrossBar2;
+        lv_obj_t* heartbeatIcon;
+        lv_obj_t* heartbeatValue;
+        lv_obj_t* heartbeatBpm;
+        lv_obj_t* notificationIcon;
+
+        Controllers::DateTime& dateTimeController;
+        Controllers::Battery& batteryController;
+        Controllers::Ble& bleController;
+        Controllers::NotificationManager& notificatioManager;
+        Controllers::Settings& settingsController;
+        Controllers::HeartRateController& heartRateController;
+      };
+    }
+  }
+}
-- 
cgit v0.10.2


From 6a925292722be365f4efc288c64b023639f0c201 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 17:45:16 +0200
Subject: Revert "Reset"

This reverts commit 378fa6b4016b65e2d7b128fdc3ce89c4ca779a4d.

diff --git a/.clang-tidy b/.clang-tidy
index d603680..8a7d38f 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -22,5 +22,9 @@ Checks: '*,
   -hicpp-no-assembler,
   -hicpp-avoid-c-arrays,
   -hicpp-uppercase-literal-suffix,
+  -hicpp-no-array-decay,
   -cert-err58-cpp,
-  -cert-err60-cpp'
\ No newline at end of file
+  -cert-err60-cpp'
+CheckOptions:
+  - key: readability-function-cognitive-complexity.Threshold
+    value: 100
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f777013..6c529f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,10 +55,22 @@ if(BUILD_DFU)
   set(BUILD_DFU true)
 endif()
 
+set(PROJECT_GIT_COMMIT_HASH "")
+
+execute_process(COMMAND git rev-parse --short HEAD
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                OUTPUT_VARIABLE PROJECT_GIT_COMMIT_HASH
+                RESULT_VARIABLE PROJECT_GIT_COMMIT_HASH_SUCCESS)
+
+string(STRIP ${PROJECT_GIT_COMMIT_HASH} PROJECT_GIT_COMMIT_HASH)
+
+message("PROJECT_GIT_COMMIT_HASH_SUCCESS? " ${PROJECT_GIT_COMMIT_HASH_SUCCESS})
+
 message("BUILD CONFIGURATION")
 message("-------------------")
 message("    * Version : " ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 message("    * Toolchain : " ${ARM_NONE_EABI_TOOLCHAIN_PATH})
+message("    * GitRef(S) : " ${PROJECT_GIT_COMMIT_HASH})
 message("    * NRF52 SDK : " ${NRF5_SDK_PATH})
 set(PROGRAMMER "???")
 if(USE_JLINK)
diff --git a/README.md b/README.md
index 34f6e84..396d746 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,8 @@ As of now, here is the list of achievements of this project:
 ## Documentation
 
 ### Getting started
- - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/gettingStarted.md)
+ - [Getting started with InfiniTime 1.0 (quick user guide, update bootloader and InfiniTime,...)](doc/gettingStarted/gettingStarted-1.0.md)
+ - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/ota-gadgetbridge-nrfconnect.md)
 
 ### Develop
  - [Generate the fonts and symbols](src/displayapp/fonts/README.md)
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md
index b70bdfc..afd526e 100644
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@@ -3,6 +3,7 @@
 To build this project, you'll need:
  - A cross-compiler : [ARM-GCC (9-2020-q2-update)](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads/9-2020-q2-update)
  - The NRF52 SDK 15.3.0 : [nRF-SDK v15.3.0](https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip)
+ - The `cbor` and `intelhex` modules for Python 3
  - A reasonably recent version of CMake (I use 3.16.5)
 
 ## Build steps 
@@ -221,4 +222,4 @@ Loading section .sec6, size 0x10000 lma 0x30000
 Loading section .sec7, size 0xdf08 lma 0x40000
 Start address 0x0, load size 314200
 Transfer rate: 45 KB/sec, 969 bytes/write.
-```
\ No newline at end of file
+```
diff --git a/doc/contribute.md b/doc/contribute.md
index 7958eea..09d2077 100644
--- a/doc/contribute.md
+++ b/doc/contribute.md
@@ -2,13 +2,13 @@
 ## Report bugs
 You use your Pinetime and find a bug in the firmware? [Create an issue on Github](https://github.com/JF002/InfiniTime/issues) explaining the bug, how to reproduce it, the version of the firmware you use...
 ## Write and improve documentation
-Documentation might be incomplete, or not clear enough, and it is always possible to improve it with better wording, pictures, photo, video,... 
+Documentation might be incomplete, or not clear enough, and it is always possible to improve it with better wording, pictures, photo, video,...
 
 As the documentation is part of the source code, you can submit your improvements to the documentation by submitting a pull request (see below).
 ## Fix bugs, add functionalities and improve the code
 You want to fix a bug, add a cool new functionality or improve the code? See *How to submit a pull request below*.
 ## Spread the word
-Pinetime is a cool open source project that deserves to be know. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open-source firmware for a smartwatch!
+The Pinetime is a cool open source project that deserves to be known. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open-source firmware for a smartwatch!
 
 # How to submit a pull request ?
 
@@ -21,28 +21,28 @@ Pinetime is a cool open source project that deserves to be know. Talk about it a
  - Write documentation related to your new feature is applicable;
  - Create the pull-request and write a great description about it : what does your PR do, why, how,... Add pictures and video if possible;
  - Wait for someone to review your PR and take part in the review process;
- - You PR will eventually be merged :)
+ - Your PR will eventually be merged :)
 
-Your contribution is more than welcome! 
+Your contribution is more than welcome!
 
 If you want to fix a bug, add a functionality or improve the code, you'll first need to create a branch from the **develop** branch (see [this page about the branching model](./branches.md)). This branch is called a feature branch, and you should choose a name that explains what you are working on (ex: "add-doc-about-contributions"). In this branch, **focus on only one topic, bug or feature**. For example, if you created this branch to work on the UI of a specific application, do not commit modifications about the SPI driver. If you want to work on multiple topics, create one branch per topic.
 
 When your feature branch is ready, **make sure it actually works** and **do not forget to write documentation** about it if it's relevant.
 
-I **strongly discourage to create a PR containing modifications that haven't been tested**. If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedbacks about your code.
+I **strongly discourage to create a PR containing modifications that haven't been tested**. If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedback about your code.
 
 Also, before submitting your PR, check the coding style of your code against the **coding conventions** detailed below. This project also provides [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy) configuration files. You can use them to ensure correct formatting of your code.
 
 Do not forget to check the files you are going to commit and remove those who are not necessary (config files from your IDE, for example). Remove old comments, commented code,...
 
-Then, you can submit a pull-request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how is it designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of you work.
+Then, you can submit a pull-request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how is it designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of your work.
 
-Other contributors can post comments about the pull request, maybe ask for more info or adjustements in the code.
+Other contributors can post comments about the pull request, maybe ask for more info or adjustments in the code.
 
-Once the pull request is reviewed an accepted, it'll be merge in **develop** and will be released in the next release version of the firmware.
+Once the pull request is reviewed and accepted, it'll be merge in **develop** and will be released in the next release version of the firmware.
 
 ## Why  all these rules?
-Reviewing pull-requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Every little thing you do to make their lifes easier will **increase the chances your PR will be merge quickly**.
+Reviewing pull-requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Every little thing you do to make their lives easier will **increase the chances your PR will be merge quickly**.
 
 When reviewing PR, the author and contributors will first look at the **description**. If it's easy to understand what the PR does, why the modification is needed or interesting and how it's done, a good part of the work is already done : we understand the PR and its context.
 
@@ -58,12 +58,12 @@ It's totally normal for a PR to need some more work even after it was created, t
 ## Language
 The language of this project is **C++**, and all new code must be written in C++. (Modern) C++ provides a lot of useful tools and functionalities that are beneficial for embedded software development like `constexpr`, `template` and anything that provides zero-cost abstraction.  
 
-It's OK to include C code if this code comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK. 
+It's OK to include C code if this code comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK.
 
 ## Coding style
-The most important rule to follow is to try to keep the code as easy to read and maintain as possible. 
+The most important rule to follow is to try to keep the code as easy to read and maintain as possible.
 
- - **Identation** : 2 spaces, no tabulation
+ - **Indentation** : 2 spaces, no tabulation
  - **Opening brace** at the end of the line
  - **Naming** : Choose self-describing variable name
     - **class** : PascalCase
diff --git a/doc/gettingStarted/appmenu-071.jpg b/doc/gettingStarted/appmenu-071.jpg
new file mode 100644
index 0000000..dee7c8f
Binary files /dev/null and b/doc/gettingStarted/appmenu-071.jpg differ
diff --git a/doc/gettingStarted/appmenu.jpg b/doc/gettingStarted/appmenu.jpg
new file mode 100644
index 0000000..1e52fe7
Binary files /dev/null and b/doc/gettingStarted/appmenu.jpg differ
diff --git a/doc/gettingStarted/bootloader-1.0.jpg b/doc/gettingStarted/bootloader-1.0.jpg
new file mode 100644
index 0000000..7b63918
Binary files /dev/null and b/doc/gettingStarted/bootloader-1.0.jpg differ
diff --git a/doc/gettingStarted/gettingStarted-1.0.md b/doc/gettingStarted/gettingStarted-1.0.md
new file mode 100644
index 0000000..2ac22b9
--- /dev/null
+++ b/doc/gettingStarted/gettingStarted-1.0.md
@@ -0,0 +1,112 @@
+# Getting started with InfiniTime 1.0
+On April 22 2021, InfiniTime and Pine64 [announced the release of InfiniTime 1.0](https://www.pine64.org/2021/04/22/its-time-infinitime-1-0/) and the availability of PineTime smartwatches as *enthusiast grade end-user product*. This page aims to guide you with your first step with your new PineTime.
+
+## Firmware, InfiniTime, Bootloader, Recovery firmware, OTA, DFU... What is it?
+You might have already seen these words by reading the announcement, release notes, or [the wiki guide](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0) and, you may find them misleading if you're not familiar with the project.
+
+Basically, a **firmware** is just a software running on the embedded hardware of a device, the PineTime in this case.
+**InfiniTime** is based on 3 distinct **firmwares**:
+ - **[InfiniTime](https://github.com/JF002/InfiniTime)** itself, this is the *application firmware* running on the PineTime. This is the main firmware which provides most of the functionalities you'll use on a daily basis : bluetooth low-energy (BLE) connectivity, applications, watchfaces,...
+ - **[The bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader)** is responsible for safely applying **updates** of the *application firmware*, reverting them in case of issues and load the recovery firmware when requested.
+ - **The recovery firmware** is a specific *application firmware* than can be loaded by the bootloader on user request. This firmware can be useful in case of serious issue, when the main application firmware cannot perform an OTA update correctly. Currently, this  recovery firmware is based on [InfiniTime 0.14.1](https://github.com/JF002/InfiniTime/releases/tag/0.14.1).
+
+**OTA** and **DFU** refer to the update of the firmware over BLE (**B**luetooth **L**ow **E**nergy). **OTA** means **O**ver **T**he **A**ir, this is a functionality that allows the user to update the firmware how their device using a wireless communication like BLE. When we talk about **DFU** (**D**igital **F**irmware **U**pdate), we refer to the file format and protocol used to send the update of the firmware to the watch over-the-air. InfiniTime implement the (legacy) DFU protocol from Nordic Semiconductor (NRF).
+
+## How to check the version of InfiniTime and the bootloader?
+Since September 2020, all PineTimes (devkits or sealed) are flashed using the **[first iteration of the bootloader](https://github.com/lupyuen/pinetime-rust-mynewt/releases/tag/v4.1.7)** and **[InfiniTime 0.7.1](https://github.com/JF002/InfiniTime/releases/tag/0.7.1)**. There was no recovery firmware at that time.
+
+The bootloader only runs when the watch starts (from an empty battery, for example) or after a reset (after a succesful OTA or a manual reset - long push on the button). 
+
+You can recognize this first iteration of the bootloader with it greenish **PINETIME** logo.
+
+![Old bootloader logo](oldbootloaderlogo.jpg)
+
+You can check the version of InfiniTime by opening the app *SystemInfo*. For version < 1.0:
+
+![InfiniTime 0.7.1 Application menu](appmenu-071.jpg)
+![InfiniTime 0.7.1 version](version-071.jpg)
+
+And for version >= 1.0 :
+
+![InfiniTime 1.0 version](version-1.0.jpg)
+
+
+PineTime shipped from June 2020 (to be confirmed) will be flashed with the [new version of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0), the [recovery firmware](https://github.com/JF002/InfiniTime/releases/tag/0.14.1) and [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/tag/1.0.0).
+
+The bootloader is easily recognizable with it white pine cone that is progressively drawn in green. It also displays its own version on the bottom (1.0.0 as of now).
+
+![Bootloader 1.0](bootloader-1.0.jpg)
+
+## How to update your PineTime?
+To update your PineTime, you can use one of the compatible companion applications. Here are the main ones:
+
+ - **[Amazfish](https://github.com/piggz/harbour-amazfish)** (Desktop Linux, mobile Linux, SailfishOS, runs on the PinebookPro and the Pinephone)
+ - **[Gadgetbridge](https://www.gadgetbridge.org/)** (Android)
+ - **[Siglo](https://github.com/alexr4535/siglo)** (Linux, GTK based)
+ - **NRFConnect** (closed source, Android & iOS).
+
+See [this page](ota-gadgetbridge-nrfconnect.md) for more info about the OTA procedure using Gadgetbrige and NRFCOnnect.
+
+### From InfiniTime 0.7.1 / old bootloader
+If your PineTime is currently running InfiniTime 0.7.1 and the old bootloader, we strongly recommend you update them to more recent version (Bootloader 1.0.0 and InfiniTime 1.0.0 as of now). We also recommend you install the recovery firmware once the bootloader is up-do-date.
+
+Using the companion app of your choice, you'll need to apply the OTA procedure for these 3 firmwares in this sequence (failing to follow this specific order might temporarily or permanently brick your device):
+ 
+ 1. Flash the latest version of InfiniTime. The file to upload is named **pinetime-mcuboot-app-dfu-x.y.z.zip**. Here is the link to [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/download/1.0.0/pinetime-mcuboot-app-dfu-1.0.0.zip).
+ 2. Update the bootloader by applying the OTA procedure with the file named [**reloader-mcuboot.zip** from the repo of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/download/1.0.0/reloader-mcuboot.zip). 
+ 3. Install the recovery firmware by applying the OTA procedure with the file named [**pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip** from the version 0.14.1 of InfiniTime](https://github.com/JF002/InfiniTime/releases/download/0.14.1/pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip).
+
+You'll find more info about this process in [this wiki page](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0). You can also see the procedure in video [here](https://video.codingfield.com/videos/watch/831077c5-16f3-47b4-9b2b-c4bbfecc6529) and [here (from Amazfish)](https://video.codingfield.com/videos/watch/f7bffb3d-a6a1-43c4-8f01-f4aeff4adf9e)
+
+### From version > 1.0
+If you are already running the new "1.0.0" bootloader, all you have to do is update your version of InfiniTime when it'll be available. We'll write specific instructions when (if) we release a new version of the bootloader.
+
+### Firmware validation
+The bootloader requires a (manual) validation of the firmware. If the watch reset with an updated firmware that was not validated, the bootloader will consider it as non-functionning and will revert to the previous version of the firmware. This is a safety feature to prevent bricking your device with a faulty firmware.
+
+You can validate your updated firmware on InfiniTime >= 1.0 by following this simple procedure:
+ 
+ - From the watchface, swipe **right** to display the *Quick Actions menu*
+ - Open the **Settings** app by tapping the *gear* icon on the bottom right
+ - Swipe down and tap on the entry named **Firmware**
+ - This app shows the version that is currently running. If it's not validated yet, it displays 2 buttons:
+    - **Validate** to validate your firmware
+    - **Reset** to reset the watch and revert to the previously running version of the firmware
+    
+## InfiniTime 1.0 quick user guide
+### Setting the time
+By default, InfiniTime starts on the digital watchface. It'll probably display the epoch time (1 Jan 1970, 00:00). The time will be automatically synchronized once you connect on of the companion app to your PineTime using BLE connectivity. InfiniTime does not provide any way to manually set the time for now.
+
+### Navigation in the menu
+
+![Quick actions](quickactions.jpg)
+![Settings](settings.jpg)
+![Application menu](appmenu.jpg)
+
+ - Swipe **down** to display the notification panel. Notification sent by your companion app will be displayed in this panel.
+ - Swipe **up** to display the application menus. Apps (stopwatch, music, step, games,...) can be started from this menu.
+ - Swipe **right** to display the Quick Actions menu. This menu allows you to
+    - Set the brightness of the display
+    - Start the **flashlight** app
+    - Enable/disable vibrations on notifications (Do Not Disturb mode)
+    - Enter the **settings** menu
+ - Settings 
+    - Display timeout
+    - Wake up event (Tap, wrist rotation)
+    - Time format (12/24H)
+    - Default watchface (digital / analog)
+    - Battery info
+    - Firmware validation
+    - About (system info, firmware version,...)
+
+### Bootloader
+
+Most of the time, the bootloader just runs without your intervention (update and load the firmware).
+
+However, you can enable 2 functionalities using the push button:
+ 
+ - Push the button until the pine cone is drawn in **blue** to force the rollback of the previous version of the firmware, even if you've already validated the updated one
+ - Push the button until the pine cone is drawn in **red** to load the recovery firmware. This recovery firmware only provides BLE connectivity and OTA functionality.
+
+More info about the bootloader in [its project page](https://github.com/JF002/pinetime-mcuboot-bootloader/blob/master/README.md).
+
diff --git a/doc/gettingStarted/oldbootloaderlogo.jpg b/doc/gettingStarted/oldbootloaderlogo.jpg
new file mode 100644
index 0000000..b4d0cdf
Binary files /dev/null and b/doc/gettingStarted/oldbootloaderlogo.jpg differ
diff --git a/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md b/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
new file mode 100644
index 0000000..1187a9b
--- /dev/null
+++ b/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
@@ -0,0 +1,101 @@
+# Flash and upgrade InfiniTime
+If you just want to flash or upgrade InfiniTime on your PineTime, this page is for you!
+
+- [InfiniTime releases and versions](#infinitime-releases-and-versions)
+- [How to upgrade Over-The-Air (OTA)](#how-to-upgrade-over-the-air-ota)
+    - [Using Gadgetbridge](#using-gadgetbridge)
+    - [Using NRFConnect](#Using-nrfconnect)
+- [How to flash InfiniTime using the SWD interface](#how-to-flash-infinitime-using-the-swd-interface)
+
+## InfiniTime releases and versions
+All releases of InfiniTime are available on the [release page of the GitHub repo](https://github.com/JF002/InfiniTime/releases).
+
+Versions that are tagged as **RELEASE CANDIDATE** are pre-release versions, that are available for testing before actually releasing a new stable version. If you want to help us debug the project and provide stable versions to other user, you can use them. If you want stable and tested version, you should not flash these release candidate version.
+
+Release files are available under the *Assets* button.
+
+## How to upgrade Over-The-Air (OTA)
+OTA is the easiest method to upgrade InfiniTime. Note that it's only possible is your PineTime is already running InfiniTime (>= 0.7.1).
+
+2 companion apps provide support for OTA : 
+ - [Gadgetbridge](https://gadgetbridge.org/) (open source, runs on Android, [available on F-Droid](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/)). 
+ - [NRFConnect](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Connect-for-mobile) (close source, runs on Android and iOS).
+ 
+Both applications need you to download the **DFU file** of InfiniTime. This file contains the new version of InfiniTime that will be flashed into your device. It's called **dfu-x.y.z.zip** (ex: dfu-0.9.0.zip) in the release note.
+![Dfu file](dfuFile.png )
+
+### Using Gadgetbridge
+Launch Gadgetbridge and tap on the **"+"** button on the bottom right to add a new device:
+
+![Gadgetbridge 0](gadgetbridge0.jpg)
+
+Wait for the scan to complete, your PineTime should be detected:
+
+![Gadgetbridge 1](gadgetbridge1.jpg)
+
+Tap on it. Gadgdetbridge will pair and connect to your device:
+
+![Gadgetbridge 2](gadgetbridge2.jpg)
+
+Now that Gadgetbridge is connected to your PineTime, use a file browser application (I'm using Seafile to browse my NAS) and browse to the DFU file (image-xxx.zip) you downloaded previously. Tap on it and open it using the Gadgetbridge application/firmware installer:
+
+![Gadgetbridge 3](gadgetbridge3.jpg)
+
+Read carefully the warning and tap **Install**:
+
+![Gadgetbridge 4](gadgetbridge4.jpg)
+
+Wait for the transfer to finish. Your PineTime should reset and reboot with the new version of InfiniTime!
+
+![Gadgetbridge 5](gadgetbridge5.jpg)
+
+### Using NRFConnect
+Open NRFConnect. Swipe down in the *Scanner* tab and wait for your device to appear:
+
+![NRFConnect 0](nrfconnect0.jpg)
+
+Tap on the *Connect* button on the right of your device. NRFConnect will connect to your PineTime and discover its characteristics. Tap on the **DFU** button on the top right:
+
+![NRFConnect 1](nrfconnect1.jpg)
+
+Select **Distribution packet (ZIP)**:
+
+![NRFConnect 2](nrfconnect2.jpg)
+
+Browse to the DFU file you downloaded previously, the DFU transfer will start automatically. When the transfer is finished, your PineTime will reset and restart on the new version of InfiniTime!
+
+![NRFConnect 3](nrfconnect3.jpg)
+
+## How to flash InfiniTime using the SWD interface
+Download the files **bootloader.bin**, **image-x.y.z.bin** and **pinetime-graphics-x.y.z.bin** from the release page:
+
+![Image file](imageFile.png )
+
+The bootloader reads a boot logo from the external SPI flash memory. The first step consists in flashing a tool in the MCU that will flash the boot logo into this SPI flash memory. This first step is optional but recommanded (the bootloader will display garbage on screen for a few second if you don't do it).
+Using your SWD tool, flash **pinetime-graphics-x.y.z.bin** at offset **0x0000**. Reset the MCU and wait for a few second, until the logo is completely drawn on the display.
+
+Then, using your SWD tool, flash those file at specific offset:
+
+ - bootloader.bin : **0x0000**
+ - image-x.y.z.bin : **0x8000**
+
+Reset and voilà, you're running InfiniTime on your PineTime!
+ 
+If you are using OpenOCD with a STLinkV2, you can find more info [on this page](../openOCD.md).
+
+## How to synchronize the time
+
+### Using Gadgetbridge
+Good news! Gadgetbridge **automatically** synchronizes the time when connecting to your PineTime!
+
+### Using NRFConnect
+You must enable the **CTS** *GATT server* into NRFConnect so that InfiniTime can synchronize the time with your smartphone.
+
+Launch NRFConnect, tap the sandwich button on the top left and select *Configure GATT server*:
+
+![NRFConnect CTS 0](nrfconnectcts0.jpg)
+
+
+Tap *Add service* and select the server configuration *Current Time service*. Tap OK and connect to your PineTime, it should automcatically sync the time once the connection is established!
+
+![NRFConnect CTS 1](nrfconnectcts1.jpg)
diff --git a/doc/gettingStarted/quickactions.jpg b/doc/gettingStarted/quickactions.jpg
new file mode 100644
index 0000000..0d92b13
Binary files /dev/null and b/doc/gettingStarted/quickactions.jpg differ
diff --git a/doc/gettingStarted/settings.jpg b/doc/gettingStarted/settings.jpg
new file mode 100644
index 0000000..510b29e
Binary files /dev/null and b/doc/gettingStarted/settings.jpg differ
diff --git a/doc/gettingStarted/version-071.jpg b/doc/gettingStarted/version-071.jpg
new file mode 100644
index 0000000..bc9bc5b
Binary files /dev/null and b/doc/gettingStarted/version-071.jpg differ
diff --git a/doc/gettingStarted/version-1.0.jpg b/doc/gettingStarted/version-1.0.jpg
new file mode 100644
index 0000000..bcfc8c6
Binary files /dev/null and b/doc/gettingStarted/version-1.0.jpg differ
diff --git a/docker/.gitpod.Dockerfile b/docker/.gitpod.Dockerfile
index 2f7099a..4fbc7be 100644
--- a/docker/.gitpod.Dockerfile
+++ b/docker/.gitpod.Dockerfile
@@ -19,8 +19,11 @@ RUN apt-get update -qq \
       libffi-dev \
       libssl-dev \
       python3-dev \
+      git \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
+# Git needed for PROJECT_GIT_COMMIT_HASH variable setting
+
 # Needs to be installed as root
 RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a6caa24..0a4f69f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,8 +19,11 @@ RUN apt-get update -qq \
       libssl-dev \
       python3-dev \
       python \
+      git \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
+# Git needed for PROJECT_GIT_COMMIT_HASH variable setting
+
 RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c6af93..acbfba1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -406,6 +406,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/FlashLight.cpp
         displayapp/screens/List.cpp
         displayapp/screens/BatteryInfo.cpp
+        displayapp/screens/Steps.cpp
 
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp
@@ -414,12 +415,12 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingTimeFormat.cpp
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
+        displayapp/screens/settings/SettingSteps.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
-        displayapp/screens/PineTimeStyle.cpp
 
         ##
 
@@ -467,7 +468,7 @@ list(APPEND SOURCE_FILES
         displayapp/fonts/jetbrains_mono_extrabold_compressed.c
         displayapp/fonts/jetbrains_mono_bold_20.c
         displayapp/fonts/jetbrains_mono_76.c
-        displayapp/fonts/open_sans_light.c
+        displayapp/fonts/jetbrains_mono_42.c
         displayapp/fonts/lv_font_sys_48.c
         displayapp/lv_pinetime_theme.c
 
diff --git a/src/Version.h.in b/src/Version.h.in
index 6ff5938..8cd39c9 100644
--- a/src/Version.h.in
+++ b/src/Version.h.in
@@ -8,11 +8,13 @@ namespace Pinetime {
       static constexpr uint32_t Major() {return major;}
       static constexpr uint32_t Minor() {return minor;}
       static constexpr uint32_t Patch() {return patch;}
+      static constexpr const char* GitCommitHash() {return commitHash;}
       static constexpr const char* VersionString() {return versionString;}
     private:
       static constexpr uint32_t major = @PROJECT_VERSION_MAJOR@;
       static constexpr uint32_t minor = @PROJECT_VERSION_MINOR@;
       static constexpr uint32_t patch = @PROJECT_VERSION_PATCH@;
+      static constexpr const char* commitHash = "@PROJECT_GIT_COMMIT_HASH@";
       static constexpr const char* versionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
   };
 }
\ No newline at end of file
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index bf64481..3a23826 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -8,13 +8,13 @@ namespace Pinetime {
     public:
       void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps);
 
-      uint16_t X() const {
+      int16_t X() const {
         return x;
       }
-      uint16_t Y() const {
+      int16_t Y() const {
         return y;
       }
-      uint16_t Z() const {
+      int16_t Z() const {
         return z;
       }
       uint32_t NbSteps() const {
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 18c87fd..4409425 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -86,6 +86,14 @@ namespace Pinetime {
         return settings.brightLevel;
       };
 
+      void SetStepsGoal( uint32_t goal ) { 
+        if ( goal != settings.stepsGoal ) 
+          settingsChanged = true;
+        settings.stepsGoal = goal; 
+      };
+      
+      uint32_t GetStepsGoal() const { return settings.stepsGoal; };
+
     private:
       Pinetime::Drivers::SpiNorFlash& spiNorFlash;
       struct SettingsData {
@@ -95,7 +103,7 @@ namespace Pinetime {
 
         uint8_t clockFace = 0;
 
-        uint32_t stepsGoal = 1000;
+        uint32_t stepsGoal = 10000;
         uint32_t screenTimeOut = 15000;
 
         WakeUpMode wakeUpMode = WakeUpMode::None;
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 936a3ae..09a2018 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -21,12 +21,14 @@ namespace Pinetime {
       Navigation,
       StopWatch,
       Motion,
+      Steps,
       QuickSettings,
       Settings,
       SettingWatchFace,
       SettingTimeFormat,
       SettingDisplay,
-      SettingWakeUp
+      SettingWakeUp,
+      SettingSteps
     };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 3a20c76..a6c4a3e 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -25,6 +25,7 @@
 #include "displayapp/screens/Twos.h"
 #include "displayapp/screens/FlashLight.h"
 #include "displayapp/screens/BatteryInfo.h"
+#include "displayapp/screens/Steps.h"
 
 #include "drivers/Cst816s.h"
 #include "drivers/St7789.h"
@@ -37,6 +38,7 @@
 #include "displayapp/screens/settings/SettingTimeFormat.h"
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
+#include "displayapp/screens/settings/SettingSteps.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Applications::Display;
@@ -65,7 +67,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     notificationManager {notificationManager},
     heartRateController {heartRateController},
     settingsController {settingsController},
-    motorController{motorController},
+    motorController {motorController},
     motionController {motionController} {
   msgQueue = xQueueCreate(queueSize, itemSize);
   // Start clock when smartwatch boots
@@ -73,8 +75,9 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
 }
 
 void DisplayApp::Start() {
-  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle))
+  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle)) {
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
+  }
 }
 
 void DisplayApp::Process(void* instance) {
@@ -85,7 +88,7 @@ void DisplayApp::Process(void* instance) {
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
-  while (1) {
+  while (true) {
     app->Refresh();
   }
 }
@@ -213,7 +216,7 @@ void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction)
   LoadApp(app, direction);
 }
 
-void DisplayApp::returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
+void DisplayApp::ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
   returnToApp = app;
   returnDirection = direction;
   returnTouchEvent = touchEvent;
@@ -224,12 +227,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
   SetFullRefresh(direction);
 
   // default return to launcher
-  returnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+  ReturnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
 
   switch (app) {
     case Apps::Launcher:
       currentScreen = std::make_unique<Screens::ApplicationList>(this, settingsController, batteryController, dateTimeController);
-      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::None:
     case Apps::Clock:
@@ -245,7 +248,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
 
     case Apps::FirmwareValidation:
       currentScreen = std::make_unique<Screens::FirmwareValidation>(this, validator);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::FirmwareUpdate:
       currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController);
@@ -254,54 +257,58 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Notifications:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Normal);
-      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::NotificationsPreview:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Preview);
-      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
 
     // Settings
     case Apps::QuickSettings:
-      currentScreen =
-        std::make_unique<Screens::QuickSettings>(this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
-      returnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
+      currentScreen = std::make_unique<Screens::QuickSettings>(
+        this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
+      ReturnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
       break;
     case Apps::Settings:
       currentScreen = std::make_unique<Screens::Settings>(this, settingsController);
-      returnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWatchFace:
       currentScreen = std::make_unique<Screens::SettingWatchFace>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingTimeFormat:
       currentScreen = std::make_unique<Screens::SettingTimeFormat>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWakeUp:
       currentScreen = std::make_unique<Screens::SettingWakeUp>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingDisplay:
       currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      break;
+    case Apps::SettingSteps: 
+      currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SysInfo:
       currentScreen =
         std::make_unique<Screens::SystemInfo>(this, dateTimeController, batteryController, brightnessController, bleController, watchdog);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
       //
 
     case Apps::FlashLight:
       currentScreen = std::make_unique<Screens::FlashLight>(this, systemTask, brightnessController);
-      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
       break;
     case Apps::StopWatch:
       currentScreen = std::make_unique<Screens::StopWatch>(this);
@@ -327,6 +334,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
       break;
+    case Apps::Steps: 
+      currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
+      break;
   }
   currentApp = app;
 }
@@ -349,8 +359,9 @@ TouchEvents DisplayApp::OnTouchEvent() {
   if (info.isTouch) {
     switch (info.gesture) {
       case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        if (touchMode == TouchModes::Gestures)
+        if (touchMode == TouchModes::Gestures) {
           lvgl.SetNewTapEvent(info.x, info.y);
+        }
         return TouchEvents::Tap;
       case Pinetime::Drivers::Cst816S::Gestures::LongPress:
         return TouchEvents::LongTap;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 75e5275..ffe27cf 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -103,7 +103,7 @@ namespace Pinetime {
       static void Process(void* instance);
       void InitHw();
       void Refresh();
-      void returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
+      void ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
       void LoadApp(Apps app, DisplayApp::FullRefreshDirections direction);
     };
   }
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index 6db987f..a132a47 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -37,7 +37,7 @@ void DisplayApp::Process(void* instance) {
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
   app->InitHw();
-  while (1) {
+  while (true) {
     app->Refresh();
   }
 }
@@ -51,10 +51,11 @@ void DisplayApp::Refresh() {
   if (xQueueReceive(msgQueue, &msg, 200)) {
     switch (msg) {
       case Display::Messages::UpdateBleConnection:
-        if (bleController.IsConnected())
+        if (bleController.IsConnected()) {
           DisplayLogo(colorBlue);
-        else
+        } else {
           DisplayLogo(colorWhite);
+        }
         break;
       case Display::Messages::BleFirmwareUpdateStarted:
         DisplayLogo(colorGreen);
diff --git a/src/displayapp/fonts/jetbrains_mono_42.c b/src/displayapp/fonts/jetbrains_mono_42.c
new file mode 100644
index 0000000..6f25f5a
--- /dev/null
+++ b/src/displayapp/fonts/jetbrains_mono_42.c
@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Size: 42 px
+ * Bpp: 1
+ * Opts: 
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef JETBRAINS_MONO_42
+#define JETBRAINS_MONO_42 1
+#endif
+
+#if JETBRAINS_MONO_42
+
+/*-----------------
+ *    BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0025 "%" */
+    0x1f, 0x80, 0x7, 0x3f, 0xc0, 0xe, 0x7f, 0xe0,
+    0x1c, 0xf0, 0xf0, 0x1c, 0xe0, 0x70, 0x38, 0xe0,
+    0x70, 0x70, 0xe0, 0x70, 0x70, 0xe0, 0x70, 0xe0,
+    0xe0, 0x71, 0xc0, 0xe0, 0x71, 0xc0, 0xf0, 0xf3,
+    0x80, 0x7f, 0xe7, 0x0, 0x3f, 0xc7, 0x0, 0x1f,
+    0x8e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x3c, 0x0,
+    0x0, 0x38, 0x0, 0x0, 0x71, 0xf8, 0x0, 0xe3,
+    0xfc, 0x0, 0xe7, 0xfe, 0x1, 0xcf, 0xf, 0x3,
+    0x8e, 0x7, 0x3, 0x8e, 0x7, 0x7, 0xe, 0x7,
+    0xe, 0xe, 0x7, 0xe, 0xe, 0x7, 0x1c, 0xe,
+    0x7, 0x38, 0xf, 0xf, 0x38, 0x7, 0xfe, 0x70,
+    0x3, 0xfc, 0xe0, 0x1, 0xf8,
+
+    /* U+0030 "0" */
+    0x3, 0xf8, 0x1, 0xff, 0xc0, 0xff, 0xfe, 0x1f,
+    0x7, 0xc7, 0xc0, 0x7c, 0xf0, 0x7, 0xbc, 0x0,
+    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xfe, 0x0, 0x3f,
+    0xc0, 0x7, 0xf8, 0x0, 0xff, 0xe, 0x1f, 0xe3,
+    0xe3, 0xfc, 0x7c, 0x7f, 0x8f, 0x8f, 0xf0, 0xe1,
+    0xfe, 0x0, 0x3f, 0xc0, 0x7, 0xf8, 0x0, 0xff,
+    0x0, 0x1f, 0xe0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
+    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
+    0x1f, 0x7, 0xc3, 0xff, 0xf8, 0x1f, 0xfc, 0x0,
+    0xfe, 0x0,
+
+    /* U+0031 "1" */
+    0x3, 0xf0, 0x0, 0xfe, 0x0, 0x3f, 0xc0, 0x1f,
+    0xf8, 0x7, 0xcf, 0x1, 0xf1, 0xe0, 0x3c, 0x3c,
+    0x7, 0x7, 0x80, 0x80, 0xf0, 0x0, 0x1e, 0x0,
+    0x3, 0xc0, 0x0, 0x78, 0x0, 0xf, 0x0, 0x1,
+    0xe0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
+    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0, 0x78, 0x0,
+    0xf, 0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x7,
+    0x80, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x3, 0xc0,
+    0x0, 0x78, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xf8,
+
+    /* U+0032 "2" */
+    0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfe, 0x1f,
+    0x7, 0xc7, 0xc0, 0x3c, 0xf0, 0x7, 0xbc, 0x0,
+    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xe0, 0x0, 0x3c,
+    0x0, 0x7, 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x0,
+    0xf, 0x80, 0x1, 0xe0, 0x0, 0x7c, 0x0, 0x1f,
+    0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7e, 0x0,
+    0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0, 0x3e,
+    0x0, 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0,
+    0x3e, 0x0, 0x7, 0xff, 0xfe, 0xff, 0xff, 0xdf,
+    0xff, 0xf8,
+
+    /* U+0033 "3" */
+    0x7f, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xfe, 0x0,
+    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf,
+    0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e, 0x0,
+    0x7, 0x80, 0x1, 0xfe, 0x0, 0x3f, 0xf0, 0x7,
+    0xff, 0x0, 0x3, 0xf0, 0x0, 0x1e, 0x0, 0x3,
+    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
+    0x0, 0x1e, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
+    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
+    0x1f, 0x7, 0xc3, 0xff, 0xf0, 0x1f, 0xfc, 0x0,
+    0xfe, 0x0,
+
+    /* U+0034 "4" */
+    0x0, 0x1e, 0x0, 0xf, 0x80, 0x3, 0xc0, 0x1,
+    0xe0, 0x0, 0x78, 0x0, 0x3c, 0x0, 0x1f, 0x0,
+    0x7, 0x80, 0x3, 0xc0, 0x1, 0xf0, 0x0, 0x78,
+    0x0, 0x3e, 0x0, 0xf, 0x0, 0x7, 0x80, 0xf3,
+    0xe0, 0x3c, 0xf0, 0xf, 0x7c, 0x3, 0xde, 0x0,
+    0xff, 0x0, 0x3f, 0xc0, 0xf, 0xf0, 0x3, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x3,
+    0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0,
+    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c,
+
+    /* U+0035 "5" */
+    0x7f, 0xff, 0x9f, 0xff, 0xe7, 0xff, 0xf9, 0xe0,
+    0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x80, 0x1,
+    0xe0, 0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x8f,
+    0x81, 0xef, 0xf8, 0x7f, 0xff, 0x1f, 0x87, 0xe7,
+    0xc0, 0x79, 0xe0, 0x1f, 0x0, 0x3, 0xc0, 0x0,
+    0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0, 0x3, 0xc0,
+    0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0xf0, 0x3,
+    0xde, 0x1, 0xe7, 0x80, 0x78, 0xf8, 0x7e, 0x3f,
+    0xff, 0x3, 0xff, 0x80, 0x3f, 0x0,
+
+    /* U+0036 "6" */
+    0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x78, 0x0,
+    0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e, 0x0, 0x3,
+    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x70,
+    0x0, 0xf, 0x0, 0x1, 0xe7, 0xc0, 0x1f, 0xff,
+    0x3, 0xff, 0xfc, 0x3f, 0xf, 0xc7, 0xc0, 0x3e,
+    0x78, 0x1, 0xe7, 0x80, 0x1f, 0xf0, 0x0, 0xff,
+    0x0, 0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
+    0x0, 0xff, 0x0, 0xf, 0xf8, 0x1, 0xe7, 0x80,
+    0x1e, 0x7c, 0x3, 0xe3, 0xf0, 0xfc, 0x1f, 0xff,
+    0x80, 0xff, 0xf0, 0x1, 0xf8, 0x0,
+
+    /* U+0037 "7" */
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x0, 0x1e, 0xf0, 0x1, 0xef, 0x0, 0x1e, 0xf0,
+    0x3, 0xcf, 0x0, 0x3c, 0x0, 0x3, 0x80, 0x0,
+    0x78, 0x0, 0x7, 0x80, 0x0, 0xf0, 0x0, 0xf,
+    0x0, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x1, 0xe0,
+    0x0, 0x3c, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0,
+    0x7, 0x80, 0x0, 0x78, 0x0, 0x7, 0x80, 0x0,
+    0xf0, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e,
+    0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x3, 0xc0,
+    0x0, 0x7c, 0x0, 0x7, 0x80, 0x0,
+
+    /* U+0038 "8" */
+    0x1, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
+    0xf0, 0xfc, 0x3c, 0x3, 0xc7, 0xc0, 0x3e, 0x78,
+    0x1, 0xe7, 0x80, 0x1e, 0x78, 0x1, 0xe7, 0x80,
+    0x1e, 0x3c, 0x3, 0xc3, 0xe0, 0x7c, 0x1f, 0xf,
+    0x80, 0xff, 0xf0, 0x3, 0xfc, 0x0, 0x7f, 0xe0,
+    0xf, 0xff, 0x3, 0xe0, 0x7c, 0x3c, 0x3, 0xc7,
+    0x80, 0x1e, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
+    0x0, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x80,
+    0x1f, 0x7c, 0x3, 0xe7, 0xe0, 0x7e, 0x3f, 0xff,
+    0xc0, 0xff, 0xf0, 0x3, 0xfc, 0x0,
+
+    /* U+0039 "9" */
+    0x3, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
+    0xe0, 0xfc, 0x7c, 0x3, 0xe7, 0x80, 0x1e, 0xf8,
+    0x1, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x0,
+    0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf8, 0x1,
+    0xf7, 0x80, 0x1e, 0x7c, 0x3, 0xe3, 0xe0, 0x7e,
+    0x3f, 0xff, 0xc1, 0xff, 0xfc, 0x7, 0xe7, 0x80,
+    0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0,
+    0x1e, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0, 0x7,
+    0x80, 0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0,
+    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0,
+
+    /* U+003A ":" */
+    0x7d, 0xff, 0xff, 0xff, 0xef, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xf7, 0xff, 0xff, 0xff, 0xbe
+};
+
+
+/*---------------------
+ *  GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+    {.bitmap_index = 0, .adv_w = 403, .box_w = 24, .box_h = 31, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 93, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 167, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 4, .ofs_y = 0},
+    {.bitmap_index = 241, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 315, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 389, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 459, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 529, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 607, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 685, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 763, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 841, .adv_w = 403, .box_w = 7, .box_h = 24, .ofs_x = 9, .ofs_y = 0}
+};
+
+/*---------------------
+ *  CHARACTER MAPPING
+ *--------------------*/
+
+
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+    {
+        .range_start = 37, .range_length = 1, .glyph_id_start = 1,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    },
+    {
+        .range_start = 48, .range_length = 11, .glyph_id_start = 2,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    }
+};
+
+
+
+/*--------------------
+ *  ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+    .glyph_bitmap = glyph_bitmap,
+    .glyph_dsc = glyph_dsc,
+    .cmaps = cmaps,
+    .kern_dsc = NULL,
+    .kern_scale = 0,
+    .cmap_num = 2,
+    .bpp = 1,
+    .kern_classes = 0,
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ *  PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t jetbrains_mono_42 = {
+#else
+lv_font_t jetbrains_mono_42 = {
+#endif
+    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
+    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
+    .line_height = 31,          /*The maximum line height required by the font*/
+    .base_line = 0,             /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+    .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0)
+    .underline_position = -7,
+    .underline_thickness = 2,
+#endif
+    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if JETBRAINS_MONO_42*/
+
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 7e38b3f..1eb3699 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
     {Symbols::stopWatch, Apps::StopWatch},
     {Symbols::music, Apps::Music},
     {Symbols::map, Apps::Navigation},
-    {Symbols::shoe, Apps::Motion},
+    {Symbols::shoe, Apps::Steps},
     {Symbols::heartBeat, Apps::HeartRate},
     {"", Apps::None},
   }};
@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
     {Symbols::paintbrush, Apps::Paint},
     {Symbols::paddle, Apps::Paddle},
     {"2", Apps::Twos},
-    {"", Apps::None},
+    {"M", Apps::Motion},
     {"", Apps::None},
     {"", Apps::None},
   }};
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index e0c1f62..1429984 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -14,7 +14,6 @@
 #include "../DisplayApp.h"
 #include "WatchFaceDigital.h"
 #include "WatchFaceAnalog.h"
-#include "PineTimeStyle.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -43,9 +42,6 @@ Clock::Clock(DisplayApp* app,
                [this]() -> std::unique_ptr<Screen> {
                  return WatchFaceAnalogScreen();
                },
-               [this]() -> std::unique_ptr<Screen> {
-                 return PineTimeStyleScreen();
-               },
                // Examples for more watch faces
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
@@ -84,16 +80,6 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
     app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
-std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
-  return std::make_unique<Screens::PineTimeStyle>(app,
-                                                     dateTimeController,
-                                                     batteryController,
-                                                     bleController,
-                                                     notificatioManager,
-                                                     settingsController,
-                                                     heartRateController);
-}
-
 /*
 // Examples for more watch faces
 std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
@@ -105,4 +91,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
+*/
\ No newline at end of file
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 920d58b..9879985 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -47,10 +47,9 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
 
-        ScreenList<3> screens;
+        ScreenList<2> screens;
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
-        std::unique_ptr<Screen> PineTimeStyleScreen();
 
         // Examples for more watch faces
         // std::unique_ptr<Screen> WatchFaceMinimalScreen();
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 873a22f..ad37a3d 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -27,6 +27,17 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
   sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
   lv_label_set_text(labelVersionValue, version);
 
+  labelShortRefInfo = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(labelShortRefInfo, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 25);
+  lv_label_set_text(labelShortRefInfo, "ShortRef : ");
+  lv_label_set_align(labelShortRefInfo, LV_LABEL_ALIGN_LEFT);
+
+  labelShortRefValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(labelShortRefValue, labelShortRefInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+  lv_label_set_recolor(labelShortRefValue, true);
+  sprintf(shortref, "%s", Version::GitCommitHash());
+  lv_label_set_text(labelShortRefValue, shortref);
+
   labelIsValidated = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(labelIsValidated, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 50);
   lv_label_set_recolor(labelIsValidated, true);
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 67662fd..303c215 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -25,7 +25,10 @@ namespace Pinetime {
 
         lv_obj_t* labelVersionInfo;
         lv_obj_t* labelVersionValue;
+        lv_obj_t* labelShortRefInfo;
+        lv_obj_t* labelShortRefValue;
         char version[9];
+        char shortref[9];
         lv_obj_t* labelIsValidated;
         lv_obj_t* buttonValidate;
         lv_obj_t* labelButtonValidate;
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index e719626..a8bb3c1 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -3,8 +3,6 @@
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
-extern lv_font_t jetbrains_mono_extrabold_compressed;
-extern lv_font_t jetbrains_mono_bold_20;
 
 Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionController& motionController)
   : Screen(app), motionController {motionController} {
@@ -29,13 +27,16 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
   lv_chart_init_points(chart, ser3, 0);
   lv_chart_refresh(chart); /*Required after direct set*/
 
+  label = lv_label_create(lv_scr_act(), NULL);
+  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", 0, 0, 0);
+  lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+  lv_label_set_recolor(label, true);
+  
   labelStep = lv_label_create(lv_scr_act(), NULL);
   lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
-  lv_label_set_text(labelStep, "Steps: ");
+  lv_label_set_text(labelStep, "Steps ---");
 
-  labelStepValue = lv_label_create(lv_scr_act(), NULL);
-  lv_obj_align(labelStepValue, labelStep, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
-  lv_label_set_text(labelStepValue, "-");
 }
 
 Motion::~Motion() {
@@ -47,8 +48,10 @@ bool Motion::Refresh() {
   lv_chart_set_next(chart, ser2, motionController.Y());
   lv_chart_set_next(chart, ser3, motionController.Z());
 
-  snprintf(nbStepsBuffer, nbStepsBufferSize, "%lu", motionController.NbSteps());
-  lv_label_set_text(labelStepValue, nbStepsBuffer);
+  lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps());
+
+  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
+  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
 
   return running;
 }
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index 1100786..132b20e 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -26,9 +26,9 @@ namespace Pinetime {
         lv_chart_series_t* ser1;
         lv_chart_series_t* ser2;
         lv_chart_series_t* ser3;
+        lv_obj_t* label;
 
         lv_obj_t* labelStep;
-        lv_obj_t* labelStepValue;
         static constexpr uint8_t nbStepsBufferSize = 9;
         char nbStepsBuffer[nbStepsBufferSize + 1];
         bool running = true;
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index f0fd2f6..1f11375 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -176,7 +176,17 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   lv_obj_set_style_local_text_color(alert_type, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x888888));
   if (title == nullptr)
     title = "Notification";
+  char* pchar;
+  pchar = strchr(title, '\n');
+  while (pchar != nullptr) {
+    *pchar = ' ';
+    pchar =
+    pchar = strchr(pchar + 1, '\n');
+  }
   lv_label_set_text(alert_type, title);
+  lv_label_set_long_mode(alert_type, LV_LABEL_LONG_SROLL_CIRC);
+  lv_label_set_anim_speed(alert_type, 3);
+  lv_obj_set_width(alert_type, 180);
   lv_obj_align(alert_type, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 16);
 
   /////////
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
new file mode 100644
index 0000000..b485c97
--- /dev/null
+++ b/src/displayapp/screens/Steps.cpp
@@ -0,0 +1,72 @@
+#include "Steps.h"
+#include <lvgl/lvgl.h>
+#include "../DisplayApp.h"
+#include "Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+Steps::Steps(
+    Pinetime::Applications::DisplayApp *app, 
+    Controllers::MotionController& motionController,
+    Controllers::Settings &settingsController) 
+      : Screen(app), 
+      motionController{motionController},
+      settingsController{settingsController} {
+
+  stepsArc = lv_arc_create(lv_scr_act(), nullptr);
+
+  lv_obj_set_style_local_bg_opa(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, LV_OPA_0);  
+  lv_obj_set_style_local_border_width(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 2);  
+  lv_obj_set_style_local_radius(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 0);  
+  lv_obj_set_style_local_line_color(stepsArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, lv_color_hex(0x0000FF));  
+  lv_arc_set_end_angle(stepsArc, 200);
+  lv_obj_set_size(stepsArc, 220, 220);
+  lv_arc_set_range(stepsArc, 0, 500);
+  lv_obj_align(stepsArc, nullptr, LV_ALIGN_CENTER, 0, 0);
+
+  stepsCount = motionController.NbSteps();
+
+  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
+
+  lSteps = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
+  lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);   
+  lv_label_set_text_fmt(lSteps, "%li", stepsCount); 
+  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
+
+  lv_obj_t * lstepsL = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+  lv_label_set_text_static(lstepsL, "Steps"); 
+  lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+
+  lv_obj_t * lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
+  lv_label_set_text_fmt(lstepsGoal,"Goal\n%i", settingsController.GetStepsGoal()); 
+  lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lstepsGoal, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 60);
+
+  lv_obj_t * backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text_static(backgroundLabel, "");
+
+}
+
+Steps::~Steps() {
+  lv_obj_clean(lv_scr_act());
+}
+
+bool Steps::Refresh() {
+  
+  stepsCount = motionController.NbSteps();
+
+  lv_label_set_text_fmt(lSteps,"%li", stepsCount);
+  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
+     
+  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
+
+  return running;
+}
+
+
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
new file mode 100644
index 0000000..9c135e2
--- /dev/null
+++ b/src/displayapp/screens/Steps.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "Screen.h"
+#include <components/motion/MotionController.h>
+
+namespace Pinetime {
+
+  namespace Controllers {
+    class Settings;
+  }
+
+  namespace Applications {
+    namespace Screens {
+
+      class Steps : public Screen {
+        public:
+          Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings &settingsController);
+          ~Steps() override;
+
+          bool Refresh() override;
+          
+
+        private:          
+
+          Controllers::MotionController& motionController;
+          Controllers::Settings& settingsController;
+
+          lv_obj_t * lSteps;
+          lv_obj_t * lStepsIcon;
+          lv_obj_t * stepsArc;
+
+          uint32_t stepsCount;
+
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index e06981a..d7cd20c 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -115,8 +115,9 @@ bool StopWatch::Refresh() {
     // Init state when an user first opens the app
     // and when a stop/reset button is pressed
     case States::Init: {
-      if (btnStopLap) {
+      if (btnStopLap != nullptr) {
         lv_obj_del(btnStopLap);
+        btnStopLap = nullptr;
       }
       // The initial default value
       lv_label_set_text(time, "00:00");
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index f6e8d61..e4ef691 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -69,12 +69,14 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
   lv_label_set_text_fmt(label,
                         "#FFFF00 InfiniTime#\n\n"
                         "#444444 Version# %ld.%ld.%ld\n\n"
+                        "#444444 Short Ref# %s\n\n"
                         "#444444 Build date#\n"
-                        "\t%s\n"
-                        "\t%s\n",
+                        "%s\n"
+                        "%s\n",
                         Version::Major(),
                         Version::Minor(),
                         Version::Patch(),
+                        Version::GitCommitHash(),
                         __DATE__,
                         __TIME__);
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -242,4 +244,4 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen5() {
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
   return std::unique_ptr<Screen>(new Screens::Label(4, 5, app, label));
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
new file mode 100644
index 0000000..b7c024f
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.cpp
@@ -0,0 +1,98 @@
+#include "SettingSteps.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t * obj, lv_event_t event) {
+    SettingSteps* screen = static_cast<SettingSteps *>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingSteps::SettingSteps(
+  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
+  Screen(app),
+  settingsController{settingsController}
+{
+
+  lv_obj_t * container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+  //lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_pos(container1, 30, 60);
+  lv_obj_set_width(container1, LV_HOR_RES - 50);
+  lv_obj_set_height(container1, LV_VER_RES - 60);
+  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+  lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);  
+  lv_label_set_text_static(title,"Daily steps goal");
+  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
+
+  lv_obj_t * icon = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+  
+  lv_label_set_text_static(icon, Symbols::shoe);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+
+  stepValue = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+
+  btnPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnPlus->user_data = this;
+  lv_obj_set_size(btnPlus, 80, 50);
+  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnPlus, event_handler);
+
+  btnMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnMinus->user_data = this;
+  lv_obj_set_size(btnMinus, 80, 50);
+  lv_obj_set_event_cb(btnMinus, event_handler);
+  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+
+}
+
+SettingSteps::~SettingSteps() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+bool SettingSteps::Refresh() {
+  return running;
+}
+
+
+void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+  uint32_t value = settingsController.GetStepsGoal();
+  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
+    value += 1000;
+    if ( value <= 500000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+
+  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
+    value -= 1000;
+    if ( value >= 1000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
new file mode 100644
index 0000000..0a4c205
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingSteps : public Screen{
+        public:
+          SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+          ~SettingSteps() override;
+
+          bool Refresh() override;
+          void UpdateSelected(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::Settings& settingsController;
+
+          lv_obj_t * stepValue;
+          lv_obj_t * btnPlus;
+          lv_obj_t * btnMinus;
+          
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 3914a04..457cebf 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -59,15 +59,6 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
   }
 
   optionsTotal++;
-    cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text_static(cbOption[optionsTotal], " PineTimeStyle");
-  cbOption[optionsTotal]->user_data = this;
-  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  if (settingsController.GetClockFace() == 2) {
-    lv_checkbox_set_checked(cbOption[optionsTotal], true);
-  }
-
-  optionsTotal++;
 }
 
 SettingWatchFace::~SettingWatchFace() {
@@ -90,4 +81,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 6f65d69..1930a22 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -21,7 +21,7 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
         uint8_t optionsTotal;
-        lv_obj_t* cbOption[3];
+        lv_obj_t* cbOption[2];
       };
     }
   }
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index e24be3d..2c72c83 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -44,9 +44,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
     {Symbols::clock, "Wake Up", Apps::SettingWakeUp},
     {Symbols::clock, "Time format", Apps::SettingTimeFormat},
     {Symbols::clock, "Watch face", Apps::SettingWatchFace},
-  }
-
-  };
+  }};
 
   return std::unique_ptr<Screen>(new Screens::List(0, 2, app, settingsController, applications));
 }
@@ -54,13 +52,11 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
 std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   std::array<Screens::List::Applications, 4> applications {{
+    {Symbols::shoe, "Steps", Apps::SettingSteps},
     {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
     {Symbols::check, "Firmware", Apps::FirmwareValidation},
     {Symbols::list, "About", Apps::SysInfo},
-    {"", "", Apps::None},
-  }
-
-  };
+  }};
 
   return std::unique_ptr<Screen>(new Screens::List(1, 2, app, settingsController, applications));
 }
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index e774091..761baba 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -415,8 +415,8 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
 
 #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(jetbrains_mono_bold_20) \
                                LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \
+                               LV_FONT_DECLARE(jetbrains_mono_42) \
                                LV_FONT_DECLARE(jetbrains_mono_76) \
-                               LV_FONT_DECLARE(open_sans_light) \
                                LV_FONT_DECLARE(lv_font_sys_48)
 
 /* Enable it if you have fonts with a lot of characters.
@@ -758,4 +758,4 @@ typedef void* lv_obj_user_data_t;
 
 /*--END OF LV_CONF_H--*/
 
-#endif /*LV_CONF_H*/
+#endif /*LV_CONF_H*/
\ No newline at end of file
diff --git a/src/logging/NrfLogger.cpp b/src/logging/NrfLogger.cpp
index 70a00e6..1c048f2 100644
--- a/src/logging/NrfLogger.cpp
+++ b/src/logging/NrfLogger.cpp
@@ -12,8 +12,9 @@ void NrfLogger::Init() {
 
   NRF_LOG_DEFAULT_BACKENDS_INIT();
 
-  if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread))
+  if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread)) {
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
+  }
 }
 
 void NrfLogger::Process(void*) {
@@ -21,7 +22,7 @@ void NrfLogger::Process(void*) {
 // Suppress endless loop diagnostic
 #pragma clang diagnostic push
 #pragma ide diagnostic ignored "EndlessLoop"
-  while (1) {
+  while (true) {
     NRF_LOG_FLUSH();
     vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
   }
-- 
cgit v0.10.2


From 108bbc3642f9e6ca614ab4b470eb8ae34e739ffe Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 18:03:26 +0200
Subject: Fix it again..


diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index acbfba1..5b83812 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -421,6 +421,7 @@ list(APPEND SOURCE_FILES
         displayapp/icons/bg_clock.c
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
+        displayapp/screens/PineTimeStyle.cpp
 
         ##
 
@@ -470,6 +471,7 @@ list(APPEND SOURCE_FILES
         displayapp/fonts/jetbrains_mono_76.c
         displayapp/fonts/jetbrains_mono_42.c
         displayapp/fonts/lv_font_sys_48.c
+        displayapp/fonts/open_sans_light.c
         displayapp/lv_pinetime_theme.c
 
         systemtask/SystemTask.cpp
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 1429984..e0c1f62 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -14,6 +14,7 @@
 #include "../DisplayApp.h"
 #include "WatchFaceDigital.h"
 #include "WatchFaceAnalog.h"
+#include "PineTimeStyle.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -42,6 +43,9 @@ Clock::Clock(DisplayApp* app,
                [this]() -> std::unique_ptr<Screen> {
                  return WatchFaceAnalogScreen();
                },
+               [this]() -> std::unique_ptr<Screen> {
+                 return PineTimeStyleScreen();
+               },
                // Examples for more watch faces
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
@@ -80,6 +84,16 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
     app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
+std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
+  return std::make_unique<Screens::PineTimeStyle>(app,
+                                                     dateTimeController,
+                                                     batteryController,
+                                                     bleController,
+                                                     notificatioManager,
+                                                     settingsController,
+                                                     heartRateController);
+}
+
 /*
 // Examples for more watch faces
 std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
@@ -91,4 +105,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
\ No newline at end of file
+*/
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 9879985..920d58b 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -47,9 +47,10 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
 
-        ScreenList<2> screens;
+        ScreenList<3> screens;
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
+        std::unique_ptr<Screen> PineTimeStyleScreen();
 
         // Examples for more watch faces
         // std::unique_ptr<Screen> WatchFaceMinimalScreen();
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 457cebf..33d4141 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -59,6 +59,15 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
   }
 
   optionsTotal++;
+  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text_static(cbOption[optionsTotal], " PineTimeStyle");
+  cbOption[optionsTotal]->user_data = this;
+  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
+  if (settingsController.GetClockFace() == 2) {
+    lv_checkbox_set_checked(cbOption[optionsTotal], true);
+  }
+
+  optionsTotal++;
 }
 
 SettingWatchFace::~SettingWatchFace() {
@@ -81,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index 761baba..cabc185 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -417,6 +417,7 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
                                LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \
                                LV_FONT_DECLARE(jetbrains_mono_42) \
                                LV_FONT_DECLARE(jetbrains_mono_76) \
+                               LV_FONT_DECLARE(open_sans_light) \
                                LV_FONT_DECLARE(lv_font_sys_48)
 
 /* Enable it if you have fonts with a lot of characters.
@@ -758,4 +759,4 @@ typedef void* lv_obj_user_data_t;
 
 /*--END OF LV_CONF_H--*/
 
-#endif /*LV_CONF_H*/
\ No newline at end of file
+#endif /*LV_CONF_H*/
-- 
cgit v0.10.2


From 5daaa5cf75b23e80776614af263c23e6433365e3 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 19 May 2021 11:03:33 +0200
Subject: Tidying/formatting fixes


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index b249416..10f2da6 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -15,6 +15,21 @@
 #include "../DisplayApp.h"
 
 /*
+ * This file is part of the Infinitime distribution (https://github.com/JF002/Infinitime).
+ * Copyright (c) 2021 Kieran Cawthray.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
  * PineTimeStyle watchface for Infinitime created by Kieran Cawthray
  * Based on WatchFaceDigital
  * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
@@ -38,7 +53,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     settingsController {settingsController},
     heartRateController {heartRateController} {
 
-  /* This sets the watchface number to return to after leaving the menu*/
+  /* This sets the watchface number to return to after leaving the menu */
   settingsController.SetClockFace(2);
 
   displayedChar[0] = 0;
@@ -47,7 +62,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
-  /*Create a 200px wide background rectangle*/
+  /* Create a 200px wide background rectangle */
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -55,7 +70,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
-  /*Display the time*/
+  /* Display the time */
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
@@ -69,7 +84,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
-  /*Create a 40px wide bar down the right side of the screen*/
+  /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
@@ -77,7 +92,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  /*Display icons*/
+  /* Display icons */
 
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -86,17 +101,14 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   batteryPlug = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  //lv_label_set_text(batteryPlug, Symbols::plug);
   lv_obj_align(batteryPlug, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
 
   bleIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  //lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
   lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
 
   notificationIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  //lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
   lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
 
   /* Calendar icon */
@@ -137,7 +149,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(calendarCrossBar2, 8, 3);
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  /*Display date*/
+  /* Display date */
 
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -154,7 +166,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(dateMonth, "MAR");
   lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
 
-  /*Display heartrate info*/
+  /* Display heartrate info */
 
   heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -208,10 +220,8 @@ bool PineTimeStyle::Refresh() {
     if (notificationState.Get() == true) {
       lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
       lv_obj_realign(notificationIcon);
-      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, -8, 25);
     } else {
       lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
-      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
     }
   }
 
@@ -248,7 +258,7 @@ bool PineTimeStyle::Refresh() {
       char hourStr[3];
       char minStr[3];
 
-      /*Display the time as 2 pairs of digits*/
+      /* Display the time as 2 pairs of digits */
       sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
       lv_label_set_text(timeDD1, hourStr);
 
-- 
cgit v0.10.2


From 249b6db6f5a5a7ac6cfaf96b1d8e59306ffe1333 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 19 May 2021 17:05:33 +0200
Subject: Remove newline modifications


diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index e0c1f62..4f0efd9 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -105,4 +105,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
+*/
\ No newline at end of file
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 10f2da6..f6597ca 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -301,4 +301,4 @@ bool PineTimeStyle::Refresh() {
   }
 
   return running;
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 33d4141..3e73489 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -90,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index cabc185..a03a483 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -759,4 +759,4 @@ typedef void* lv_obj_user_data_t;
 
 /*--END OF LV_CONF_H--*/
 
-#endif /*LV_CONF_H*/
+#endif /*LV_CONF_H*/
\ No newline at end of file
-- 
cgit v0.10.2


From 5c413016a7b9e78040fb8e5b48cd37b7963362df Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 19 May 2021 17:27:42 +0200
Subject: Move GPL license header


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index f6597ca..787bb40 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -1,19 +1,3 @@
-#include "PineTimeStyle.h"
-
-#include <date/date.h>
-#include <lvgl/lvgl.h>
-#include <cstdio>
-#include "BatteryIcon.h"
-#include "BleIcon.h"
-#include "NotificationIcon.h"
-#include "Symbols.h"
-#include "components/battery/BatteryController.h"
-#include "components/ble/BleController.h"
-#include "components/ble/NotificationManager.h"
-#include "components/heartrate/HeartRateController.h"
-#include "components/settings/Settings.h"
-#include "../DisplayApp.h"
-
 /*
  * This file is part of the Infinitime distribution (https://github.com/JF002/Infinitime).
  * Copyright (c) 2021 Kieran Cawthray.
@@ -35,6 +19,21 @@
  * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
  */
 
+#include "PineTimeStyle.h"
+#include <date/date.h>
+#include <lvgl/lvgl.h>
+#include <cstdio>
+#include "BatteryIcon.h"
+#include "BleIcon.h"
+#include "NotificationIcon.h"
+#include "Symbols.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/heartrate/HeartRateController.h"
+#include "components/settings/Settings.h"
+#include "../DisplayApp.h"
+
 using namespace Pinetime::Applications::Screens;
 
 PineTimeStyle::PineTimeStyle(DisplayApp* app,
-- 
cgit v0.10.2


From d0df278b0be2aae0493d901569a094dba221ce99 Mon Sep 17 00:00:00 2001
From: hassless <85612141+hassless@users.noreply.github.com>
Date: Wed, 9 Jun 2021 13:47:22 +0200
Subject: Update BatteryIcon.cpp

Improvement to the mapping of battery percentage to the battery icon to be displayed.

diff --git a/src/displayapp/screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp
index 6b54a30..ff8a138 100644
--- a/src/displayapp/screens/BatteryIcon.cpp
+++ b/src/displayapp/screens/BatteryIcon.cpp
@@ -4,13 +4,13 @@
 using namespace Pinetime::Applications::Screens;
 
 const char* BatteryIcon::GetBatteryIcon(int batteryPercent) {
-  if (batteryPercent > 90)
+  if (batteryPercent > 87)
     return Symbols::batteryFull;
-  if (batteryPercent > 75)
+  if (batteryPercent > 62)
     return Symbols::batteryThreeQuarter;
-  if (batteryPercent > 50)
+  if (batteryPercent > 37)
     return Symbols::batteryHalf;
-  if (batteryPercent > 25)
+  if (batteryPercent > 12)
     return Symbols::batteryOneQuarter;
   return Symbols::batteryEmpty;
 }
-- 
cgit v0.10.2


From 123c6f19176c5e86ff040eb4b059cbe1b4876ba5 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 11 Jun 2021 13:26:28 +0300
Subject: Fix touchevent tap


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 7b03d56..c8e5d2e 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -162,7 +162,8 @@ void DisplayApp::Refresh() {
       case Messages::TouchEvent: {
         if (state != States::Running)
           break;
-        auto gesture = OnTouchEvent();
+        auto info = touchPanel.GetTouchInfo();
+        auto gesture = OnTouchEvent(info);
         if (!currentScreen->OnTouchEvent(gesture)) {
           if (currentApp == Apps::Clock) {
             switch (gesture) {
@@ -183,6 +184,8 @@ void DisplayApp::Refresh() {
             }
           } else if (returnTouchEvent == gesture) {
             LoadApp(returnToApp, returnDirection);
+          } else if (touchMode == TouchModes::Gestures) {
+            lvgl.SetNewTapEvent(info.x, info.y);
           }
         }
       } break;
@@ -368,14 +371,10 @@ void DisplayApp::PushMessage(Messages msg) {
   }
 }
 
-TouchEvents DisplayApp::OnTouchEvent() {
-  auto info = touchPanel.GetTouchInfo();
+TouchEvents DisplayApp::OnTouchEvent(Pinetime::Drivers::Cst816S::TouchInfos info) {
   if (info.isTouch) {
     switch (info.gesture) {
       case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        if (touchMode == TouchModes::Gestures) {
-          lvgl.SetNewTapEvent(info.x, info.y);
-        }
         return TouchEvents::Tap;
       case Pinetime::Drivers::Cst816S::Gestures::LongPress:
         return TouchEvents::LongTap;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 0c7bd21..14cd7ad 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -100,7 +100,7 @@ namespace Pinetime {
 
       TouchModes touchMode = TouchModes::Gestures;
 
-      TouchEvents OnTouchEvent();
+      TouchEvents OnTouchEvent(Pinetime::Drivers::Cst816S::TouchInfos);
       void RunningState();
       void IdleState();
       static void Process(void* instance);
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 3994794..20d2cd2 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -155,14 +155,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
 }
 
 bool QuickSettings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  switch (event) {
-    case Pinetime::Applications::TouchEvents::SwipeLeft:
-      running = false;
-      return false;
-
-    default:
-      return true;
-  }
+  return false;
 }
 
 bool QuickSettings::Refresh() {
-- 
cgit v0.10.2


From 21b6f85140f0424b9e6c8371db7e190dd0303182 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 11 Jun 2021 14:46:03 +0300
Subject: Fix regression


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index c8e5d2e..b45822d 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -185,7 +185,9 @@ void DisplayApp::Refresh() {
           } else if (returnTouchEvent == gesture) {
             LoadApp(returnToApp, returnDirection);
           } else if (touchMode == TouchModes::Gestures) {
-            lvgl.SetNewTapEvent(info.x, info.y);
+            if (gesture == TouchEvents::Tap) {
+              lvgl.SetNewTapEvent(info.x, info.y);
+            }
           }
         }
       } break;
-- 
cgit v0.10.2


From 239b5547eae64d05f5d7544f0e11bfb877a75a02 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 11 Jun 2021 14:55:37 +0300
Subject: Fix another regression


diff --git a/src/displayapp/screens/FlashLight.cpp b/src/displayapp/screens/FlashLight.cpp
index 4568db4..8d647a3 100644
--- a/src/displayapp/screens/FlashLight.cpp
+++ b/src/displayapp/screens/FlashLight.cpp
@@ -70,5 +70,5 @@ bool FlashLight::Refresh() {
 }
 
 bool FlashLight::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  return true;
+  return false;
 }
-- 
cgit v0.10.2


From 607af27ba8790f68d06d7cc855ef3058558defd7 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 20 Jun 2021 21:53:09 +0200
Subject: Add step count gauge - replaces heartrate in sidebar


diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83f2439..aca8654 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -235,6 +235,7 @@ set(LVGL_SRC
         libs/lvgl/src/lv_widgets/lv_cont.h
         libs/lvgl/src/lv_widgets/lv_cpicker.h
         libs/lvgl/src/lv_widgets/lv_dropdown.h
+        libs/lvgl/src/lv_widgets/lv_gauge.h
         libs/lvgl/src/lv_widgets/lv_img.h
         libs/lvgl/src/lv_widgets/lv_imgbtn.h
         libs/lvgl/src/lv_widgets/lv_keyboard.h
@@ -321,6 +322,7 @@ set(LVGL_SRC
         libs/lvgl/src/lv_widgets/lv_cont.c
         libs/lvgl/src/lv_widgets/lv_cpicker.c
         libs/lvgl/src/lv_widgets/lv_dropdown.c
+        libs/lvgl/src/lv_widgets/lv_gauge.c
         libs/lvgl/src/lv_widgets/lv_img.c
         libs/lvgl/src/lv_widgets/lv_imgbtn.c
         libs/lvgl/src/lv_widgets/lv_keyboard.c
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 3b288d9..e068497 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -87,7 +87,7 @@ std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
                                                      bleController,
                                                      notificatioManager,
                                                      settingsController,
-                                                     heartRateController);
+                                                     motionController);
 }
 
 /*
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 787bb40..ab6e2a7 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -30,7 +30,7 @@
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
-#include "components/heartrate/HeartRateController.h"
+#include "components/motion/MotionController.h"
 #include "components/settings/Settings.h"
 #include "../DisplayApp.h"
 
@@ -42,7 +42,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
                              Controllers::Ble& bleController,
                              Controllers::NotificationManager& notificatioManager,
                              Controllers::Settings& settingsController,
-                             Controllers::HeartRateController& heartRateController)
+                             Controllers::MotionController& motionController)
   : Screen(app),
     currentDateTime {{}},
     dateTimeController {dateTimeController},
@@ -50,7 +50,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     bleController {bleController},
     notificatioManager {notificatioManager},
     settingsController {settingsController},
-    heartRateController {heartRateController} {
+    motionController {motionController} {
 
   /* This sets the watchface number to return to after leaving the menu */
   settingsController.SetClockFace(2);
@@ -165,17 +165,29 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(dateMonth, "MAR");
   lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
 
-  /* Display heartrate info */
-
-  heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  lv_label_set_text(heartbeatIcon, Symbols::heartBeat);
-  lv_obj_align(heartbeatIcon, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -30);
-
-  heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  lv_label_set_text(heartbeatValue, "---");
-  lv_obj_align(heartbeatValue, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+  // Step count gauge
+  static lv_color_t needle_colors[1];
+  needle_colors[0] = LV_COLOR_WHITE;
+  stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
+  lv_gauge_set_needle_count(stepGauge, 1, needle_colors);
+  lv_obj_set_size(stepGauge, 40, 40);
+  lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_gauge_set_scale(stepGauge, 360, 11, 0);
+  lv_gauge_set_angle_offset(stepGauge, 180);
+  lv_gauge_set_critical_value(stepGauge, (settingsController.GetStepsGoal() / 100));
+  lv_gauge_set_range(stepGauge, 0, (settingsController.GetStepsGoal() / 100));
+  lv_gauge_set_value(stepGauge, 0, 0);
+
+  lv_obj_set_style_local_pad_right(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_left(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_bottom(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_scale_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_click(backgroundLabel, true);
@@ -286,17 +298,11 @@ bool PineTimeStyle::Refresh() {
     }
   }
 
-  heartbeat = heartRateController.HeartRate();
-  heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
-  if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
-    char heartbeatBuffer[4];
-    if (heartbeatRunning.Get())
-      sprintf(heartbeatBuffer, "%d", heartbeat.Get());
-    else
-      sprintf(heartbeatBuffer, "---");
-
-    lv_label_set_text(heartbeatValue, heartbeatBuffer);
-    lv_obj_realign(heartbeatValue);
+  stepCount = motionController.NbSteps();
+  motionSensorOk = motionController.IsSensorOk();
+  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+      lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / 100));
+      lv_obj_realign(stepGauge);
   }
 
   return running;
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 5575241..4530bb5f 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -27,7 +27,7 @@ namespace Pinetime {
                       Controllers::Ble& bleController,
                       Controllers::NotificationManager& notificatioManager,
                       Controllers::Settings& settingsController,
-                      Controllers::HeartRateController& heartRateController);
+                      Controllers::MotionController& motionController);
         ~PineTimeStyle() override;
 
         bool Refresh() override;
@@ -45,8 +45,8 @@ namespace Pinetime {
         DirtyValue<int> batteryPercentRemaining {};
         DirtyValue<bool> bleState {};
         DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
-        DirtyValue<uint8_t> heartbeat {};
-        DirtyValue<bool> heartbeatRunning {};
+        DirtyValue<bool> motionSensorOk {};
+        DirtyValue<uint32_t> stepCount {};
         DirtyValue<bool> notificationState {};
 
         lv_obj_t* timebar;
@@ -70,13 +70,14 @@ namespace Pinetime {
         lv_obj_t* heartbeatValue;
         lv_obj_t* heartbeatBpm;
         lv_obj_t* notificationIcon;
+        lv_obj_t* stepGauge;
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificatioManager;
         Controllers::Settings& settingsController;
-        Controllers::HeartRateController& heartRateController;
+        Controllers::MotionController& motionController;
       };
     }
   }
-- 
cgit v0.10.2


From 266573deff61b25e924738bc046c03edfeeb0ef8 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 20 Jun 2021 21:57:28 +0200
Subject: Enable 12/24h functionality


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index ab6e2a7..6f7ec3a 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -83,6 +83,12 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
+  timeAMPM = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
+  lv_label_set_text(timeAMPM, "");
+  lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
+
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
@@ -257,7 +263,25 @@ bool PineTimeStyle::Refresh() {
     sprintf(minutesChar, "%02d", static_cast<int>(minute));
 
     char hoursChar[3];
-    sprintf(hoursChar, "%02d", hour);
+    char ampmChar[5];
+
+      if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
+        sprintf(hoursChar, "%02d", hour);
+      } else {
+        if (hour == 0 && hour != 12) {
+          hour = 12;
+          sprintf(ampmChar, "A\nM");
+        } else if (hour == 12 && hour != 0) {
+          hour = 12;
+          sprintf(ampmChar, "P\nM");
+        } else if (hour < 12 && hour != 0) {
+          sprintf(ampmChar, "A\nM");
+        } else if (hour > 12 && hour != 0) {
+          hour = hour - 12;
+          sprintf(ampmChar, "P\nM");
+        }
+        sprintf(hoursChar, "%02d", hour);
+      }
 
     if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
         minutesChar[1] != displayedChar[3]) {
@@ -269,6 +293,10 @@ bool PineTimeStyle::Refresh() {
       char hourStr[3];
       char minStr[3];
 
+    if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
+        lv_label_set_text(timeAMPM, ampmChar);
+    }
+
       /* Display the time as 2 pairs of digits */
       sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
       lv_label_set_text(timeDD1, hourStr);
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 4530bb5f..7c99c6a 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -53,6 +53,7 @@ namespace Pinetime {
         lv_obj_t* sidebar;
         lv_obj_t* timeDD1;
         lv_obj_t* timeDD2;
+        lv_obj_t* timeAMPM;
         lv_obj_t* dateDayOfWeek;
         lv_obj_t* dateDay;
         lv_obj_t* dateMonth;
-- 
cgit v0.10.2


From be505fc15fef5d87c311a442f291dd1cbd86fd40 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Mon, 21 Jun 2021 20:06:47 +0200
Subject: Set step gauge outer to be white when step goal is reached


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 6f7ec3a..0dc4117 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -329,8 +329,12 @@ bool PineTimeStyle::Refresh() {
   stepCount = motionController.NbSteps();
   motionSensorOk = motionController.IsSensorOk();
   if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
-      lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / 100));
-      lv_obj_realign(stepGauge);
+    lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / 100));
+    lv_obj_realign(stepGauge);
+    if (stepCount.Get() > settingsController.GetStepsGoal()) {
+      lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+      lv_obj_set_style_local_scale_grad_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+    }
   }
 
   return running;
-- 
cgit v0.10.2


From c3f854ba65967631282a719743f68943f4c6c86f Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 22 Jun 2021 21:32:27 +0200
Subject: Add font source file


diff --git a/src/displayapp/fonts/open_sans_light.ttf b/src/displayapp/fonts/open_sans_light.ttf
new file mode 100644
index 0000000..0d38189
Binary files /dev/null and b/src/displayapp/fonts/open_sans_light.ttf differ
-- 
cgit v0.10.2


From 14721e8f1ef3fd8ebfe2bf870416c7f343f83936 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 23 Jun 2021 22:14:34 +0200
Subject: Move static needle_colors array to member variable


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 0dc4117..678099c 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -172,7 +172,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
 
   // Step count gauge
-  static lv_color_t needle_colors[1];
   needle_colors[0] = LV_COLOR_WHITE;
   stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
   lv_gauge_set_needle_count(stepGauge, 1, needle_colors);
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 7c99c6a..70794cc 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -72,6 +72,7 @@ namespace Pinetime {
         lv_obj_t* heartbeatBpm;
         lv_obj_t* notificationIcon;
         lv_obj_t* stepGauge;
+        lv_color_t needle_colors[1];
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
-- 
cgit v0.10.2


From 38ab0add487183c2f7e0a1e545de49a8ad7b17e1 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 24 Jun 2021 19:15:23 +0200
Subject: PineTimeStyle color picker initial commit


diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aca8654..caf015b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -420,6 +420,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
         displayapp/screens/settings/SettingSteps.cpp
+        displayapp/screens/settings/SettingPineTimeStyle.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 684e3a4..dd51fdb 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -30,7 +30,8 @@ namespace Pinetime {
       SettingTimeFormat,
       SettingDisplay,
       SettingWakeUp,
-      SettingSteps
+      SettingSteps,
+      SettingPineTimeStyle
     };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index de93428..48a012a 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -42,6 +42,7 @@
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
 #include "displayapp/screens/settings/SettingSteps.h"
+#include "displayapp/screens/settings/SettingPineTimeStyle.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Applications::Display;
@@ -323,6 +324,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
+    case Apps::SettingPineTimeStyle:
+      currentScreen = std::make_unique<Screens::SettingPineTimeStyle>(this, settingsController);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
new file mode 100644
index 0000000..3aceeb7
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -0,0 +1,302 @@
+#include "SettingPineTimeStyle.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t * obj, lv_event_t event) {
+    SettingPineTimeStyle* screen = static_cast<SettingPineTimeStyle *>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingPineTimeStyle::SettingPineTimeStyle(
+  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
+  Screen(app),
+  settingsController{settingsController}
+{
+
+  timebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(timebar, 200, 240);
+  lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
+
+  /* Display the time */
+
+  timeDD1 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD1, "12");
+  lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
+
+  timeDD2 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD2, "34");
+  lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
+
+  timeAMPM = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
+  lv_label_set_text(timeAMPM, "A\nM");
+  lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
+
+  /* Create a 40px wide bar down the right side of the screen */
+
+  sidebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(sidebar, 40, 240);
+  lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
+
+  /* Display icons */
+
+  batteryIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(batteryIcon, Symbols::batteryFull);
+  lv_obj_align(batteryIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
+
+  bleIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(bleIcon, Symbols::bluetooth);
+  lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
+
+  /* Calendar icon */
+
+  calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarOuter, 34, 34);
+  lv_obj_align(calendarOuter, sidebar, LV_ALIGN_CENTER, 0, 0);
+
+  calendarInner = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xffffff));
+  lv_obj_set_style_local_radius(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarInner, 27, 27);
+  lv_obj_align(calendarInner, calendarOuter, LV_ALIGN_CENTER, 0, 0);
+
+  calendarBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar1, 3, 12);
+  lv_obj_align(calendarBar1, calendarOuter, LV_ALIGN_IN_TOP_MID, -6, -3);
+
+  calendarBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar2, 3, 12);
+  lv_obj_align(calendarBar2, calendarOuter, LV_ALIGN_IN_TOP_MID, 6, -3);
+
+  calendarCrossBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar1, 8, 3);
+  lv_obj_align(calendarCrossBar1, calendarBar1, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  calendarCrossBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar2, 8, 3);
+  lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  /* Display date */
+
+  dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDayOfWeek, "THU");
+  lv_obj_align(dateDayOfWeek, sidebar, LV_ALIGN_CENTER, 0, -34);
+
+  dateDay = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDay, "25");
+  lv_obj_align(dateDay, sidebar, LV_ALIGN_CENTER, 0, 3);
+
+  dateMonth = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateMonth, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateMonth, "MAR");
+  lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
+
+  // Step count gauge
+  needle_colors[0] = LV_COLOR_WHITE;
+  stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
+  lv_gauge_set_needle_count(stepGauge, 1, needle_colors);
+  lv_obj_set_size(stepGauge, 40, 40);
+  lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_gauge_set_scale(stepGauge, 360, 11, 0);
+  lv_gauge_set_angle_offset(stepGauge, 180);
+  lv_gauge_set_critical_value(stepGauge, (100));
+  lv_gauge_set_range(stepGauge, 0, (100));
+  lv_gauge_set_value(stepGauge, 0, 0);
+
+  lv_obj_set_style_local_pad_right(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_left(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_bottom(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_scale_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  
+//   lv_style_copy(&style_button, &lv_style_plain_color);
+//   style_button.body.opa = LV_OPA_50;
+  btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextTime->user_data = this;
+  lv_obj_set_size(btnNextTime, 50, 50);
+  lv_obj_align(btnNextTime, lv_scr_act(), LV_ALIGN_CENTER, 55, -80);
+  lv_obj_set_style_local_value_str(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextTime, event_handler);
+
+  btnPrevTime = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevTime->user_data = this;
+  lv_obj_set_size(btnPrevTime, 50, 50);
+  lv_obj_align(btnPrevTime, lv_scr_act(), LV_ALIGN_CENTER, -55, -80);
+  lv_obj_set_style_local_value_str(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevTime, event_handler);
+
+  btnNextBar = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextBar->user_data = this;
+  lv_obj_set_size(btnNextBar, 50, 50);
+  lv_obj_align(btnNextBar, lv_scr_act(), LV_ALIGN_CENTER, 55, 0);
+  lv_obj_set_style_local_value_str(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextBar, event_handler);
+
+  btnPrevBar = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevBar->user_data = this;
+  lv_obj_set_size(btnPrevBar, 50, 50);
+  lv_obj_align(btnPrevBar, lv_scr_act(), LV_ALIGN_CENTER, -55, 0);
+  lv_obj_set_style_local_value_str(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevBar, event_handler);
+
+  btnNextBG = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextBG->user_data = this;
+  lv_obj_set_size(btnNextBG, 50, 50);
+  lv_obj_align(btnNextBG, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_style_local_value_str(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextBG, event_handler);
+
+  btnPrevBG = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevBG->user_data = this;
+  lv_obj_set_size(btnPrevBG, 50, 50);
+  lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevBG, event_handler);
+
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
+
+  
+/*
+    
+  stepValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+
+  btnPlus = lv_btn_create(lv_scr_act(), nullptr);
+  btnPlus->user_data = this;
+  lv_obj_set_size(btnPlus, 80, 50);
+  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnPlus, event_handler);
+
+  btnMinus = lv_btn_create(lv_scr_act(), nullptr);
+  btnMinus->user_data = this;
+  lv_obj_set_size(btnMinus, 80, 50);
+  lv_obj_set_event_cb(btnMinus, event_handler);
+  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+*/
+}
+
+SettingPineTimeStyle::~SettingPineTimeStyle() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+bool SettingPineTimeStyle::Refresh() {
+  return running;
+}
+
+void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+  uint8_t value = 0;
+  lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                             LV_COLOR_ORANGE};
+    
+  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
+    if ( value < 16 ) {
+      value += 1;
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
+    if ( value > 0 ) {
+      value -= 1;
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
+    if ( value < 16 ) {
+      value += 1;
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
+    if ( value > 0 ) {
+      value -= 1;
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
+    if ( value < 16 ) {
+      value += 1;
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);        
+    }
+  }
+
+  if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
+    if ( value > 0 ) {
+      value -= 1;
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+    
+    
+    
+/*    
+  uint32_t value = settingsController.GetStepsGoal();
+  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
+    value += 1000;
+    if ( value <= 500000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+
+  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
+    value -= 1000;
+    if ( value >= 1000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+*/
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
new file mode 100644
index 0000000..5b5e61b
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingPineTimeStyle : public Screen{
+        public:
+          SettingPineTimeStyle(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+          ~SettingPineTimeStyle() override;
+
+          bool Refresh() override;
+          void UpdateSelected(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::Settings& settingsController;
+
+          lv_obj_t * btnNextTime;
+          lv_obj_t * btnPrevTime;
+          lv_obj_t * btnNextBar;
+          lv_obj_t * btnPrevBar;
+          lv_obj_t * btnNextBG;
+          lv_obj_t * btnPrevBG;
+          lv_obj_t * timeColor;
+          lv_obj_t * barColor;
+          lv_obj_t * bgColor;
+          lv_obj_t * timebar;
+          lv_obj_t * sidebar;
+          lv_obj_t * timeDD1;
+          lv_obj_t * timeDD2;
+          lv_obj_t * timeAMPM;
+          lv_obj_t * dateDayOfWeek;
+          lv_obj_t * dateDay;
+          lv_obj_t * dateMonth;
+          lv_obj_t * backgroundLabel;
+          lv_obj_t * batteryIcon;
+          lv_obj_t * bleIcon;
+          lv_obj_t * calendarOuter;
+          lv_obj_t * calendarInner;
+          lv_obj_t * calendarBar1;
+          lv_obj_t * calendarBar2;
+          lv_obj_t * calendarCrossBar1;
+          lv_obj_t * calendarCrossBar2;
+          lv_obj_t * stepGauge;
+          lv_color_t needle_colors[1];
+          lv_color_t pts_colors[17];
+          
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index e63a358..7334780 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
               },
               [this]() -> std::unique_ptr<Screen> {
                 return CreateScreen2();
+              },
+              [this]() -> std::unique_ptr<Screen> {
+                return CreateScreen3();
               }},
              Screens::ScreenListModes::UpDown} {
 }
@@ -60,3 +63,15 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
 }
+
+std::unique_ptr<Screen> Settings::CreateScreen3() {
+
+  std::array<Screens::List::Applications, 4> applications {{
+    {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
+    {Symbols::none, "None", Apps::None},
+    {Symbols::none, "None", Apps::None},
+    {Symbols::none, "None", Apps::None},
+  }};
+
+  return std::make_unique<Screens::List>(2, 2, app, settingsController, applications);
+}
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index 711a6be..12dd051 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -21,10 +21,11 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
 
-        ScreenList<2> screens;
+        ScreenList<3> screens;
 
         std::unique_ptr<Screen> CreateScreen1();
         std::unique_ptr<Screen> CreateScreen2();
+        std::unique_ptr<Screen> CreateScreen3();
       };
     }
   }
-- 
cgit v0.10.2


From 7edfc534819ba7b9a14523d84df62952852a0fe3 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 24 Jun 2021 21:49:04 +0200
Subject: PineTimeStyle color picker add settings integration


diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 4409425..69e28e5 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -27,6 +27,33 @@ namespace Pinetime {
         return settings.clockFace;
       };
 
+      void SetPTSColorTime(uint8_t colorTime) {
+        if (colorTime != settings.PTSColorTime)
+          settingsChanged = true;
+        settings.PTSColorTime = colorTime;
+      };
+      uint8_t GetPTSColorTime() const {
+        return settings.PTSColorTime;
+      };
+
+      void SetPTSColorBar(uint8_t colorBar) {
+        if (colorBar != settings.PTSColorBar)
+          settingsChanged = true;
+        settings.PTSColorBar = colorBar;
+      };
+      uint8_t GetPTSColorBar() const {
+        return settings.PTSColorBar;
+      };
+
+      void SetPTSColorBG(uint8_t colorBG) {
+        if (colorBG != settings.PTSColorBG)
+          settingsChanged = true;
+        settings.PTSColorBG = colorBG;
+      };
+      uint8_t GetPTSColorBG() const {
+        return settings.PTSColorBG;
+      };
+
       void SetAppMenu(uint8_t menu) {
         appMenu = menu;
       };
@@ -103,6 +130,10 @@ namespace Pinetime {
 
         uint8_t clockFace = 0;
 
+        uint8_t PTSColorTime = 11;
+        uint8_t PTSColorBar = 11;
+        uint8_t PTSColorBG = 3;
+
         uint32_t stepsGoal = 10000;
         uint32_t screenTimeOut = 15000;
 
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 3aceeb7..3673e79 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -12,6 +12,12 @@ namespace {
   }
 }
 
+lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                             LV_COLOR_ORANGE};
+
 SettingPineTimeStyle::SettingPineTimeStyle(
   Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
   Screen(app),
@@ -19,7 +25,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 {
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -28,18 +34,18 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "A\nM");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -47,7 +53,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
@@ -142,6 +148,13 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
   
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
+
 //   lv_style_copy(&style_button, &lv_style_plain_color);
 //   style_button.body.opa = LV_OPA_50;
   btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
@@ -186,14 +199,6 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBG, event_handler);
 
-  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_click(backgroundLabel, true);
-  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
-  lv_obj_set_size(backgroundLabel, 240, 240);
-  lv_obj_set_pos(backgroundLabel, 0, 0);
-  lv_label_set_text(backgroundLabel, "");
-
-  
 /*
     
   stepValue = lv_label_create(lv_scr_act(), nullptr);
@@ -228,52 +233,55 @@ bool SettingPineTimeStyle::Refresh() {
 }
 
 void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
-  uint8_t value = 0;
-  lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
-                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
-                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
-                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
-                             LV_COLOR_ORANGE};
+  uint8_t valueTime = settingsController.GetPTSColorTime();
+  uint8_t valueBar = settingsController.GetPTSColorBar();
+  uint8_t valueBG = settingsController.GetPTSColorBG();
     
-  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
-    if ( value < 16 ) {
-      value += 1;
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
+    if ( valueTime < 17 ) {
+      valueTime += 1;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
-  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
-    if ( value > 0 ) {
-      value -= 1;
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
+    if ( valueTime > 0 ) {
+      valueTime -= 1;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
-  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
-    if ( value < 16 ) {
-      value += 1;
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
+    if ( valueBar < 17 ) {
+      valueBar += 1;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
-  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
-    if ( value > 0 ) {
-      value -= 1;
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
+    if ( valueBar > 0 ) {
+      valueBar -= 1;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
-    if ( value < 16 ) {
-      value += 1;
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);        
+    if ( valueBG < 17 ) {
+      valueBG += 1;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
 
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
-    if ( value > 0 ) {
-      value -= 1;
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    if ( valueBG > 0 ) {
+      valueBG -= 1;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
     
-- 
cgit v0.10.2


From 8f16574992b1bb0f49b884f95cf9b7f5d709c6b6 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 24 Jun 2021 21:51:23 +0200
Subject: PineTimeStyle color picker tidying


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 3673e79..dcdd670 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -30,7 +30,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
-  /* Display the time */
+  // Display the time
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
@@ -50,7 +50,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_label_set_text(timeAMPM, "A\nM");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
 
-  /* Create a 40px wide bar down the right side of the screen */
+  // Create a 40px wide bar down the right side of the screen
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
@@ -58,7 +58,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  /* Display icons */
+  // Display icons
 
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -70,7 +70,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_label_set_text(bleIcon, Symbols::bluetooth);
   lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
 
-  /* Calendar icon */
+  // Calendar icon
 
   calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -108,7 +108,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_size(calendarCrossBar2, 8, 3);
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  /* Display date */
+  // Display date
 
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -155,8 +155,6 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text(backgroundLabel, "");
 
-//   lv_style_copy(&style_button, &lv_style_plain_color);
-//   style_button.body.opa = LV_OPA_50;
   btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
   btnNextTime->user_data = this;
   lv_obj_set_size(btnNextTime, 50, 50);
@@ -198,29 +196,6 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
   lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBG, event_handler);
-
-/*
-    
-  stepValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
-  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-
-  btnPlus = lv_btn_create(lv_scr_act(), nullptr);
-  btnPlus->user_data = this;
-  lv_obj_set_size(btnPlus, 80, 50);
-  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
-  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
-  lv_obj_set_event_cb(btnPlus, event_handler);
-
-  btnMinus = lv_btn_create(lv_scr_act(), nullptr);
-  btnMinus->user_data = this;
-  lv_obj_set_size(btnMinus, 80, 50);
-  lv_obj_set_event_cb(btnMinus, event_handler);
-  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
-  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
-*/
 }
 
 SettingPineTimeStyle::~SettingPineTimeStyle() {
@@ -276,7 +251,6 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
-
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
     if ( valueBG > 0 ) {
       valueBG -= 1;
@@ -284,27 +258,4 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
-    
-    
-    
-/*    
-  uint32_t value = settingsController.GetStepsGoal();
-  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
-    value += 1000;
-    if ( value <= 500000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-
-  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
-    value -= 1000;
-    if ( value >= 1000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-*/
 }
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index 5b5e61b..b8ec9e9 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -19,7 +19,6 @@ namespace Pinetime {
           void UpdateSelected(lv_obj_t *object, lv_event_t event);
          
         private:          
-
           Controllers::Settings& settingsController;
 
           lv_obj_t * btnNextTime;
@@ -51,7 +50,6 @@ namespace Pinetime {
           lv_obj_t * stepGauge;
           lv_color_t needle_colors[1];
           lv_color_t pts_colors[17];
-          
       };
     }
   }
-- 
cgit v0.10.2


From 50b92e5dd6bd879b61e5038d3f064d486db864f6 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 14:47:56 +0200
Subject: Move array to member variable, retrieve colors from settings for
 display


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index dcdd670..bad0fec 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -12,20 +12,13 @@ namespace {
   }
 }
 
-lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
-                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
-                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
-                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
-                             LV_COLOR_ORANGE};
-
 SettingPineTimeStyle::SettingPineTimeStyle(
   Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
   Screen(app),
   settingsController{settingsController}
 {
-
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -34,18 +27,18 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "A\nM");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -53,7 +46,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   // Create a 40px wide bar down the right side of the screen
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index b8ec9e9..9b20f9f 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -49,7 +49,11 @@ namespace Pinetime {
           lv_obj_t * calendarCrossBar2;
           lv_obj_t * stepGauge;
           lv_color_t needle_colors[1];
-          lv_color_t pts_colors[17];
+          lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                                       LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                                       LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                                       LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                                       LV_COLOR_ORANGE};
       };
     }
   }
-- 
cgit v0.10.2


From 878dd1a7767bb4677ea629aef9d6fb98e2b2bc1a Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 14:58:45 +0200
Subject: Use colors from settings for PineTimeStyle watchface


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 678099c..c75931c 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -64,7 +64,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   /* Create a 200px wide background rectangle */
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -73,18 +73,18 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -92,7 +92,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 70794cc..97b39a0 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -73,6 +73,11 @@ namespace Pinetime {
         lv_obj_t* notificationIcon;
         lv_obj_t* stepGauge;
         lv_color_t needle_colors[1];
+        lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                                     LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                                     LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                                     LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                                     LV_COLOR_ORANGE};
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
-- 
cgit v0.10.2


From be22a9b1b8a3ca43cbf9e79d0a4f722d88d87ded Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 15:09:18 +0200
Subject: Fix off-by-one error, reduce step gauge needle width


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index c75931c..cbabca6 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -191,7 +191,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
-  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index bad0fec..876d2b4 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -138,7 +138,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
-  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
   
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
@@ -206,7 +206,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   uint8_t valueBG = settingsController.GetPTSColorBG();
     
   if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
-    if ( valueTime < 17 ) {
+    if ( valueTime < 16 ) {
       valueTime += 1;
       settingsController.SetPTSColorTime(valueTime);
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
@@ -224,7 +224,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     }
   }
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBar < 17 ) {
+    if ( valueBar < 16 ) {
       valueBar += 1;
       settingsController.SetPTSColorBar(valueBar);
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
@@ -238,7 +238,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     }
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBG < 17 ) {
+    if ( valueBG < 16 ) {
       valueBG += 1;
       settingsController.SetPTSColorBG(valueBG);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
-- 
cgit v0.10.2


From f3b40cb7a62c4927fb9fe921fdaa3b38809163f5 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 19:04:29 +0200
Subject: Make it loop around when you get to the end of the list of colors


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 876d2b4..5e1396a 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -212,6 +212,12 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    } else {
+      valueTime = 0;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
   if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
@@ -221,6 +227,12 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    }  else {
+      valueTime = 16;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
@@ -228,6 +240,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBar += 1;
       settingsController.SetPTSColorBar(valueBar);
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
+    } else {
+      valueBar = 0;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
   if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
@@ -235,6 +251,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBar -= 1;
       settingsController.SetPTSColorBar(valueBar);
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
+    } else {
+      valueBar = 16;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
@@ -242,6 +262,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBG += 1;
       settingsController.SetPTSColorBG(valueBG);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
+    } else {
+      valueBG = 0;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
@@ -249,6 +273,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBG -= 1;
       settingsController.SetPTSColorBG(valueBG);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
+    } else {
+      valueBG = 16;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
 }
\ No newline at end of file
-- 
cgit v0.10.2


From 800daecf9038dc495327da71aff5dcf3cee82e40 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 21:36:55 +0200
Subject: Add a check to set default colors if all colors are white


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index cbabca6..ad1d2db 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -207,6 +207,13 @@ PineTimeStyle::~PineTimeStyle() {
 }
 
 bool PineTimeStyle::Refresh() {
+  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
+  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
+      settingsController.SetPTSColorTime(11);
+      settingsController.SetPTSColorBar(11);
+      settingsController.SetPTSColorBG(3);
+  }
+
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
-- 
cgit v0.10.2


From 6889cf1ed86f72f85a208961956ef6dff5972210 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 21:55:51 +0200
Subject: Fix the fix, whoops


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index ad1d2db..76db86e 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -61,6 +61,13 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
+  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
+  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
+      settingsController.SetPTSColorTime(11);
+      settingsController.SetPTSColorBar(11);
+      settingsController.SetPTSColorBG(3);
+  }
+
   /* Create a 200px wide background rectangle */
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
@@ -207,13 +214,6 @@ PineTimeStyle::~PineTimeStyle() {
 }
 
 bool PineTimeStyle::Refresh() {
-  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
-  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
-      settingsController.SetPTSColorTime(11);
-      settingsController.SetPTSColorBar(11);
-      settingsController.SetPTSColorBG(3);
-  }
-
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
-- 
cgit v0.10.2


From 660a8597f6edc66deec94782817613e1a4f84a6d Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 27 Jun 2021 15:24:17 +0200
Subject: Add reset button, reduce button opacity


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 5e1396a..ae66546 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -150,45 +150,59 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 
   btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
   btnNextTime->user_data = this;
-  lv_obj_set_size(btnNextTime, 50, 50);
-  lv_obj_align(btnNextTime, lv_scr_act(), LV_ALIGN_CENTER, 55, -80);
+  lv_obj_set_size(btnNextTime, 60, 60);
+  lv_obj_align(btnNextTime, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, -80);
+  lv_obj_set_style_local_bg_opa(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
   lv_obj_set_event_cb(btnNextTime, event_handler);
 
   btnPrevTime = lv_btn_create(lv_scr_act(), nullptr);
   btnPrevTime->user_data = this;
-  lv_obj_set_size(btnPrevTime, 50, 50);
-  lv_obj_align(btnPrevTime, lv_scr_act(), LV_ALIGN_CENTER, -55, -80);
+  lv_obj_set_size(btnPrevTime, 60, 60);
+  lv_obj_align(btnPrevTime, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, -80);
+  lv_obj_set_style_local_bg_opa(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevTime, event_handler);
 
   btnNextBar = lv_btn_create(lv_scr_act(), nullptr);
   btnNextBar->user_data = this;
-  lv_obj_set_size(btnNextBar, 50, 50);
-  lv_obj_align(btnNextBar, lv_scr_act(), LV_ALIGN_CENTER, 55, 0);
+  lv_obj_set_size(btnNextBar, 60, 60);
+  lv_obj_align(btnNextBar, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 0);
+  lv_obj_set_style_local_bg_opa(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
   lv_obj_set_event_cb(btnNextBar, event_handler);
 
   btnPrevBar = lv_btn_create(lv_scr_act(), nullptr);
   btnPrevBar->user_data = this;
-  lv_obj_set_size(btnPrevBar, 50, 50);
-  lv_obj_align(btnPrevBar, lv_scr_act(), LV_ALIGN_CENTER, -55, 0);
+  lv_obj_set_size(btnPrevBar, 60, 60);
+  lv_obj_align(btnPrevBar, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 0);
+  lv_obj_set_style_local_bg_opa(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBar, event_handler);
 
   btnNextBG = lv_btn_create(lv_scr_act(), nullptr);
   btnNextBG->user_data = this;
-  lv_obj_set_size(btnNextBG, 50, 50);
-  lv_obj_align(btnNextBG, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_size(btnNextBG, 60, 60);
+  lv_obj_align(btnNextBG, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 80);
+  lv_obj_set_style_local_bg_opa(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
   lv_obj_set_event_cb(btnNextBG, event_handler);
 
   btnPrevBG = lv_btn_create(lv_scr_act(), nullptr);
   btnPrevBG->user_data = this;
-  lv_obj_set_size(btnPrevBG, 50, 50);
-  lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_size(btnPrevBG, 60, 60);
+  lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 80);
+  lv_obj_set_style_local_bg_opa(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBG, event_handler);
+
+  btnReset = lv_btn_create(lv_scr_act(), nullptr);
+  btnReset->user_data = this;
+  lv_obj_set_size(btnReset, 60, 60);
+  lv_obj_align(btnReset, lv_scr_act(), LV_ALIGN_CENTER, 0, 80);
+  lv_obj_set_style_local_bg_opa(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rst");
+  lv_obj_set_event_cb(btnReset, event_handler);
 }
 
 SettingPineTimeStyle::~SettingPineTimeStyle() {
@@ -279,4 +293,14 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
+  if((object == btnReset) && (event == LV_EVENT_PRESSED)) {
+      settingsController.SetPTSColorTime(11);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      settingsController.SetPTSColorBar(11);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      settingsController.SetPTSColorBG(3);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[3]);
+  }
 }
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index 9b20f9f..fe449b2 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -27,6 +27,7 @@ namespace Pinetime {
           lv_obj_t * btnPrevBar;
           lv_obj_t * btnNextBG;
           lv_obj_t * btnPrevBG;
+          lv_obj_t * btnReset;
           lv_obj_t * timeColor;
           lv_obj_t * barColor;
           lv_obj_t * bgColor;
-- 
cgit v0.10.2


From 9bd180896e16bf7451bf7063a646ce1d4b9e44f4 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 29 Jun 2021 21:12:39 +0200
Subject: Replace font file


diff --git a/src/displayapp/fonts/open_sans_light.ttf b/src/displayapp/fonts/open_sans_light.ttf
index 0d38189..6580d3a 100644
Binary files a/src/displayapp/fonts/open_sans_light.ttf and b/src/displayapp/fonts/open_sans_light.ttf differ
-- 
cgit v0.10.2


From 2edf41be8eea79461a1f9b45a16d13f150c7e5d5 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 29 Jun 2021 21:15:39 +0200
Subject: Fix bad merge


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 57c0f3b..76db86e 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -61,7 +61,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
-<<<<<<< HEAD
   //Feels like a hack, but if all the colors are white, this is probably not what the user wants
   if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
       settingsController.SetPTSColorTime(11);
@@ -73,12 +72,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
-=======
-  /* Create a 200px wide background rectangle */
-
-  timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
->>>>>>> upstream/develop
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -87,30 +80,18 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-<<<<<<< HEAD
   lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
-=======
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-<<<<<<< HEAD
   lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
-=======
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-<<<<<<< HEAD
   lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
-=======
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -118,11 +99,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-<<<<<<< HEAD
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
-=======
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
@@ -221,11 +198,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
-<<<<<<< HEAD
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
-=======
-  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
->>>>>>> upstream/develop
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
-- 
cgit v0.10.2


From f5639db8ed48a332eeeed48a359a3323b0537d39 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 6 Jul 2021 22:53:00 +0200
Subject: Change step gauge to use percentage of goal for progress


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 76db86e..b27bd9c 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -186,8 +186,8 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
   lv_gauge_set_scale(stepGauge, 360, 11, 0);
   lv_gauge_set_angle_offset(stepGauge, 180);
-  lv_gauge_set_critical_value(stepGauge, (settingsController.GetStepsGoal() / 100));
-  lv_gauge_set_range(stepGauge, 0, (settingsController.GetStepsGoal() / 100));
+  lv_gauge_set_critical_value(stepGauge, 100);
+  lv_gauge_set_range(stepGauge, 0, 100);
   lv_gauge_set_value(stepGauge, 0, 0);
 
   lv_obj_set_style_local_pad_right(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
@@ -335,7 +335,7 @@ bool PineTimeStyle::Refresh() {
   stepCount = motionController.NbSteps();
   motionSensorOk = motionController.IsSensorOk();
   if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
-    lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / 100));
+    lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / (settingsController.GetStepsGoal() / 100)));
     lv_obj_realign(stepGauge);
     if (stepCount.Get() > settingsController.GetStepsGoal()) {
       lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
-- 
cgit v0.10.2


From 7efe2b7c51e1d21305154edad6ddf1b608784451 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 12 Jul 2021 23:07:05 +0300
Subject: Fix misconfigured ADC and remove now unnecessary filtering


diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 76ad8cb..41b4c48 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -26,7 +26,6 @@ void Battery::Update() {
     return;
   }
   // Non blocking read
-  samples = 0;
   isReading = true;
   SaadcInit();
 
@@ -45,7 +44,7 @@ void Battery::SaadcInit() {
                                                  .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
                                                  .gain = NRF_SAADC_GAIN1_5,
                                                  .reference = NRF_SAADC_REFERENCE_INTERNAL,
-                                                 .acq_time = NRF_SAADC_ACQTIME_3US,
+                                                 .acq_time = NRF_SAADC_ACQTIME_40US,
                                                  .mode = NRF_SAADC_MODE_SINGLE_ENDED,
                                                  .burst = NRF_SAADC_BURST_ENABLED,
                                                  .pin_p = batteryVoltageAdcInput,
@@ -75,14 +74,7 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
     percentRemaining = std::max(percentRemaining, 0);
     percentRemaining = std::min(percentRemaining, 100);
 
-    percentRemainingBuffer.insert(percentRemaining);
-
-    samples++;
-    if (samples > percentRemainingSamples) {
-      nrfx_saadc_uninit();
-      isReading = false;
-    } else {
-      nrfx_saadc_sample();
-    }
+    nrfx_saadc_uninit();
+    isReading = false;
   }
 }
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 26e2493..84d488e 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -7,38 +7,6 @@
 namespace Pinetime {
   namespace Controllers {
 
-    /** A simple circular buffer that can be used to average
-     out the sensor values. The total capacity of the CircBuffer
-    is given as the template parameter N.
-    */
-    template <int N> class CircBuffer {
-    public:
-      CircBuffer() : arr {}, sz {}, cap {N}, head {} {
-      }
-      /**
-     insert member function overwrites the next data to the current
-    HEAD and moves the HEAD to the newly inserted value.
-    */
-      void insert(const int num) {
-        head %= cap;
-        arr[head++] = num;
-        if (sz != cap) {
-          sz++;
-        }
-      }
-
-      int GetAverage() const {
-        int sum = std::accumulate(arr.begin(), arr.end(), 0);
-        return (sum / sz);
-      }
-
-    private:
-      std::array<int, N> arr; /**< internal array used to store the values*/
-      uint8_t sz;             /**< The current size of the array.*/
-      uint8_t cap;            /**< Total capacity of the CircBuffer.*/
-      uint8_t head;           /**< The current head of the CircBuffer*/
-    };
-
     class Battery {
     public:
       Battery();
@@ -47,7 +15,7 @@ namespace Pinetime {
       void Update();
 
       int PercentRemaining() const {
-        return percentRemainingBuffer.GetAverage();
+        return percentRemaining;
       }
 
       uint16_t Voltage() const {
@@ -65,9 +33,6 @@ namespace Pinetime {
       static Battery* instance;
       nrf_saadc_value_t saadc_value;
 
-      static constexpr uint8_t percentRemainingSamples = 5;
-      CircBuffer<percentRemainingSamples> percentRemainingBuffer {};
-
       static constexpr uint32_t chargingPin = 12;
       static constexpr uint32_t powerPresentPin = 19;
       static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
@@ -83,7 +48,6 @@ namespace Pinetime {
       static void adcCallbackStatic(nrfx_saadc_evt_t const* event);
 
       bool isReading = false;
-      uint8_t samples = 0;
     };
   }
 }
-- 
cgit v0.10.2


From fe64176e7b8a0a7a9df733701d08762b60c2511f Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Thu, 15 Jul 2021 14:11:27 +0300
Subject: New touch handler, with issues


diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40e1f2a..cbc8cad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -495,6 +495,8 @@ list(APPEND SOURCE_FILES
         components/heartrate/Biquad.cpp
         components/heartrate/Ptagc.cpp
         components/heartrate/HeartRateController.cpp
+
+        touchhandler/TouchHandler.cpp
         )
 
 list(APPEND RECOVERY_SOURCE_FILES
@@ -552,6 +554,7 @@ list(APPEND RECOVERY_SOURCE_FILES
         components/heartrate/Ptagc.cpp
         components/motor/MotorController.cpp
         components/fs/FS.cpp
+        touchhandler/TouchHandler.cpp
         )
 
 list(APPEND RECOVERYLOADER_SOURCE_FILES
@@ -660,6 +663,7 @@ set(INCLUDE_FILES
         components/heartrate/Ptagc.h
         components/heartrate/HeartRateController.h
         components/motor/MotorController.h
+        touchhandler/TouchHandler.h
         )
 
 include_directories(
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 071af0c..ca7e390 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -66,7 +66,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        Controllers::Settings& settingsController,
                        Pinetime::Controllers::MotorController& motorController,
                        Pinetime::Controllers::MotionController& motionController,
-                       Pinetime::Controllers::TimerController& timerController)
+                       Pinetime::Controllers::TimerController& timerController,
+                       Pinetime::Controllers::TouchHandler& touchHandler)
   : lcd {lcd},
     lvgl {lvgl},
     touchPanel {touchPanel},
@@ -79,7 +80,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     settingsController {settingsController},
     motorController {motorController},
     motionController {motionController},
-    timerController {timerController} {
+    timerController {timerController},
+    touchHandler {touchHandler} {
 }
 
 void DisplayApp::Start() {
@@ -176,33 +178,6 @@ void DisplayApp::Refresh() {
           LoadApp(Apps::Timer, DisplayApp::FullRefreshDirections::Down);
         }
         break;
-      case Messages::TouchEvent: {
-        if (state != States::Running)
-          break;
-        auto gesture = OnTouchEvent();
-        if (!currentScreen->OnTouchEvent(gesture)) {
-          if (currentApp == Apps::Clock) {
-            switch (gesture) {
-              case TouchEvents::SwipeUp:
-                LoadApp(Apps::Launcher, DisplayApp::FullRefreshDirections::Up);
-                break;
-              case TouchEvents::SwipeDown:
-                LoadApp(Apps::Notifications, DisplayApp::FullRefreshDirections::Down);
-                break;
-              case TouchEvents::SwipeRight:
-                LoadApp(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
-                break;
-              case TouchEvents::DoubleTap:
-                PushMessageToSystemTask(System::Messages::GoToSleep);
-                break;
-              default:
-                break;
-            }
-          } else if (returnTouchEvent == gesture) {
-            LoadApp(returnToApp, returnDirection);
-          }
-        }
-      } break;
       case Messages::ButtonPushed:
         if (currentApp == Apps::Clock) {
           PushMessageToSystemTask(System::Messages::GoToSleep);
@@ -223,19 +198,42 @@ void DisplayApp::Refresh() {
     }
   }
 
-  if(nextApp != Apps::None) {
-    LoadApp(nextApp, nextDirection);
-    nextApp = Apps::None;
-  }
-
-  if (state != States::Idle && touchMode == TouchModes::Polling) {
-    auto info = touchPanel.GetTouchInfo();
-    if (info.action == 2) { // 2 = contact
-      if (!currentScreen->OnTouchEvent(info.x, info.y)) {
-        lvgl.SetNewTapEvent(info.x, info.y);
+  auto gesture = GetGesture();
+  if (gesture != TouchEvents::None) {
+    if (!currentScreen->OnTouchEvent(gesture)) {
+      if (currentApp == Apps::Clock) {
+        switch (gesture) {
+          case TouchEvents::SwipeUp:
+            LoadApp(Apps::Launcher, DisplayApp::FullRefreshDirections::Up);
+            break;
+          case TouchEvents::SwipeDown:
+            LoadApp(Apps::Notifications, DisplayApp::FullRefreshDirections::Down);
+            break;
+          case TouchEvents::SwipeRight:
+            LoadApp(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
+            break;
+          case TouchEvents::DoubleTap:
+            PushMessageToSystemTask(System::Messages::GoToSleep);
+            break;
+          default:
+            break;
+        }
+      } else if (returnTouchEvent == gesture) {
+        LoadApp(returnToApp, returnDirection);
       }
+    } else {
+      touchHandler.CancelTap();
     }
   }
+
+  if (touchMode == TouchModes::Polling) {
+    currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
+  }
+
+  if (nextApp != Apps::None) {
+    LoadApp(nextApp, nextDirection);
+    nextApp = Apps::None;
+  }
 }
 
 void DisplayApp::RunningState() {
@@ -257,6 +255,7 @@ void DisplayApp::ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction
 }
 
 void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) {
+  touchHandler.CancelTap();
   currentScreen.reset(nullptr);
   SetFullRefresh(direction);
 
@@ -395,31 +394,28 @@ void DisplayApp::PushMessage(Messages msg) {
   }
 }
 
-TouchEvents DisplayApp::OnTouchEvent() {
-  auto info = touchPanel.GetTouchInfo();
-  if (info.isTouch) {
-    switch (info.gesture) {
-      case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        if (touchMode == TouchModes::Gestures) {
-          lvgl.SetNewTapEvent(info.x, info.y);
-        }
-        return TouchEvents::Tap;
-      case Pinetime::Drivers::Cst816S::Gestures::LongPress:
-        return TouchEvents::LongTap;
-      case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
-        return TouchEvents::DoubleTap;
-      case Pinetime::Drivers::Cst816S::Gestures::SlideRight:
-        return TouchEvents::SwipeRight;
-      case Pinetime::Drivers::Cst816S::Gestures::SlideLeft:
-        return TouchEvents::SwipeLeft;
-      case Pinetime::Drivers::Cst816S::Gestures::SlideDown:
-        return TouchEvents::SwipeDown;
-      case Pinetime::Drivers::Cst816S::Gestures::SlideUp:
-        return TouchEvents::SwipeUp;
-      case Pinetime::Drivers::Cst816S::Gestures::None:
-      default:
-        return TouchEvents::None;
-    }
+TouchEvents DisplayApp::GetGesture() {
+  auto gesture = touchHandler.GestureGet();
+  switch (gesture) {
+    /*
+    case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
+      return TouchEvents::Tap;
+    */
+    case Pinetime::Drivers::Cst816S::Gestures::LongPress:
+      return TouchEvents::LongTap;
+    case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
+      return TouchEvents::DoubleTap;
+    case Pinetime::Drivers::Cst816S::Gestures::SlideRight:
+      return TouchEvents::SwipeRight;
+    case Pinetime::Drivers::Cst816S::Gestures::SlideLeft:
+      return TouchEvents::SwipeLeft;
+    case Pinetime::Drivers::Cst816S::Gestures::SlideDown:
+      return TouchEvents::SwipeDown;
+    case Pinetime::Drivers::Cst816S::Gestures::SlideUp:
+      return TouchEvents::SwipeUp;
+    case Pinetime::Drivers::Cst816S::Gestures::None:
+    default:
+      return TouchEvents::None;
   }
   return TouchEvents::None;
 }
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index f4573ab..74fc445 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -14,6 +14,7 @@
 #include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
 #include "components/timer/TimerController.h"
+#include "touchhandler/TouchHandler.h"
 #include "Messages.h"
 
 namespace Pinetime {
@@ -31,6 +32,7 @@ namespace Pinetime {
     class NotificationManager;
     class HeartRateController;
     class MotionController;
+    class TouchHandler;
   }
 
   namespace System {
@@ -55,7 +57,8 @@ namespace Pinetime {
                  Controllers::Settings& settingsController,
                  Pinetime::Controllers::MotorController& motorController,
                  Pinetime::Controllers::MotionController& motionController,
-                 Pinetime::Controllers::TimerController& timerController);
+                 Pinetime::Controllers::TimerController& timerController,
+                 Pinetime::Controllers::TouchHandler& touchHandler);
       void Start();
       void PushMessage(Display::Messages msg);
 
@@ -81,6 +84,7 @@ namespace Pinetime {
       Pinetime::Controllers::MotorController& motorController;
       Pinetime::Controllers::MotionController& motionController;
       Pinetime::Controllers::TimerController& timerController;
+      Pinetime::Controllers::TouchHandler& touchHandler;
 
       Pinetime::Controllers::FirmwareValidator validator;
       Controllers::BrightnessController brightnessController;
@@ -102,7 +106,7 @@ namespace Pinetime {
 
       TouchModes touchMode = TouchModes::Gestures;
 
-      TouchEvents OnTouchEvent();
+      TouchEvents GetGesture();
       void RunningState();
       void IdleState();
       static void Process(void* instance);
diff --git a/src/displayapp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
index c069afa..d0c6161 100644
--- a/src/displayapp/LittleVgl.cpp
+++ b/src/displayapp/LittleVgl.cpp
@@ -166,18 +166,17 @@ void LittleVgl::FlushDisplay(const lv_area_t* area, lv_color_t* color_p) {
   lv_disp_flush_ready(&disp_drv);
 }
 
-void LittleVgl::SetNewTapEvent(uint16_t x, uint16_t y) {
+void LittleVgl::SetNewTapEvent(uint16_t x, uint16_t y, bool contact) {
   tap_x = x;
   tap_y = y;
-  tapped = true;
+  tapped = contact;
 }
 
 bool LittleVgl::GetTouchPadInfo(lv_indev_data_t* ptr) {
+  ptr->point.x = tap_x;
+  ptr->point.y = tap_y;
   if (tapped) {
-    ptr->point.x = tap_x;
-    ptr->point.y = tap_y;
     ptr->state = LV_INDEV_STATE_PR;
-    tapped = false;
   } else {
     ptr->state = LV_INDEV_STATE_REL;
   }
diff --git a/src/displayapp/LittleVgl.h b/src/displayapp/LittleVgl.h
index 41f934a..8d1ed56 100644
--- a/src/displayapp/LittleVgl.h
+++ b/src/displayapp/LittleVgl.h
@@ -24,7 +24,7 @@ namespace Pinetime {
       void FlushDisplay(const lv_area_t* area, lv_color_t* color_p);
       bool GetTouchPadInfo(lv_indev_data_t* ptr);
       void SetFullRefresh(FullRefreshDirections direction);
-      void SetNewTapEvent(uint16_t x, uint16_t y);
+      void SetNewTapEvent(uint16_t x, uint16_t y, bool contact);
 
     private:
       void InitDisplay();
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index ce65f84..3b8bad2 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -8,7 +8,6 @@ namespace Pinetime {
         UpdateDateTime,
         UpdateBleConnection,
         UpdateBatteryLevel,
-        TouchEvent,
         ButtonPushed,
         NewNotification,
         TimerDone,
@@ -17,4 +16,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 1d05be8..5bacb4e 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -66,10 +66,10 @@ bool FirmwareValidation::Refresh() {
 }
 
 void FirmwareValidation::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
-  if (object == buttonValidate && event == LV_EVENT_PRESSED) {
+  if (object == buttonValidate && event == LV_EVENT_CLICKED) {
     validator.Validate();
     running = false;
-  } else if (object == buttonReset && event == LV_EVENT_PRESSED) {
+  } else if (object == buttonReset && event == LV_EVENT_CLICKED) {
     validator.Reset();
   }
 }
diff --git a/src/displayapp/screens/List.cpp b/src/displayapp/screens/List.cpp
index b4f4d2c..1f92634 100644
--- a/src/displayapp/screens/List.cpp
+++ b/src/displayapp/screens/List.cpp
@@ -108,7 +108,7 @@ bool List::Refresh() {
 }
 
 void List::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
-  if (event == LV_EVENT_RELEASED) {
+  if (event == LV_EVENT_CLICKED) {
     for (int i = 0; i < MAXLISTITEMS; i++) {
       if (apps[i] != Apps::None && object == itemApps[i]) {
         app->StartApp(apps[i], DisplayApp::FullRefreshDirections::Up);
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index 7bfbccb..15916b6 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -83,12 +83,9 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl
   lv_obj_set_height(playPause, 39);
   playPauseLabel = lv_label_create(playPause, nullptr);
   lv_label_set_text(playPauseLabel, Symbols::play);
-
-  app->SetTouchMode(DisplayApp::TouchModes::Polling);
 }
 
 Metronome::~Metronome() {
-  app->SetTouchMode(DisplayApp::TouchModes::Gestures);
   systemTask.PushMessage(System::Messages::EnableSleeping);
   lv_obj_clean(lv_scr_act());
 }
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index ea66bfb..50d6632 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -110,4 +110,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index f4db5d6..e3db629 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -161,7 +161,7 @@ bool StopWatch::Refresh() {
 }
 
 void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
-  if (event != LV_EVENT_PRESSED) {
+  if (event != LV_EVENT_CLICKED) {
     return;
   }
   if (currentState == States::Init) {
@@ -174,7 +174,7 @@ void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
 }
 
 void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
-  if (event != LV_EVENT_PRESSED) {
+  if (event != LV_EVENT_CLICKED) {
     return;
   }
   // If running, then this button is used to save laps
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index f5bf0cc..47a4918 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -210,7 +210,7 @@ bool SystemInfo::sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs) {
 }
 
 std::unique_ptr<Screen> SystemInfo::CreateScreen4() {
-  TaskStatus_t tasksStatus[7];
+  TaskStatus_t tasksStatus[10];
   lv_obj_t* infoTask = lv_table_create(lv_scr_act(), NULL);
   lv_table_set_col_cnt(infoTask, 3);
   lv_table_set_row_cnt(infoTask, 8);
@@ -223,9 +223,9 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen4() {
   lv_table_set_cell_value(infoTask, 0, 2, "Free");
   lv_table_set_col_width(infoTask, 2, 90);
 
-  auto nb = uxTaskGetSystemState(tasksStatus, 7, nullptr);
+  auto nb = uxTaskGetSystemState(tasksStatus, sizeof(tasksStatus) / sizeof(tasksStatus[0]), nullptr);
   std::sort(tasksStatus, tasksStatus + nb, sortById);
-  for (uint8_t i = 0; i < nb; i++) {
+  for (uint8_t i = 0; i < nb && i < 7; i++) {
 
     lv_table_set_cell_value(infoTask, i + 1, 0, std::to_string(tasksStatus[i].xTaskNumber).c_str());
     lv_table_set_cell_value(infoTask, i + 1, 1, tasksStatus[i].pcTaskName);
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 3eb127c..5a40e91 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -12,9 +12,7 @@ namespace {
 
   static void event_handler(lv_obj_t* obj, lv_event_t event) {
     Tile* screen = static_cast<Tile*>(obj->user_data);
-    uint32_t* eventDataPtr = (uint32_t*) lv_event_get_data();
-    uint32_t eventData = *eventDataPtr;
-    screen->OnObjectEvent(obj, event, eventData);
+    screen->OnObjectEvent(obj, event);
   }
 }
 
@@ -124,9 +122,9 @@ bool Tile::Refresh() {
   return running;
 }
 
-void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
+void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event) {
+  if (event == LV_EVENT_CLICKED) {
+    app->StartApp(apps[lv_btnmatrix_get_active_btn(obj)], DisplayApp::FullRefreshDirections::Up);
     running = false;
   }
 }
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index 4ebd81c..91ce9d0 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -32,7 +32,7 @@ namespace Pinetime {
 
         bool Refresh() override;
         void UpdateScreen();
-        void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
+        void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
 
       private:
         Pinetime::Controllers::Battery& batteryController;
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index acc2a27..2da5ca2 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -125,12 +125,12 @@ void QuickSettings::UpdateScreen() {
 }
 
 void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
-  if (object == btn2 && event == LV_EVENT_PRESSED) {
+  if (object == btn2 && event == LV_EVENT_CLICKED) {
 
     running = false;
     app->StartApp(Apps::FlashLight, DisplayApp::FullRefreshDirections::None);
 
-  } else if (object == btn1 && event == LV_EVENT_PRESSED) {
+  } else if (object == btn1 && event == LV_EVENT_CLICKED) {
 
     brightness.Step();
     lv_label_set_text_static(btn1_lvl, brightness.GetIcon());
@@ -147,7 +147,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
       lv_label_set_text_static(btn3_lvl, Symbols::notificationsOff);
     }
 
-  } else if (object == btn4 && event == LV_EVENT_PRESSED) {
+  } else if (object == btn4 && event == LV_EVENT_CLICKED) {
     running = false;
     settingsController.SetSettingsMenu(0);
     app->StartApp(Apps::Settings, DisplayApp::FullRefreshDirections::Up);
diff --git a/src/displayapp/screens/settings/SettingDisplay.cpp b/src/displayapp/screens/settings/SettingDisplay.cpp
index 4954185..aaf6a9f 100644
--- a/src/displayapp/screens/settings/SettingDisplay.cpp
+++ b/src/displayapp/screens/settings/SettingDisplay.cpp
@@ -85,7 +85,7 @@ bool SettingDisplay::Refresh() {
 }
 
 void SettingDisplay::UpdateSelected(lv_obj_t* object, lv_event_t event) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
+  if (event == LV_EVENT_CLICKED) {
     for (int i = 0; i < optionsTotal; i++) {
       if (object == cbOption[i]) {
         lv_checkbox_set_checked(cbOption[i], true);
@@ -110,4 +110,4 @@ void SettingDisplay::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index fd9792b..adb984e 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -40,6 +40,16 @@ void Cst816S::Init() {
   */
   static constexpr uint8_t motionMask = 0b00000101;
   twiMaster.Write(twiAddress, 0xEC, &motionMask, 1);
+
+  /*
+  [7] EnTest - Interrupt pin to test, enable automatic periodic issued after a low pulse.
+  [6] EnTouch - When a touch is detected, a periodic pulsed Low.
+  [5] EnChange - Upon detecting a touch state changes, pulsed Low.
+  [4] EnMotion - When the detected gesture is pulsed Low.
+  [0] OnceWLP - Press gesture only issue a pulse signal is low.
+  */
+  static constexpr uint8_t irqCtl = 0b01110000;
+  twiMaster.Write(twiAddress, 0xFA, &irqCtl, 1);
 }
 
 Cst816S::TouchInfos Cst816S::GetTouchInfo() {
@@ -90,4 +100,4 @@ void Cst816S::Sleep() {
 void Cst816S::Wakeup() {
   Init();
   NRF_LOG_INFO("[TOUCHPANEL] Wakeup");
-}
\ No newline at end of file
+}
diff --git a/src/main.cpp b/src/main.cpp
index ffbba5e..f427db4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -43,6 +43,7 @@
 #include "drivers/TwiMaster.h"
 #include "drivers/Cst816s.h"
 #include "systemtask/SystemTask.h"
+#include "touchhandler/TouchHandler.h"
 
 #if NRF_LOG_ENABLED
   #include "logging/NrfLogger.h"
@@ -118,6 +119,7 @@ Pinetime::Drivers::WatchdogView watchdogView(watchdog);
 Pinetime::Controllers::NotificationManager notificationManager;
 Pinetime::Controllers::MotionController motionController;
 Pinetime::Controllers::TimerController timerController;
+Pinetime::Controllers::TouchHandler touchHandler(touchPanel, lvgl);
 
 Pinetime::Controllers::FS fs {spiNorFlash};
 Pinetime::Controllers::Settings settingsController {fs};
@@ -136,7 +138,8 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
                                               settingsController,
                                               motorController,
                                               motionController,
-                                              timerController);
+                                              timerController,
+                                              touchHandler);
 
 Pinetime::System::SystemTask systemTask(spi,
                                         lcd,
@@ -162,7 +165,7 @@ Pinetime::System::SystemTask systemTask(spi,
 
 void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
   if (pin == pinTouchIrq) {
-    systemTask.OnTouchEvent();
+    touchHandler.WakeUp();
     return;
   }
 
@@ -309,6 +312,10 @@ int main(void) {
   lvgl.Init();
 
   systemTask.Start();
+
+  touchHandler.Register(&systemTask);
+  touchHandler.Start();
+
   nimble_port_init();
 
   vTaskStartScheduler();
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index d8b965b..f6aee78 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -397,7 +397,6 @@ void SystemTask::OnTouchEvent() {
     return;
   if (!isSleeping) {
     PushMessage(Messages::OnTouchEvent);
-    displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
   } else if (!isWakingUp) {
     if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap) or
         settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) {
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
new file mode 100644
index 0000000..a13d1af
--- /dev/null
+++ b/src/touchhandler/TouchHandler.cpp
@@ -0,0 +1,70 @@
+#include "TouchHandler.h"
+
+using namespace Pinetime::Controllers;
+
+TouchHandler::TouchHandler(Drivers::Cst816S& touchPanel, Components::LittleVgl& lvgl)
+  : touchPanel {touchPanel},
+    lvgl {lvgl} {
+}
+
+void TouchHandler::CancelTap() {
+  isCancelled = true;
+  lvgl.SetNewTapEvent(-1, -1, false);
+}
+
+Pinetime::Drivers::Cst816S::Gestures TouchHandler::GestureGet() {
+  auto returnGesture = gesture;
+  gesture = Drivers::Cst816S::Gestures::None;
+  return returnGesture;
+}
+
+void TouchHandler::Start() {
+  if (pdPASS != xTaskCreate(TouchHandler::Process, "Touch", 80, this, 0, &taskHandle)) {
+    APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
+  }
+}
+
+void TouchHandler::Process(void* instance) {
+  auto* app = static_cast<TouchHandler*>(instance);
+  app->Work();
+}
+
+void TouchHandler::Work() {
+  Pinetime::Drivers::Cst816S::TouchInfos info;
+  while (true) {
+    vTaskSuspend(taskHandle);
+    info = touchPanel.GetTouchInfo();
+    if (systemTask->IsSleeping()) {
+      systemTask->PushMessage(System::Messages::TouchWakeUp);
+    } else {
+      x = info.x;
+      y = info.y;
+      if (info.action == 0) {
+        lvgl.SetNewTapEvent(info.x, info.y, true);
+      } else if (info.action == 1) {
+        lvgl.SetNewTapEvent(info.x, info.y, false);
+        prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
+        isCancelled = false;
+      } else if (info.action == 2) {
+        if (!isCancelled) {
+          lvgl.SetNewTapEvent(info.x, info.y, true);
+        }
+        if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
+          if (prevGesture != info.gesture) {
+            prevGesture = info.gesture;
+            gesture = info.gesture;
+          }
+        }
+      }
+      systemTask->OnTouchEvent();
+    }
+  }
+}
+
+void TouchHandler::Register(Pinetime::System::SystemTask* systemTask) {
+  this->systemTask = systemTask;
+}
+
+void TouchHandler::WakeUp() {
+  vTaskResume(taskHandle);
+}
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
new file mode 100644
index 0000000..7999e00
--- /dev/null
+++ b/src/touchhandler/TouchHandler.h
@@ -0,0 +1,45 @@
+#pragma once
+#include "drivers/Cst816s.h"
+#include "systemtask/SystemTask.h"
+#include <FreeRTOS.h>
+#include <task.h>
+
+namespace Pinetime {
+  namespace Components {
+    class LittleVgl;
+  }
+  namespace Drivers {
+    class Cst816S;
+  }
+  namespace System {
+    class SystemTask;
+  }
+  namespace Controllers {
+    class TouchHandler {
+      public:
+        explicit TouchHandler(Drivers::Cst816S&, Components::LittleVgl&);
+        void CancelTap();
+        void Register(Pinetime::System::SystemTask* systemTask);
+        void Start();
+        void WakeUp();
+        uint8_t GetX() const {
+          return x;
+        }
+        uint8_t GetY() const {
+          return y;
+        }
+        Drivers::Cst816S::Gestures GestureGet();
+      private:
+        static void Process(void* instance);
+        void Work();
+        Pinetime::System::SystemTask* systemTask = nullptr;
+        TaskHandle_t taskHandle;
+        Pinetime::Drivers::Cst816S& touchPanel;
+        Pinetime::Components::LittleVgl& lvgl;
+        Pinetime::Drivers::Cst816S::Gestures gesture;
+        Pinetime::Drivers::Cst816S::Gestures prevGesture;
+        bool isCancelled = false;
+        uint8_t x, y;
+    };
+  }
+}
-- 
cgit v0.10.2


From 0d24d2b81e995d37bb7fb363df21a19b195107b8 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Thu, 15 Jul 2021 23:18:05 +0300
Subject: Quick fix


diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index adb984e..127fe1e 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -81,7 +81,7 @@ Cst816S::TouchInfos Cst816S::GetTouchInfo() {
 
   info.x = x;
   info.y = y;
-  info.action = action;
+  info.finger = nbTouchPoints;
   info.gesture = static_cast<Gestures>(touchData[gestureIndex]);
 
   return info;
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index a13d1af..90b4d6d 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -39,13 +39,11 @@ void TouchHandler::Work() {
     } else {
       x = info.x;
       y = info.y;
-      if (info.action == 0) {
-        lvgl.SetNewTapEvent(info.x, info.y, true);
-      } else if (info.action == 1) {
+      if (info.finger == 0) {
         lvgl.SetNewTapEvent(info.x, info.y, false);
         prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
         isCancelled = false;
-      } else if (info.action == 2) {
+      } else if (info.finger == 1) {
         if (!isCancelled) {
           lvgl.SetNewTapEvent(info.x, info.y, true);
         }
-- 
cgit v0.10.2


From 2a3e1263906d1145d6b539ff019362f0077d8097 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 16 Jul 2021 00:07:55 +0300
Subject: Fix most issues


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index ca7e390..945f182 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -226,9 +226,7 @@ void DisplayApp::Refresh() {
     }
   }
 
-  if (touchMode == TouchModes::Polling) {
-    currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
-  }
+  currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
 
   if (nextApp != Apps::None) {
     LoadApp(nextApp, nextDirection);
@@ -367,6 +365,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       break;
     case Apps::Metronome:
       currentScreen = std::make_unique<Screens::Metronome>(this, motorController, *systemTask);
+      ReturnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::None);
       break;
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
@@ -397,10 +396,8 @@ void DisplayApp::PushMessage(Messages msg) {
 TouchEvents DisplayApp::GetGesture() {
   auto gesture = touchHandler.GestureGet();
   switch (gesture) {
-    /*
     case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
       return TouchEvents::Tap;
-    */
     case Pinetime::Drivers::Cst816S::Gestures::LongPress:
       return TouchEvents::LongTap;
     case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
@@ -445,10 +442,6 @@ void DisplayApp::SetFullRefresh(DisplayApp::FullRefreshDirections direction) {
   }
 }
 
-void DisplayApp::SetTouchMode(DisplayApp::TouchModes mode) {
-  touchMode = mode;
-}
-
 void DisplayApp::PushMessageToSystemTask(Pinetime::System::Messages message) {
   if(systemTask != nullptr)
     systemTask->PushMessage(message);
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 74fc445..96951d1 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -43,7 +43,6 @@ namespace Pinetime {
     public:
       enum class States { Idle, Running };
       enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
-      enum class TouchModes { Gestures, Polling };
 
       DisplayApp(Drivers::St7789& lcd,
                  Components::LittleVgl& lvgl,
@@ -65,7 +64,6 @@ namespace Pinetime {
       void StartApp(Apps app, DisplayApp::FullRefreshDirections direction);
 
       void SetFullRefresh(FullRefreshDirections direction);
-      void SetTouchMode(TouchModes mode);
 
       void Register(Pinetime::System::SystemTask* systemTask);
 
@@ -104,8 +102,6 @@ namespace Pinetime {
       FullRefreshDirections returnDirection = FullRefreshDirections::None;
       TouchEvents returnTouchEvent = TouchEvents::None;
 
-      TouchModes touchMode = TouchModes::Gestures;
-
       TouchEvents GetGesture();
       void RunningState();
       void IdleState();
diff --git a/src/displayapp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
index d0c6161..b566971 100644
--- a/src/displayapp/LittleVgl.cpp
+++ b/src/displayapp/LittleVgl.cpp
@@ -166,7 +166,7 @@ void LittleVgl::FlushDisplay(const lv_area_t* area, lv_color_t* color_p) {
   lv_disp_flush_ready(&disp_drv);
 }
 
-void LittleVgl::SetNewTapEvent(uint16_t x, uint16_t y, bool contact) {
+void LittleVgl::SetNewTouchPoint(uint16_t x, uint16_t y, bool contact) {
   tap_x = x;
   tap_y = y;
   tapped = contact;
diff --git a/src/displayapp/LittleVgl.h b/src/displayapp/LittleVgl.h
index 8d1ed56..1f8a3d7 100644
--- a/src/displayapp/LittleVgl.h
+++ b/src/displayapp/LittleVgl.h
@@ -24,7 +24,7 @@ namespace Pinetime {
       void FlushDisplay(const lv_area_t* area, lv_color_t* color_p);
       bool GetTouchPadInfo(lv_indev_data_t* ptr);
       void SetFullRefresh(FullRefreshDirections direction);
-      void SetNewTapEvent(uint16_t x, uint16_t y, bool contact);
+      void SetNewTouchPoint(uint16_t x, uint16_t y, bool contact);
 
     private:
       void InitDisplay();
diff --git a/src/displayapp/screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index 3224008..58bfa55 100644
--- a/src/displayapp/screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
@@ -5,13 +5,10 @@
 using namespace Pinetime::Applications::Screens;
 
 InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app, Pinetime::Components::LittleVgl& lvgl) : Screen(app), lvgl {lvgl} {
-  app->SetTouchMode(DisplayApp::TouchModes::Polling);
   std::fill(b, b + bufferSize, selectColor);
 }
 
 InfiniPaint::~InfiniPaint() {
-  // Reset the touchmode
-  app->SetTouchMode(DisplayApp::TouchModes::Gestures);
   lv_obj_clean(lv_scr_act());
 }
 
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index 15916b6..3e3f478 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -91,7 +91,7 @@ Metronome::~Metronome() {
 }
 
 bool Metronome::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  return true;
+  return false;
 }
 
 bool Metronome::Refresh() {
diff --git a/src/displayapp/screens/Paddle.cpp b/src/displayapp/screens/Paddle.cpp
index 5a939ac..79e0c3d 100644
--- a/src/displayapp/screens/Paddle.cpp
+++ b/src/displayapp/screens/Paddle.cpp
@@ -5,8 +5,6 @@
 using namespace Pinetime::Applications::Screens;
 
 Paddle::Paddle(Pinetime::Applications::DisplayApp* app, Pinetime::Components::LittleVgl& lvgl) : Screen(app), lvgl {lvgl} {
-  app->SetTouchMode(DisplayApp::TouchModes::Polling);
-
   background = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_size(background, LV_HOR_RES + 1, LV_VER_RES);
   lv_obj_set_pos(background, -1, 0);
@@ -32,8 +30,6 @@ Paddle::Paddle(Pinetime::Applications::DisplayApp* app, Pinetime::Components::Li
 }
 
 Paddle::~Paddle() {
-  // Reset the touchmode
-  app->SetTouchMode(DisplayApp::TouchModes::Gestures);
   lv_obj_clean(lv_scr_act());
 }
 
diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index 8e49c9d..6567a20 100644
--- a/src/displayapp/screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
@@ -60,6 +60,7 @@ namespace Pinetime {
         }
 
         /** @return false if the event hasn't been handled by the app, true if it has been handled */
+        // Returning true will cancel lvgl tap
         virtual bool OnTouchEvent(TouchEvents event) {
           return false;
         }
diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index 127fe1e..b8f8e45 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -56,32 +56,24 @@ Cst816S::TouchInfos Cst816S::GetTouchInfo() {
   Cst816S::TouchInfos info;
 
   auto ret = twiMaster.Read(twiAddress, 0, touchData, sizeof(touchData));
-  if (ret != TwiMaster::ErrorCodes::NoError)
-    return {};
-
-  auto nbTouchPoints = touchData[2] & 0x0f;
-
-  uint8_t i = 0;
-
-  uint8_t pointId = (touchData[touchIdIndex + (touchStep * i)]) >> 4;
-  if (nbTouchPoints == 0 && pointId == lastTouchId)
+  if (ret != TwiMaster::ErrorCodes::NoError) {
+    info.isValid = false;
     return info;
+  }
 
-  info.isTouch = true;
+  auto nbTouchPoints = touchData[2] & 0x0f;
 
-  auto xHigh = touchData[touchXHighIndex + (touchStep * i)] & 0x0f;
-  auto xLow = touchData[touchXLowIndex + (touchStep * i)];
+  auto xHigh = touchData[touchXHighIndex] & 0x0f;
+  auto xLow = touchData[touchXLowIndex];
   uint16_t x = (xHigh << 8) | xLow;
 
-  auto yHigh = touchData[touchYHighIndex + (touchStep * i)] & 0x0f;
-  auto yLow = touchData[touchYLowIndex + (touchStep * i)];
+  auto yHigh = touchData[touchYHighIndex] & 0x0f;
+  auto yLow = touchData[touchYLowIndex];
   uint16_t y = (yHigh << 8) | yLow;
 
-  auto action = touchData[touchEventIndex + (touchStep * i)] >> 6; /* 0 = Down, 1 = Up, 2 = contact*/
-
   info.x = x;
   info.y = y;
-  info.finger = nbTouchPoints;
+  info.touching = (nbTouchPoints > 0);
   info.gesture = static_cast<Gestures>(touchData[gestureIndex]);
 
   return info;
diff --git a/src/drivers/Cst816s.h b/src/drivers/Cst816s.h
index 14c296e..26bdf4e 100644
--- a/src/drivers/Cst816s.h
+++ b/src/drivers/Cst816s.h
@@ -19,12 +19,9 @@ namespace Pinetime {
       struct TouchInfos {
         uint16_t x = 0;
         uint16_t y = 0;
-        uint8_t action = 0;
-        uint8_t finger = 0;
-        uint8_t pressure = 0;
-        uint8_t area = 0;
         Gestures gesture = Gestures::None;
-        bool isTouch = false;
+        bool touching = false;
+        bool isValid = false;
       };
 
       Cst816S(TwiMaster& twiMaster, uint8_t twiAddress);
@@ -41,23 +38,24 @@ namespace Pinetime {
     private:
       static constexpr uint8_t pinIrq = 28;
       static constexpr uint8_t pinReset = 10;
-      static constexpr uint8_t lastTouchId = 0x0f;
+
+      // Unused/Unavailable commented out
+      static constexpr uint8_t gestureIndex = 1;
       static constexpr uint8_t touchPointNumIndex = 2;
-      static constexpr uint8_t touchMiscIndex = 8;
-      static constexpr uint8_t touchXYIndex = 7;
-      static constexpr uint8_t touchEventIndex = 3;
+      //static constexpr uint8_t touchEventIndex = 3;
       static constexpr uint8_t touchXHighIndex = 3;
       static constexpr uint8_t touchXLowIndex = 4;
+      //static constexpr uint8_t touchIdIndex = 5;
       static constexpr uint8_t touchYHighIndex = 5;
       static constexpr uint8_t touchYLowIndex = 6;
-      static constexpr uint8_t touchIdIndex = 5;
-      static constexpr uint8_t touchStep = 6;
-      static constexpr uint8_t gestureIndex = 1;
+      //static constexpr uint8_t touchStep = 6;
+      //static constexpr uint8_t touchXYIndex = 7;
+      //static constexpr uint8_t touchMiscIndex = 8;
 
-      uint8_t touchData[10];
+      uint8_t touchData[7];
       TwiMaster& twiMaster;
       uint8_t twiAddress;
     };
 
   }
-}
\ No newline at end of file
+}
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index f6aee78..7277fc9 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -231,7 +231,7 @@ void SystemTask::Work() {
           twiMaster.Wakeup();
           auto touchInfo = touchPanel.GetTouchInfo();
           twiMaster.Sleep();
-          if (touchInfo.isTouch and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
+          if (touchInfo.isValid and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
                                       settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
                                      (touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
                                       settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index 90b4d6d..c6f8629 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -9,7 +9,7 @@ TouchHandler::TouchHandler(Drivers::Cst816S& touchPanel, Components::LittleVgl&
 
 void TouchHandler::CancelTap() {
   isCancelled = true;
-  lvgl.SetNewTapEvent(-1, -1, false);
+  lvgl.SetNewTouchPoint(-1, -1, true);
 }
 
 Pinetime::Drivers::Cst816S::Gestures TouchHandler::GestureGet() {
@@ -19,7 +19,7 @@ Pinetime::Drivers::Cst816S::Gestures TouchHandler::GestureGet() {
 }
 
 void TouchHandler::Start() {
-  if (pdPASS != xTaskCreate(TouchHandler::Process, "Touch", 80, this, 0, &taskHandle)) {
+  if (pdPASS != xTaskCreate(TouchHandler::Process, "Touch", 100, this, 0, &taskHandle)) {
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
   }
 }
@@ -39,13 +39,9 @@ void TouchHandler::Work() {
     } else {
       x = info.x;
       y = info.y;
-      if (info.finger == 0) {
-        lvgl.SetNewTapEvent(info.x, info.y, false);
-        prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
-        isCancelled = false;
-      } else if (info.finger == 1) {
+      if (info.touching) {
         if (!isCancelled) {
-          lvgl.SetNewTapEvent(info.x, info.y, true);
+          lvgl.SetNewTouchPoint(info.x, info.y, true);
         }
         if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
           if (prevGesture != info.gesture) {
@@ -53,6 +49,14 @@ void TouchHandler::Work() {
             gesture = info.gesture;
           }
         }
+      } else {
+        if (isCancelled) {
+          lvgl.SetNewTouchPoint(-1, -1, false);
+          isCancelled = false;
+        } else {
+          lvgl.SetNewTouchPoint(info.x, info.y, false);
+        }
+        prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
       }
       systemTask->OnTouchEvent();
     }
-- 
cgit v0.10.2


From 93ccbf38e81b30165e49e897c01cac2eb54cc331 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 16 Jul 2021 01:49:20 +0300
Subject: Fix touch wakeup and code cleanup


diff --git a/src/displayapp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
index b566971..2bd5e57 100644
--- a/src/displayapp/LittleVgl.cpp
+++ b/src/displayapp/LittleVgl.cpp
@@ -181,27 +181,6 @@ bool LittleVgl::GetTouchPadInfo(lv_indev_data_t* ptr) {
     ptr->state = LV_INDEV_STATE_REL;
   }
   return false;
-  /*
-  auto info = touchPanel.GetTouchInfo();
-
-  if((previousClick.x != info.x || previousClick.y != info.y) &&
-          (info.gesture == Drivers::Cst816S::Gestures::SingleTap)) {
-    // TODO For an unknown reason, the first touch is taken twice into account.
-    // 'firstTouch' is a quite'n'dirty workaound until I find a better solution
-    if(firstTouch) ptr->state = LV_INDEV_STATE_REL;
-    else ptr->state = LV_INDEV_STATE_PR;
-    firstTouch = false;
-    previousClick.x = info.x;
-    previousClick.y = info.y;
-  }
-  else {
-    ptr->state = LV_INDEV_STATE_REL;
-  }
-
-  ptr->point.x = info.x;
-  ptr->point.y = info.y;
-  return false;
-   */
 }
 
 void LittleVgl::InitTheme() {
diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index fc9edf8..456c3e6 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -12,9 +12,10 @@ TwiMaster::TwiMaster(const Modules module, const Parameters& params) : module {m
 }
 
 void TwiMaster::Init() {
+  sleeping = false;
   if(mutex == nullptr)
     mutex = xSemaphoreCreateBinary();
-  
+
   NRF_GPIO->PIN_CNF[params.pinScl] =
     ((uint32_t) GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) | ((uint32_t) GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
     ((uint32_t) GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | ((uint32_t) GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
@@ -176,11 +177,14 @@ void TwiMaster::Sleep() {
   nrf_gpio_cfg_default(6);
   nrf_gpio_cfg_default(7);
   NRF_LOG_INFO("[TWIMASTER] Sleep");
+  sleeping = true;
 }
 
 void TwiMaster::Wakeup() {
-  Init();
-  NRF_LOG_INFO("[TWIMASTER] Wakeup");
+  if (sleeping) {
+    Init();
+    NRF_LOG_INFO("[TWIMASTER] Wakeup");
+  }
 }
 
 /* Sometimes, the TWIM device just freeze and never set the event EVENTS_LASTTX.
@@ -206,4 +210,4 @@ void TwiMaster::FixHwFreezed() {
 
   // Re-enable I²C
   twiBaseAddress->ENABLE = twi_state;
-}
\ No newline at end of file
+}
diff --git a/src/drivers/TwiMaster.h b/src/drivers/TwiMaster.h
index 6175b99..5748ec6 100644
--- a/src/drivers/TwiMaster.h
+++ b/src/drivers/TwiMaster.h
@@ -39,6 +39,7 @@ namespace Pinetime {
       uint8_t internalBuffer[maxDataSize + registerSize];
       uint32_t txStartedCycleCount = 0;
       static constexpr uint32_t HwFreezedDelay {161000};
+      bool sleeping;
     };
   }
-}
\ No newline at end of file
+}
diff --git a/src/main.cpp b/src/main.cpp
index f427db4..b8d4b02 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -161,10 +161,12 @@ Pinetime::System::SystemTask systemTask(spi,
                                         heartRateController,
                                         displayApp,
                                         heartRateApp,
-                                        fs);
+                                        fs,
+                                        touchHandler);
 
 void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
   if (pin == pinTouchIrq) {
+    twiMaster.Wakeup();
     touchHandler.WakeUp();
     return;
   }
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 7277fc9..93d1986 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -60,7 +60,8 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
                        Pinetime::Controllers::HeartRateController& heartRateController,
                        Pinetime::Applications::DisplayApp& displayApp,
                        Pinetime::Applications::HeartRateTask& heartRateApp,
-                       Pinetime::Controllers::FS& fs)
+                       Pinetime::Controllers::FS& fs,
+                       Pinetime::Controllers::TouchHandler& touchHandler)
   : spi {spi},
     lcd {lcd},
     spiNorFlash {spiNorFlash},
@@ -72,18 +73,18 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
     dateTimeController {dateTimeController},
     timerController {timerController},
     watchdog {watchdog},
-    notificationManager{notificationManager},
+    notificationManager {notificationManager},
     motorController {motorController},
     heartRateSensor {heartRateSensor},
     motionSensor {motionSensor},
     settingsController {settingsController},
-    heartRateController{heartRateController},
-    motionController{motionController},
-    displayApp{displayApp},
+    heartRateController {heartRateController},
+    motionController {motionController},
+    displayApp {displayApp},
     heartRateApp(heartRateApp),
-    fs{fs},
+    fs {fs},
+    touchHandler {touchHandler},
     nimbleController(*this, bleController, dateTimeController, notificationManager, batteryController, spiNorFlash, heartRateController) {
-
 }
 
 void SystemTask::Start() {
@@ -105,11 +106,11 @@ void SystemTask::Work() {
   APP_GPIOTE_INIT(2);
 
   app_timer_init();
-  
+
   spi.Init();
   spiNorFlash.Init();
   spiNorFlash.Wakeup();
-  
+
   fs.Init();
 
   nimbleController.Init();
@@ -228,14 +229,14 @@ void SystemTask::Work() {
           isWakingUp = false;
           break;
         case Messages::TouchWakeUp: {
-          twiMaster.Wakeup();
-          auto touchInfo = touchPanel.GetTouchInfo();
-          twiMaster.Sleep();
-          if (touchInfo.isValid and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
-                                      settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
-                                     (touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
-                                      settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
+          auto gesture = touchHandler.GestureGet();
+          if ((gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap &&
+               settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) ||
+              (gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap &&
+               settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap))) {
             GoToRunning();
+          } else {
+            twiMaster.Sleep();
           }
         } break;
         case Messages::GoToSleep:
@@ -311,7 +312,7 @@ void SystemTask::Work() {
           break;
         case Messages::OnChargingEvent:
           motorController.SetDuration(15);
-	  // Battery level is updated on every message - there's no need to do anything
+          // Battery level is updated on every message - there's no need to do anything
           break;
 
         default:
@@ -410,14 +411,13 @@ void SystemTask::PushMessage(System::Messages msg) {
     isGoingToSleep = true;
   }
 
-  if(in_isr()) {
+  if (in_isr()) {
     BaseType_t xHigherPriorityTaskWoken;
     xHigherPriorityTaskWoken = pdFALSE;
     xQueueSendFromISR(systemTasksMsgQueue, &msg, &xHigherPriorityTaskWoken);
     if (xHigherPriorityTaskWoken) {
       /* Actual macro used here is port specific. */
       portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
-
     }
   } else {
     xQueueSend(systemTasksMsgQueue, &msg, portMAX_DELAY);
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index f8cf637..a7ee73a 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -17,6 +17,7 @@
 #include "components/motor/MotorController.h"
 #include "components/timer/TimerController.h"
 #include "components/fs/FS.h"
+#include "touchhandler/TouchHandler.h"
 
 #ifdef PINETIME_IS_RECOVERY
   #include "displayapp/DisplayAppRecovery.h"
@@ -24,7 +25,7 @@
 #else
   #include "components/settings/Settings.h"
   #include "displayapp/DisplayApp.h"
-  #include "displayapp/LittleVgl.h"  
+  #include "displayapp/LittleVgl.h"
 #endif
 
 #include "drivers/Watchdog.h"
@@ -39,6 +40,9 @@ namespace Pinetime {
     class TwiMaster;
     class Hrs3300;
   }
+  namespace Controllers {
+    class TouchHandler;
+  }
   namespace System {
     class SystemTask {
     public:
@@ -62,7 +66,8 @@ namespace Pinetime {
                  Pinetime::Controllers::HeartRateController& heartRateController,
                  Pinetime::Applications::DisplayApp& displayApp,
                  Pinetime::Applications::HeartRateTask& heartRateApp,
-                 Pinetime::Controllers::FS& fs);
+                 Pinetime::Controllers::FS& fs,
+                 Pinetime::Controllers::TouchHandler& touchHandler);
 
       void Start();
       void PushMessage(Messages msg);
@@ -91,7 +96,6 @@ namespace Pinetime {
       Pinetime::Components::LittleVgl& lvgl;
       Pinetime::Controllers::Battery& batteryController;
 
-
       Pinetime::Controllers::Ble& bleController;
       Pinetime::Controllers::DateTime& dateTimeController;
       Pinetime::Controllers::TimerController& timerController;
@@ -106,13 +110,14 @@ namespace Pinetime {
       Pinetime::Drivers::Bma421& motionSensor;
       Pinetime::Controllers::Settings& settingsController;
       Pinetime::Controllers::HeartRateController& heartRateController;
-            
+
       Controllers::BrightnessController brightnessController;
       Pinetime::Controllers::MotionController& motionController;
 
       Pinetime::Applications::DisplayApp& displayApp;
       Pinetime::Applications::HeartRateTask& heartRateApp;
       Pinetime::Controllers::FS& fs;
+      Pinetime::Controllers::TouchHandler& touchHandler;
       Pinetime::Controllers::NimbleController nimbleController;
 
       static constexpr uint8_t pinSpiSck = 2;
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index c6f8629..86dc29f 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -2,9 +2,7 @@
 
 using namespace Pinetime::Controllers;
 
-TouchHandler::TouchHandler(Drivers::Cst816S& touchPanel, Components::LittleVgl& lvgl)
-  : touchPanel {touchPanel},
-    lvgl {lvgl} {
+TouchHandler::TouchHandler(Drivers::Cst816S& touchPanel, Components::LittleVgl& lvgl) : touchPanel {touchPanel}, lvgl {lvgl} {
 }
 
 void TouchHandler::CancelTap() {
@@ -35,6 +33,7 @@ void TouchHandler::Work() {
     vTaskSuspend(taskHandle);
     info = touchPanel.GetTouchInfo();
     if (systemTask->IsSleeping()) {
+      gesture = info.gesture;
       systemTask->PushMessage(System::Messages::TouchWakeUp);
     } else {
       x = info.x;
-- 
cgit v0.10.2


From baffa1594f9c1a03a95f0cc10955e3cf8bf880ce Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 16 Jul 2021 02:17:17 +0300
Subject: Fix gestures


diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 2da5ca2..076bea8 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -154,17 +154,6 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
   }
 }
 
-bool QuickSettings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  switch (event) {
-    case Pinetime::Applications::TouchEvents::SwipeLeft:
-      running = false;
-      return false;
-
-    default:
-      return true;
-  }
-}
-
 bool QuickSettings::Refresh() {
   return running;
 }
diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
index a14f46b..e0fc0a8 100644
--- a/src/displayapp/screens/settings/QuickSettings.h
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -29,7 +29,6 @@ namespace Pinetime {
 
         bool Refresh() override;
 
-        bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
         void UpdateScreen();
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index 86dc29f..160b5e1 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -29,11 +29,23 @@ void TouchHandler::Process(void* instance) {
 
 void TouchHandler::Work() {
   Pinetime::Drivers::Cst816S::TouchInfos info;
+  Pinetime::Drivers::Cst816S::Gestures prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
   while (true) {
     vTaskSuspend(taskHandle);
+
     info = touchPanel.GetTouchInfo();
+
+    if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
+      if (prevGesture != info.gesture) {
+        if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown || info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
+            info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp || info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
+          prevGesture = info.gesture;
+        }
+        gesture = info.gesture;
+      }
+    }
+
     if (systemTask->IsSleeping()) {
-      gesture = info.gesture;
       systemTask->PushMessage(System::Messages::TouchWakeUp);
     } else {
       x = info.x;
@@ -42,12 +54,6 @@ void TouchHandler::Work() {
         if (!isCancelled) {
           lvgl.SetNewTouchPoint(info.x, info.y, true);
         }
-        if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
-          if (prevGesture != info.gesture) {
-            prevGesture = info.gesture;
-            gesture = info.gesture;
-          }
-        }
       } else {
         if (isCancelled) {
           lvgl.SetNewTouchPoint(-1, -1, false);
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index 7999e00..37ef5af 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -37,7 +37,6 @@ namespace Pinetime {
         Pinetime::Drivers::Cst816S& touchPanel;
         Pinetime::Components::LittleVgl& lvgl;
         Pinetime::Drivers::Cst816S::Gestures gesture;
-        Pinetime::Drivers::Cst816S::Gestures prevGesture;
         bool isCancelled = false;
         uint8_t x, y;
     };
-- 
cgit v0.10.2


From 329482f87308c185e970b141bcbfe9c83b46c4da Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 16 Jul 2021 11:55:29 +0300
Subject: Fix remaining known issues


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 945f182..1ff8d51 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -226,7 +226,9 @@ void DisplayApp::Refresh() {
     }
   }
 
-  currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
+  if (touchHandler.IsTouching()) {
+    currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
+  }
 
   if (nextApp != Apps::None) {
     LoadApp(nextApp, nextDirection);
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 5a40e91..8eb5eb0 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -91,6 +91,7 @@ Tile::Tile(uint8_t screenID,
   lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, lv_color_hex(0x111111));
 
   for (uint8_t i = 0; i < 6; i++) {
+    lv_btnmatrix_set_btn_ctrl(btnm1, i, LV_BTNMATRIX_CTRL_CLICK_TRIG);
     if (applications[i].application == Apps::None) {
       lv_btnmatrix_set_btn_ctrl(btnm1, i, LV_BTNMATRIX_CTRL_DISABLED);
     }
@@ -123,7 +124,7 @@ bool Tile::Refresh() {
 }
 
 void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event) {
-  if (event == LV_EVENT_CLICKED) {
+  if (event == LV_EVENT_VALUE_CHANGED) {
     app->StartApp(apps[lv_btnmatrix_get_active_btn(obj)], DisplayApp::FullRefreshDirections::Up);
     running = false;
   }
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index 160b5e1..0d0b827 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -6,8 +6,10 @@ TouchHandler::TouchHandler(Drivers::Cst816S& touchPanel, Components::LittleVgl&
 }
 
 void TouchHandler::CancelTap() {
-  isCancelled = true;
-  lvgl.SetNewTouchPoint(-1, -1, true);
+  if (info.touching) {
+    isCancelled = true;
+    lvgl.SetNewTouchPoint(-1, -1, true);
+  }
 }
 
 Pinetime::Drivers::Cst816S::Gestures TouchHandler::GestureGet() {
@@ -28,7 +30,6 @@ void TouchHandler::Process(void* instance) {
 }
 
 void TouchHandler::Work() {
-  Pinetime::Drivers::Cst816S::TouchInfos info;
   Pinetime::Drivers::Cst816S::Gestures prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
   while (true) {
     vTaskSuspend(taskHandle);
@@ -48,8 +49,6 @@ void TouchHandler::Work() {
     if (systemTask->IsSleeping()) {
       systemTask->PushMessage(System::Messages::TouchWakeUp);
     } else {
-      x = info.x;
-      y = info.y;
       if (info.touching) {
         if (!isCancelled) {
           lvgl.SetNewTouchPoint(info.x, info.y, true);
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index 37ef5af..6b8189f 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -22,23 +22,28 @@ namespace Pinetime {
         void Register(Pinetime::System::SystemTask* systemTask);
         void Start();
         void WakeUp();
+
+        bool IsTouching() const {
+          return info.touching;
+        }
         uint8_t GetX() const {
-          return x;
+          return info.x;
         }
         uint8_t GetY() const {
-          return y;
+          return info.y;
         }
         Drivers::Cst816S::Gestures GestureGet();
       private:
         static void Process(void* instance);
         void Work();
+
+        Pinetime::Drivers::Cst816S::TouchInfos info;
         Pinetime::System::SystemTask* systemTask = nullptr;
         TaskHandle_t taskHandle;
         Pinetime::Drivers::Cst816S& touchPanel;
         Pinetime::Components::LittleVgl& lvgl;
         Pinetime::Drivers::Cst816S::Gestures gesture;
         bool isCancelled = false;
-        uint8_t x, y;
     };
   }
 }
-- 
cgit v0.10.2


From 3e42297bd86fa20daaf7f59f6bc0a69de6cf9e53 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 18 Jul 2021 12:32:46 +0300
Subject: Update


diff --git a/src/drivers/Cst816s.h b/src/drivers/Cst816s.h
index 26bdf4e..d4c17bb 100644
--- a/src/drivers/Cst816s.h
+++ b/src/drivers/Cst816s.h
@@ -21,7 +21,7 @@ namespace Pinetime {
         uint16_t y = 0;
         Gestures gesture = Gestures::None;
         bool touching = false;
-        bool isValid = false;
+        bool isValid = true;
       };
 
       Cst816S(TwiMaster& twiMaster, uint8_t twiAddress);
diff --git a/src/main.cpp b/src/main.cpp
index b8d4b02..62e4446 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -315,9 +315,6 @@ int main(void) {
 
   systemTask.Start();
 
-  touchHandler.Register(&systemTask);
-  touchHandler.Start();
-
   nimble_port_init();
 
   vTaskStartScheduler();
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 93d1986..252d3cc 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -144,6 +144,9 @@ void SystemTask::Work() {
   heartRateSensor.Disable();
   heartRateApp.Start();
 
+  touchHandler.Register(this);
+  touchHandler.Start();
+
   nrf_gpio_cfg_sense_input(pinButton, (nrf_gpio_pin_pull_t) GPIO_PIN_CNF_PULL_Pulldown, (nrf_gpio_pin_sense_t) GPIO_PIN_CNF_SENSE_High);
   nrf_gpio_cfg_output(15);
   nrf_gpio_pin_set(15);
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index 0d0b827..187aa69 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -30,37 +30,39 @@ void TouchHandler::Process(void* instance) {
 }
 
 void TouchHandler::Work() {
-  Pinetime::Drivers::Cst816S::Gestures prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
+  bool slideReleased = true;
   while (true) {
     vTaskSuspend(taskHandle);
 
     info = touchPanel.GetTouchInfo();
 
-    if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
-      if (prevGesture != info.gesture) {
-        if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown || info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
-            info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp || info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
-          prevGesture = info.gesture;
+    if (info.isValid) {
+      if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
+        if (slideReleased) {
+          if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown ||
+              info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
+              info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp ||
+              info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
+            slideReleased = false;
+          }
+          gesture = info.gesture;
         }
-        gesture = info.gesture;
       }
-    }
 
-    if (systemTask->IsSleeping()) {
-      systemTask->PushMessage(System::Messages::TouchWakeUp);
-    } else {
-      if (info.touching) {
-        if (!isCancelled) {
-          lvgl.SetNewTouchPoint(info.x, info.y, true);
-        }
-      } else {
-        if (isCancelled) {
-          lvgl.SetNewTouchPoint(-1, -1, false);
-          isCancelled = false;
+      if (!systemTask->IsSleeping()) {
+        if (info.touching) {
+          if (!isCancelled) {
+            lvgl.SetNewTouchPoint(info.x, info.y, true);
+          }
         } else {
-          lvgl.SetNewTouchPoint(info.x, info.y, false);
+          if (isCancelled) {
+            lvgl.SetNewTouchPoint(-1, -1, false);
+            isCancelled = false;
+          } else {
+            lvgl.SetNewTouchPoint(info.x, info.y, false);
+          }
+          slideReleased = true;
         }
-        prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
       }
       systemTask->OnTouchEvent();
     }
-- 
cgit v0.10.2


From dc2b5f0c6b387f674915d0dbe817b7ac2a821e07 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 19 Jul 2021 10:21:42 +0300
Subject: Restore Tile.cpp changes


diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 8eb5eb0..853fa7e 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -12,7 +12,9 @@ namespace {
 
   static void event_handler(lv_obj_t* obj, lv_event_t event) {
     Tile* screen = static_cast<Tile*>(obj->user_data);
-    screen->OnObjectEvent(obj, event);
+    uint32_t* eventDataPtr = (uint32_t*) lv_event_get_data();
+    uint32_t eventData = *eventDataPtr;
+    screen->OnObjectEvent(obj, event, eventData);
   }
 }
 
@@ -123,9 +125,9 @@ bool Tile::Refresh() {
   return running;
 }
 
-void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event) {
+void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId) {
   if (event == LV_EVENT_VALUE_CHANGED) {
-    app->StartApp(apps[lv_btnmatrix_get_active_btn(obj)], DisplayApp::FullRefreshDirections::Up);
+    app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
     running = false;
   }
 }
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index 91ce9d0..4ebd81c 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -32,7 +32,7 @@ namespace Pinetime {
 
         bool Refresh() override;
         void UpdateScreen();
-        void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
+        void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
 
       private:
         Pinetime::Controllers::Battery& batteryController;
-- 
cgit v0.10.2


From 97c761a5c74994ea1d9bef9c14e6e24afb9b4be2 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 19 Jul 2021 16:26:12 +0300
Subject: Refresh rework


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 071af0c..450833f 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -239,7 +239,7 @@ void DisplayApp::Refresh() {
 }
 
 void DisplayApp::RunningState() {
-  if (!currentScreen->Refresh()) {
+  if (!currentScreen->IsRunning()) {
     LoadApp(returnToApp, returnDirection);
   }
   lv_task_handler();
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 78c7cd9..67b67a5 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -34,12 +34,6 @@ ApplicationList::~ApplicationList() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool ApplicationList::Refresh() {
-  if (running)
-    running = screens.Refresh();
-  return running;
-}
-
 bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }
diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index 88534ec..103c38a 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -18,7 +18,6 @@ namespace Pinetime {
                                  Pinetime::Controllers::Battery& batteryController,
                                  Controllers::DateTime& dateTimeController);
         ~ApplicationList() override;
-        bool Refresh() override;
         bool OnTouchEvent(TouchEvents event) override;
 
       private:
@@ -33,4 +32,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/BatteryInfo.cpp b/src/displayapp/screens/BatteryInfo.cpp
index 0ab47eb..91c2651 100644
--- a/src/displayapp/screens/BatteryInfo.cpp
+++ b/src/displayapp/screens/BatteryInfo.cpp
@@ -4,11 +4,6 @@
 
 using namespace Pinetime::Applications::Screens;
 
-static void lv_update_task(struct _lv_task_t* task) {
-  auto user_data = static_cast<BatteryInfo*>(task->user_data);
-  user_data->UpdateScreen();
-}
-
 BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Battery& batteryController)
   : Screen(app), batteryController {batteryController} {
 
@@ -49,16 +44,16 @@ BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Cont
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text_static(backgroundLabel, "");
 
-  taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_LOW, this);
-  UpdateScreen();
+  taskRefresh = lv_task_create(RefreshTaskCallback, 5000, LV_TASK_PRIO_MID, this);
+  Refresh();
 }
 
 BatteryInfo::~BatteryInfo() {
-  lv_task_del(taskUpdate);
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-void BatteryInfo::UpdateScreen() {
+void BatteryInfo::Refresh() {
 
   batteryController.Update();
 
@@ -85,7 +80,3 @@ void BatteryInfo::UpdateScreen() {
   lv_label_set_text_fmt(voltage, "%1i.%02i volts", batteryVoltage / 1000, batteryVoltage % 1000 / 10);
   lv_bar_set_value(charging_bar, batteryPercent, LV_ANIM_ON);
 }
-
-bool BatteryInfo::Refresh() {
-  return running;
-}
diff --git a/src/displayapp/screens/BatteryInfo.h b/src/displayapp/screens/BatteryInfo.h
index 6979324..63454a2 100644
--- a/src/displayapp/screens/BatteryInfo.h
+++ b/src/displayapp/screens/BatteryInfo.h
@@ -19,9 +19,7 @@ namespace Pinetime {
         BatteryInfo(DisplayApp* app, Pinetime::Controllers::Battery& batteryController);
         ~BatteryInfo() override;
 
-        bool Refresh() override;
-
-        void UpdateScreen();
+        void Refresh() override;
 
       private:
         Pinetime::Controllers::Battery& batteryController;
@@ -31,7 +29,7 @@ namespace Pinetime {
         lv_obj_t* charging_bar;
         lv_obj_t* status;
 
-        lv_task_t* taskUpdate;
+        lv_task_t* taskRefresh;
 
         uint8_t batteryPercent = 0;
         uint16_t batteryVoltage = 0;
diff --git a/src/displayapp/screens/Brightness.cpp b/src/displayapp/screens/Brightness.cpp
index 47c1056..1278cd6 100644
--- a/src/displayapp/screens/Brightness.cpp
+++ b/src/displayapp/screens/Brightness.cpp
@@ -30,10 +30,6 @@ Brightness::~Brightness() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Brightness::Refresh() {
-  return running;
-}
-
 const char* Brightness::LevelToString(Pinetime::Controllers::BrightnessController::Levels level) {
   switch (level) {
     case Pinetime::Controllers::BrightnessController::Levels::Off:
diff --git a/src/displayapp/screens/Brightness.h b/src/displayapp/screens/Brightness.h
index 9ee3375..14e4859 100644
--- a/src/displayapp/screens/Brightness.h
+++ b/src/displayapp/screens/Brightness.h
@@ -12,7 +12,6 @@ namespace Pinetime {
       public:
         Brightness(DisplayApp* app, Controllers::BrightnessController& brightness);
         ~Brightness() override;
-        bool Refresh() override;
 
         bool OnTouchEvent(TouchEvents event) override;
 
@@ -31,4 +30,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index e068497..e3af5e4 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -55,11 +55,6 @@ Clock::~Clock() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Clock::Refresh() {
-  screen->Refresh();
-  return running;
-}
-
 bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screen->OnTouchEvent(event);
 }
@@ -101,4 +96,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
\ No newline at end of file
+*/
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index a48feea..500672a 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -34,8 +34,6 @@ namespace Pinetime {
               Controllers::MotionController& motionController);
         ~Clock() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(TouchEvents event) override;
 
       private:
diff --git a/src/displayapp/screens/FirmwareUpdate.cpp b/src/displayapp/screens/FirmwareUpdate.cpp
index 4086b15..11ac7bc 100644
--- a/src/displayapp/screens/FirmwareUpdate.cpp
+++ b/src/displayapp/screens/FirmwareUpdate.cpp
@@ -30,36 +30,40 @@ FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp* app, Pinetime
   lv_label_set_text(percentLabel, "");
   lv_obj_set_auto_realign(percentLabel, true);
   lv_obj_align(percentLabel, bar1, LV_ALIGN_OUT_TOP_MID, 0, 60);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 FirmwareUpdate::~FirmwareUpdate() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool FirmwareUpdate::Refresh() {
+void FirmwareUpdate::Refresh() {
   switch (bleController.State()) {
     default:
     case Pinetime::Controllers::Ble::FirmwareUpdateStates::Idle:
     case Pinetime::Controllers::Ble::FirmwareUpdateStates::Running:
       if (state != States::Running)
         state = States::Running;
-      return DisplayProgression();
+      DisplayProgression();
+      return;
     case Pinetime::Controllers::Ble::FirmwareUpdateStates::Validated:
       if (state != States::Validated) {
         UpdateValidated();
         state = States::Validated;
       }
-      return running;
+      return;
     case Pinetime::Controllers::Ble::FirmwareUpdateStates::Error:
       if (state != States::Error) {
         UpdateError();
         state = States::Error;
       }
-      return running;
+      return;
   }
 }
 
-bool FirmwareUpdate::DisplayProgression() const {
+void FirmwareUpdate::DisplayProgression() const {
   float current = bleController.FirmwareUpdateCurrentBytes() / 1024.0f;
   float total = bleController.FirmwareUpdateTotalBytes() / 1024.0f;
   int16_t pc = (current / total) * 100.0f;
@@ -67,7 +71,6 @@ bool FirmwareUpdate::DisplayProgression() const {
   lv_label_set_text(percentLabel, percentStr);
 
   lv_bar_set_value(bar1, pc, LV_ANIM_OFF);
-  return running;
 }
 
 void FirmwareUpdate::UpdateValidated() {
diff --git a/src/displayapp/screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h
index f4d34df..12cd4ae 100644
--- a/src/displayapp/screens/FirmwareUpdate.h
+++ b/src/displayapp/screens/FirmwareUpdate.h
@@ -15,7 +15,7 @@ namespace Pinetime {
         FirmwareUpdate(DisplayApp* app, Pinetime::Controllers::Ble& bleController);
         ~FirmwareUpdate() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         enum class States { Idle, Running, Validated, Error };
@@ -27,11 +27,13 @@ namespace Pinetime {
 
         States state;
 
-        bool DisplayProgression() const;
+        void DisplayProgression() const;
 
         void UpdateValidated();
 
         void UpdateError();
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 1d05be8..7ad45fa 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -61,10 +61,6 @@ FirmwareValidation::~FirmwareValidation() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool FirmwareValidation::Refresh() {
-  return running;
-}
-
 void FirmwareValidation::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
   if (object == buttonValidate && event == LV_EVENT_PRESSED) {
     validator.Validate();
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 1ef5ba0..bfdb096 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -16,8 +16,6 @@ namespace Pinetime {
         FirmwareValidation(DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator);
         ~FirmwareValidation() override;
 
-        bool Refresh() override;
-
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
       private:
diff --git a/src/displayapp/screens/FlashLight.cpp b/src/displayapp/screens/FlashLight.cpp
index 7db2c6c..eebb776 100644
--- a/src/displayapp/screens/FlashLight.cpp
+++ b/src/displayapp/screens/FlashLight.cpp
@@ -65,10 +65,6 @@ void FlashLight::OnClickEvent(lv_obj_t* obj, lv_event_t event) {
   }
 }
 
-bool FlashLight::Refresh() {
-  return running;
-}
-
 bool FlashLight::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return true;
 }
diff --git a/src/displayapp/screens/FlashLight.h b/src/displayapp/screens/FlashLight.h
index a862ffd..7f5ca6c 100644
--- a/src/displayapp/screens/FlashLight.h
+++ b/src/displayapp/screens/FlashLight.h
@@ -16,8 +16,6 @@ namespace Pinetime {
         FlashLight(DisplayApp* app, System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
         ~FlashLight() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
         void OnClickEvent(lv_obj_t* obj, lv_event_t event);
 
diff --git a/src/displayapp/screens/HeartRate.cpp b/src/displayapp/screens/HeartRate.cpp
index 5689b63..b6ece27 100644
--- a/src/displayapp/screens/HeartRate.cpp
+++ b/src/displayapp/screens/HeartRate.cpp
@@ -64,14 +64,17 @@ HeartRate::HeartRate(Pinetime::Applications::DisplayApp* app,
   UpdateStartStopButton(isHrRunning);
   if (isHrRunning)
     systemTask.PushMessage(Pinetime::System::Messages::DisableSleeping);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 100, LV_TASK_PRIO_MID, this);
 }
 
 HeartRate::~HeartRate() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
   systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
 }
 
-bool HeartRate::Refresh() {
+void HeartRate::Refresh() {
 
   auto state = heartRateController.State();
   switch (state) {
@@ -86,8 +89,6 @@ bool HeartRate::Refresh() {
 
   lv_label_set_text(label_status, ToString(state));
   lv_obj_align(label_status, label_hr, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
-
-  return running;
 }
 
 void HeartRate::OnStartStopEvent(lv_event_t event) {
diff --git a/src/displayapp/screens/HeartRate.h b/src/displayapp/screens/HeartRate.h
index a23c5af..7f7d3ad 100644
--- a/src/displayapp/screens/HeartRate.h
+++ b/src/displayapp/screens/HeartRate.h
@@ -20,7 +20,7 @@ namespace Pinetime {
         HeartRate(DisplayApp* app, Controllers::HeartRateController& HeartRateController, System::SystemTask& systemTask);
         ~HeartRate() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         void OnStartStopEvent(lv_event_t event);
 
@@ -33,6 +33,8 @@ namespace Pinetime {
         lv_obj_t* label_status;
         lv_obj_t* btn_startStop;
         lv_obj_t* label_startStop;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index 3224008..4dde81a 100644
--- a/src/displayapp/screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
@@ -15,10 +15,6 @@ InfiniPaint::~InfiniPaint() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool InfiniPaint::Refresh() {
-  return running;
-}
-
 bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   switch (event) {
     case Pinetime::Applications::TouchEvents::LongTap:
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index 6251752..0a70e03 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -17,8 +17,6 @@ namespace Pinetime {
 
         ~InfiniPaint() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(TouchEvents event) override;
 
         bool OnTouchEvent(uint16_t x, uint16_t y) override;
diff --git a/src/displayapp/screens/Label.cpp b/src/displayapp/screens/Label.cpp
index 0132dbd..8b079d9 100644
--- a/src/displayapp/screens/Label.cpp
+++ b/src/displayapp/screens/Label.cpp
@@ -36,7 +36,3 @@ Label::Label(uint8_t screenID, uint8_t numScreens, Pinetime::Applications::Displ
 Label::~Label() {
   lv_obj_clean(lv_scr_act());
 }
-
-bool Label::Refresh() {
-  return running;
-}
diff --git a/src/displayapp/screens/Label.h b/src/displayapp/screens/Label.h
index 62b80be..7e86c83 100644
--- a/src/displayapp/screens/Label.h
+++ b/src/displayapp/screens/Label.h
@@ -12,8 +12,6 @@ namespace Pinetime {
         Label(uint8_t screenID, uint8_t numScreens, DisplayApp* app, lv_obj_t* labelText);
         ~Label() override;
 
-        bool Refresh() override;
-
       private:
         bool running = true;
 
@@ -25,4 +23,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/List.cpp b/src/displayapp/screens/List.cpp
index b4f4d2c..efc505c 100644
--- a/src/displayapp/screens/List.cpp
+++ b/src/displayapp/screens/List.cpp
@@ -102,11 +102,6 @@ List::~List() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool List::Refresh() {
-
-  return running;
-}
-
 void List::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_RELEASED) {
     for (int i = 0; i < MAXLISTITEMS; i++) {
diff --git a/src/displayapp/screens/List.h b/src/displayapp/screens/List.h
index a45fd1d..d9f61f2 100644
--- a/src/displayapp/screens/List.h
+++ b/src/displayapp/screens/List.h
@@ -27,8 +27,6 @@ namespace Pinetime {
                       std::array<Applications, MAXLISTITEMS>& applications);
         ~List() override;
 
-        bool Refresh() override;
-
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
       private:
diff --git a/src/displayapp/screens/Meter.cpp b/src/displayapp/screens/Meter.cpp
index e0dbdfa..57cde9c 100644
--- a/src/displayapp/screens/Meter.cpp
+++ b/src/displayapp/screens/Meter.cpp
@@ -20,17 +20,17 @@ Meter::Meter(Pinetime::Applications::DisplayApp* app) : Screen(app) {
 
   lv_obj_set_size(lmeter, 200, 200);
   lv_obj_align(lmeter, nullptr, LV_ALIGN_CENTER, 0, 0);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Meter::~Meter() {
-
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Meter::Refresh() {
+void Meter::Refresh() {
   lv_linemeter_set_value(lmeter, value++); /*Set the current value*/
   if (value >= 60)
     value = 0;
-
-  return running;
 }
diff --git a/src/displayapp/screens/Meter.h b/src/displayapp/screens/Meter.h
index 24af15a..9b3d1d4 100644
--- a/src/displayapp/screens/Meter.h
+++ b/src/displayapp/screens/Meter.h
@@ -14,13 +14,15 @@ namespace Pinetime {
         Meter(DisplayApp* app);
         ~Meter() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         lv_style_t style_lmeter;
         lv_obj_t* lmeter;
 
         uint32_t value = 0;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index 7bfbccb..06cd7ef 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -85,9 +85,12 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl
   lv_label_set_text(playPauseLabel, Symbols::play);
 
   app->SetTouchMode(DisplayApp::TouchModes::Polling);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Metronome::~Metronome() {
+  lv_task_del(taskRefresh);
   app->SetTouchMode(DisplayApp::TouchModes::Gestures);
   systemTask.PushMessage(System::Messages::EnableSleeping);
   lv_obj_clean(lv_scr_act());
@@ -97,7 +100,7 @@ bool Metronome::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return true;
 }
 
-bool Metronome::Refresh() {
+void Metronome::Refresh() {
   switch (currentState) {
     case States::Stopped: {
       break;
@@ -117,7 +120,6 @@ bool Metronome::Refresh() {
       break;
     }
   }
-  return running;
 }
 
 void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) {
diff --git a/src/displayapp/screens/Metronome.h b/src/displayapp/screens/Metronome.h
index 3a1f108..d83dc74 100644
--- a/src/displayapp/screens/Metronome.h
+++ b/src/displayapp/screens/Metronome.h
@@ -11,7 +11,7 @@ namespace Pinetime::Applications::Screens {
   public:
     Metronome(DisplayApp* app, Controllers::MotorController& motorController, System::SystemTask& systemTask);
     ~Metronome() override;
-    bool Refresh() override;
+    void Refresh() override;
     bool OnTouchEvent(TouchEvents event) override;
     void OnEvent(lv_obj_t* obj, lv_event_t event);
     enum class States { Running, Stopped };
@@ -30,5 +30,7 @@ namespace Pinetime::Applications::Screens {
     lv_obj_t *bpmArc, *bpmTap, *bpmValue, *bpmLegend;
     lv_obj_t *bpbDropdown, *bpbLegend;
     lv_obj_t *playPause, *playPauseLabel;
+
+    lv_task_t* taskRefresh;
   };
 }
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index a8bb3c1..108b942 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -32,18 +32,20 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
   lv_label_set_recolor(label, true);
-  
+
   labelStep = lv_label_create(lv_scr_act(), NULL);
   lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
   lv_label_set_text(labelStep, "Steps ---");
 
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Motion::~Motion() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Motion::Refresh() {
+void Motion::Refresh() {
   lv_chart_set_next(chart, ser1, motionController.X());
   lv_chart_set_next(chart, ser2, motionController.Y());
   lv_chart_set_next(chart, ser3, motionController.Z());
@@ -52,8 +54,6 @@ bool Motion::Refresh() {
 
   lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
   lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
-
-  return running;
 }
 
 bool Motion::OnButtonPushed() {
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index 132b20e..3f91ece 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -17,7 +17,7 @@ namespace Pinetime {
         Motion(DisplayApp* app, Controllers::MotionController& motionController);
         ~Motion() override;
 
-        bool Refresh() override;
+        void Refresh() override;
         bool OnButtonPushed() override;
 
       private:
@@ -32,7 +32,9 @@ namespace Pinetime {
         static constexpr uint8_t nbStepsBufferSize = 9;
         char nbStepsBuffer[nbStepsBufferSize + 1];
         bool running = true;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 9f10f50..beb96fa 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -146,13 +146,16 @@ Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Mus
   frameB = false;
 
   musicService.event(Controllers::MusicService::EVENT_MUSIC_OPEN);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 5000, LV_TASK_PRIO_MID, this);
 }
 
 Music::~Music() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Music::Refresh() {
+void Music::Refresh() {
   if (artist != musicService.getArtist()) {
     artist = musicService.getArtist();
     currentLength = 0;
@@ -216,8 +219,6 @@ bool Music::Refresh() {
   } else {
     lv_label_set_text(txtPlayPause, Symbols::play);
   }
-
-  return running;
 }
 
 void Music::UpdateLength() {
@@ -303,4 +304,4 @@ bool Music::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
       return true;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h
index ef8f1fe..a2d138b 100644
--- a/src/displayapp/screens/Music.h
+++ b/src/displayapp/screens/Music.h
@@ -35,7 +35,7 @@ namespace Pinetime {
 
         ~Music() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
 
@@ -78,6 +78,8 @@ namespace Pinetime {
 
         bool playing;
 
+        lv_task_t* taskRefresh;
+
         /** Watchapp */
       };
     }
diff --git a/src/displayapp/screens/Navigation.cpp b/src/displayapp/screens/Navigation.cpp
index 79b04e2..d437cc6 100644
--- a/src/displayapp/screens/Navigation.cpp
+++ b/src/displayapp/screens/Navigation.cpp
@@ -161,13 +161,16 @@ Navigation::Navigation(Pinetime::Applications::DisplayApp* app, Pinetime::Contro
   lv_bar_set_anim_time(barProgress, 500);
   lv_bar_set_range(barProgress, 0, 100);
   lv_bar_set_value(barProgress, 0, LV_ANIM_OFF);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Navigation::~Navigation() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Navigation::Refresh() {
+void Navigation::Refresh() {
   if (flag != navService.getFlag()) {
     flag = navService.getFlag();
     lv_label_set_text(imgFlag, iconForName(flag));
@@ -192,8 +195,4 @@ bool Navigation::Refresh() {
       lv_obj_set_style_local_bg_color(barProgress, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
     }
   }
-
-  return running;
 }
-
-
diff --git a/src/displayapp/screens/Navigation.h b/src/displayapp/screens/Navigation.h
index eb7e00c..48f00a7 100644
--- a/src/displayapp/screens/Navigation.h
+++ b/src/displayapp/screens/Navigation.h
@@ -35,7 +35,7 @@ namespace Pinetime {
         Navigation(DisplayApp* app, Pinetime::Controllers::NavigationService& nav);
         ~Navigation() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         lv_obj_t* imgFlag;
@@ -49,6 +49,8 @@ namespace Pinetime {
         std::string narrative;
         std::string manDist;
         int progress;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 38b1242..33e50cc 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -47,13 +47,16 @@ Notifications::Notifications(DisplayApp* app,
     timeoutTickCountStart = xTaskGetTickCount();
     timeoutTickCountEnd = timeoutTickCountStart + (5 * 1024);
   }
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Notifications::~Notifications() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Notifications::Refresh() {
+void Notifications::Refresh() {
   if (mode == Modes::Preview) {
     auto tick = xTaskGetTickCount();
     int32_t pos = 240 - ((tick - timeoutTickCountStart) / ((timeoutTickCountEnd - timeoutTickCountStart) / 240));
@@ -63,8 +66,6 @@ bool Notifications::Refresh() {
     timeoutLinePoints[1].x = pos;
     lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
   }
-
-  return running;
 }
 
 bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 51ca81d..6d47e23 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -22,7 +22,7 @@ namespace Pinetime {
                                Modes mode);
         ~Notifications() override;
 
-        bool Refresh() override;
+        void Refresh() override;
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
 
         class NotificationItem {
@@ -35,9 +35,6 @@ namespace Pinetime {
                            Modes mode,
                            Pinetime::Controllers::AlertNotificationService& alertNotificationService);
           ~NotificationItem();
-          bool Refresh() {
-            return false;
-          }
           void OnAcceptIncomingCall(lv_event_t event);
           void OnMuteIncomingCall(lv_event_t event);
           void OnRejectIncomingCall(lv_event_t event);
@@ -78,6 +75,8 @@ namespace Pinetime {
         lv_obj_t* timeoutLine;
         uint32_t timeoutTickCountStart;
         uint32_t timeoutTickCountEnd;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/Paddle.cpp b/src/displayapp/screens/Paddle.cpp
index 5a939ac..87fc872 100644
--- a/src/displayapp/screens/Paddle.cpp
+++ b/src/displayapp/screens/Paddle.cpp
@@ -29,15 +29,18 @@ Paddle::Paddle(Pinetime::Applications::DisplayApp* app, Pinetime::Components::Li
   lv_obj_set_style_local_bg_color(ball, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
   lv_obj_set_style_local_radius(ball, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
   lv_obj_set_size(ball, ballSize, ballSize);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
 }
 
 Paddle::~Paddle() {
+  lv_task_del(taskRefresh);
   // Reset the touchmode
   app->SetTouchMode(DisplayApp::TouchModes::Gestures);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Paddle::Refresh() {
+void Paddle::Refresh() {
   ballX += dx;
   ballY += dy;
 
@@ -69,7 +72,6 @@ bool Paddle::Refresh() {
     }
   }
   lv_label_set_text_fmt(points, "%04d", score);
-  return running;
 }
 
 bool Paddle::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
diff --git a/src/displayapp/screens/Paddle.h b/src/displayapp/screens/Paddle.h
index 30ab8f9..fc2131a 100644
--- a/src/displayapp/screens/Paddle.h
+++ b/src/displayapp/screens/Paddle.h
@@ -16,7 +16,7 @@ namespace Pinetime {
         Paddle(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl);
         ~Paddle() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         bool OnTouchEvent(TouchEvents event) override;
         bool OnTouchEvent(uint16_t x, uint16_t y) override;
@@ -40,6 +40,8 @@ namespace Pinetime {
         lv_obj_t* paddle;
         lv_obj_t* ball;
         lv_obj_t* background;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 591f3a4..c595223 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -200,13 +200,17 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(backgroundLabel, 240, 240);
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text(backgroundLabel, "");
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
+  Refresh();
 }
 
 PineTimeStyle::~PineTimeStyle() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool PineTimeStyle::Refresh() {
+void PineTimeStyle::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
@@ -335,6 +339,4 @@ bool PineTimeStyle::Refresh() {
       lv_obj_set_style_local_scale_grad_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
     }
   }
-
-  return running;
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 3b4ded1..88180c5 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -30,7 +30,7 @@ namespace Pinetime {
                       Controllers::MotionController& motionController);
         ~PineTimeStyle() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
 
@@ -80,6 +80,8 @@ namespace Pinetime {
         Controllers::NotificationManager& notificatioManager;
         Controllers::Settings& settingsController;
         Controllers::MotionController& motionController;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/Screen.cpp b/src/displayapp/screens/Screen.cpp
index 1467df3..6ae5b7b 100644
--- a/src/displayapp/screens/Screen.cpp
+++ b/src/displayapp/screens/Screen.cpp
@@ -1,2 +1,6 @@
 #include "Screen.h"
-using namespace Pinetime::Applications::Screens;
\ No newline at end of file
+using namespace Pinetime::Applications::Screens;
+
+void Screen::RefreshTaskCallback(lv_task_t* task) {
+  static_cast<Screen*>(task->user_data)->Refresh();
+}
diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index 8e49c9d..30de2ad 100644
--- a/src/displayapp/screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
@@ -2,6 +2,7 @@
 
 #include <cstdint>
 #include "../TouchEvents.h"
+#include <lvgl/lvgl.h>
 
 namespace Pinetime {
   namespace Applications {
@@ -34,25 +35,20 @@ namespace Pinetime {
       };
 
       class Screen {
+      private:
+        virtual void Refresh() {
+        }
+
       public:
         explicit Screen(DisplayApp* app) : app {app} {
         }
         virtual ~Screen() = default;
 
-        /**
-         * Most of the time, apps only react to events (touch events, for example).
-         * In this case you don't need to do anything in this method.
-         *
-         * For example, InfiniPaint does nothing in Refresh().
-         * But, if you want to update your display periodically, draw an animation...
-         * you cannot do it in a touch event handler because these handlers are not
-         * called if the user does not touch the screen.
-         *
-         * That's why Refresh() is there: update the display periodically.
-         *
-         * @return false if the app can be closed, true if it must continue to run
-         **/
-        virtual bool Refresh() = 0;
+        static void RefreshTaskCallback(lv_task_t* task);
+
+        bool IsRunning() const {
+          return running;
+        }
 
         /** @return false if the button hasn't been handled by the app, true if it has been handled */
         virtual bool OnButtonPushed() {
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index ea66bfb..a9d747a 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -30,11 +30,6 @@ namespace Pinetime {
           lv_obj_clean(lv_scr_act());
         }
 
-        bool Refresh() override {
-          running = current->Refresh();
-          return running;
-        }
-
         bool OnTouchEvent(TouchEvents event) override {
 
           if (mode == ScreenListModes::UpDown) {
@@ -110,4 +105,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
index 6aabd30..a096bbc 100644
--- a/src/displayapp/screens/Steps.cpp
+++ b/src/displayapp/screens/Steps.cpp
@@ -50,20 +50,20 @@ Steps::Steps(
   lv_obj_set_size(backgroundLabel, 240, 240);
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text_static(backgroundLabel, "");
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 100, LV_TASK_PRIO_MID, this);
 }
 
 Steps::~Steps() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Steps::Refresh() {
-
+void Steps::Refresh() {
   stepsCount = motionController.NbSteps();
-  
+
   lv_label_set_text_fmt(lSteps, "%li", stepsCount);
   lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
-  
-  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
 
-  return running;
+  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
 }
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
index 9c135e2..d7cf31e 100644
--- a/src/displayapp/screens/Steps.h
+++ b/src/displayapp/screens/Steps.h
@@ -15,24 +15,23 @@ namespace Pinetime {
     namespace Screens {
 
       class Steps : public Screen {
-        public:
-          Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings &settingsController);
-          ~Steps() override;
+      public:
+        Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings& settingsController);
+        ~Steps() override;
 
-          bool Refresh() override;
-          
+        void Refresh() override;
 
-        private:          
+      private:
+        Controllers::MotionController& motionController;
+        Controllers::Settings& settingsController;
 
-          Controllers::MotionController& motionController;
-          Controllers::Settings& settingsController;
+        lv_obj_t* lSteps;
+        lv_obj_t* lStepsIcon;
+        lv_obj_t* stepsArc;
 
-          lv_obj_t * lSteps;
-          lv_obj_t * lStepsIcon;
-          lv_obj_t * stepsArc;
-
-          uint32_t stepsCount;
+        uint32_t stepsCount;
 
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index f4db5d6..74b49db 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -48,7 +48,6 @@ static void stop_lap_event_handler(lv_obj_t* obj, lv_event_t event) {
 StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask)
   : Screen(app),
     systemTask {systemTask},
-    running {true},
     currentState {States::Init},
     startTime {},
     oldTimeElapsed {},
@@ -101,9 +100,12 @@ StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask)
   lv_obj_set_style_local_text_color(lapTwoText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
   lv_obj_align(lapTwoText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 55);
   lv_label_set_text(lapTwoText, "");
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
 }
 
 StopWatch::~StopWatch() {
+  lv_task_del(taskRefresh);
   systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
   lv_obj_clean(lv_scr_act());
 }
@@ -149,7 +151,7 @@ void StopWatch::pause() {
   systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
 }
 
-bool StopWatch::Refresh() {
+void StopWatch::Refresh() {
   if (currentState == States::Running) {
     timeElapsed = calculateDelta(startTime, xTaskGetTickCount());
     currentTimeSeparated = convertTicksToTimeSegments((oldTimeElapsed + timeElapsed));
@@ -157,7 +159,6 @@ bool StopWatch::Refresh() {
     lv_label_set_text_fmt(time, "%02d:%02d", currentTimeSeparated.mins, currentTimeSeparated.secs);
     lv_label_set_text_fmt(msecTime, "%02d", currentTimeSeparated.hundredths);
   }
-  return running;
 }
 
 void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
@@ -196,8 +197,7 @@ void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
 bool StopWatch::OnButtonPushed() {
   if (currentState == States::Running) {
     pause();
-  } else {
-    running = false;
+    return true;
   }
-  return true;
+  return false;
 }
diff --git a/src/displayapp/screens/StopWatch.h b/src/displayapp/screens/StopWatch.h
index e132f15..25634e9 100644
--- a/src/displayapp/screens/StopWatch.h
+++ b/src/displayapp/screens/StopWatch.h
@@ -64,7 +64,7 @@ namespace Pinetime::Applications::Screens {
   public:
     StopWatch(DisplayApp* app, System::SystemTask& systemTask);
     ~StopWatch() override;
-    bool Refresh() override;
+    void Refresh() override;
 
     void playPauseBtnEventHandler(lv_event_t event);
     void stopLapBtnEventHandler(lv_event_t event);
@@ -77,7 +77,6 @@ namespace Pinetime::Applications::Screens {
   private:
     Pinetime::System::SystemTask& systemTask;
     TickType_t timeElapsed;
-    bool running;
     States currentState;
     TickType_t startTime;
     TickType_t oldTimeElapsed;
@@ -86,5 +85,7 @@ namespace Pinetime::Applications::Screens {
     int lapNr = 0;
     lv_obj_t *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap;
     lv_obj_t *lapOneText, *lapTwoText;
+
+    lv_task_t* taskRefresh;
   };
 }
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index f5bf0cc..78399b7 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -63,13 +63,6 @@ SystemInfo::~SystemInfo() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool SystemInfo::Refresh() {
-  if (running) {
-    screens.Refresh();
-  }
-  return running;
-}
-
 bool SystemInfo::OnButtonPushed() {
   running = false;
   return true;
diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h
index 9d471f6..5b1b4ee 100644
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -30,7 +30,6 @@ namespace Pinetime {
                             Pinetime::Drivers::WatchdogView& watchdog,
                             Pinetime::Controllers::MotionController& motionController);
         ~SystemInfo() override;
-        bool Refresh() override;
         bool OnButtonPushed() override;
         bool OnTouchEvent(TouchEvents event) override;
 
@@ -56,4 +55,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 3eb127c..d2ab9b4 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -120,10 +120,6 @@ void Tile::UpdateScreen() {
   lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining()));
 }
 
-bool Tile::Refresh() {
-  return running;
-}
-
 void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId) {
   if (event == LV_EVENT_VALUE_CHANGED) {
     app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index 4ebd81c..5de5b04 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -30,7 +30,6 @@ namespace Pinetime {
 
         ~Tile() override;
 
-        bool Refresh() override;
         void UpdateScreen();
         void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
 
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
index 99e979b..ae6ed30 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -4,10 +4,8 @@
 #include "Symbols.h"
 #include "lvgl/lvgl.h"
 
-
 using namespace Pinetime::Applications::Screens;
 
-
 static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
   Timer* screen = static_cast<Timer*>(obj->user_data);
   screen->OnButtonEvent(obj, event);
@@ -22,7 +20,7 @@ void Timer::createButtons() {
   lv_obj_set_width(btnMinutesUp, 60);
   txtMUp = lv_label_create(btnMinutesUp, nullptr);
   lv_label_set_text(txtMUp, "+");
-  
+
   btnMinutesDown = lv_btn_create(lv_scr_act(), nullptr);
   btnMinutesDown->user_data = this;
   lv_obj_set_event_cb(btnMinutesDown, btnEventHandler);
@@ -31,7 +29,7 @@ void Timer::createButtons() {
   lv_obj_set_width(btnMinutesDown, 60);
   txtMDown = lv_label_create(btnMinutesDown, nullptr);
   lv_label_set_text(txtMDown, "-");
-  
+
   btnSecondsUp = lv_btn_create(lv_scr_act(), nullptr);
   btnSecondsUp->user_data = this;
   lv_obj_set_event_cb(btnSecondsUp, btnEventHandler);
@@ -40,7 +38,7 @@ void Timer::createButtons() {
   lv_obj_set_width(btnSecondsUp, 60);
   txtSUp = lv_label_create(btnSecondsUp, nullptr);
   lv_label_set_text(txtSUp, "+");
-  
+
   btnSecondsDown = lv_btn_create(lv_scr_act(), nullptr);
   btnSecondsDown->user_data = this;
   lv_obj_set_event_cb(btnSecondsDown, btnEventHandler);
@@ -49,24 +47,20 @@ void Timer::createButtons() {
   lv_obj_set_width(btnSecondsDown, 60);
   txtSDown = lv_label_create(btnSecondsDown, nullptr);
   lv_label_set_text(txtSDown, "-");
-  
 }
 
-
 Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
-    : Screen(app),
-      running{true},
-      timerController{timerController} {
-  
+  : Screen(app), running {true}, timerController {timerController} {
+
   time = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
   lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
-  
+
   uint32_t seconds = timerController.GetTimeRemaining() / 1000;
   lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
 
   lv_obj_align(time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20);
-  
+
   btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
   btnPlayPause->user_data = this;
   lv_obj_set_event_cb(btnPlayPause, btnEventHandler);
@@ -79,20 +73,20 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
     lv_label_set_text(txtPlayPause, Symbols::play);
     createButtons();
   }
-  
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
 }
 
 Timer::~Timer() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
-  
 }
 
-bool Timer::Refresh() {
+void Timer::Refresh() {
   if (timerController.IsRunning()) {
     uint32_t seconds = timerController.GetTimeRemaining() / 1000;
     lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
   }
-  return running;
 }
 
 void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
@@ -105,11 +99,11 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
         secondsToSet = seconds % 60;
         timerController.StopTimer();
         createButtons();
-        
+
       } else if (secondsToSet + minutesToSet > 0) {
         lv_label_set_text(txtPlayPause, Symbols::pause);
         timerController.StartTimer((secondsToSet + minutesToSet * 60) * 1000);
-        
+
         lv_obj_del(btnSecondsDown);
         btnSecondsDown = nullptr;
         lv_obj_del(btnSecondsUp);
@@ -118,7 +112,6 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
         btnMinutesDown = nullptr;
         lv_obj_del(btnMinutesUp);
         btnMinutesUp = nullptr;
-        
       }
     } else {
       if (!timerController.IsRunning()) {
@@ -129,7 +122,7 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
             minutesToSet++;
           }
           lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
-          
+
         } else if (obj == btnMinutesDown) {
           if (minutesToSet == 0) {
             minutesToSet = 59;
@@ -137,7 +130,7 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
             minutesToSet--;
           }
           lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
-          
+
         } else if (obj == btnSecondsUp) {
           if (secondsToSet >= 59) {
             secondsToSet = 0;
@@ -145,7 +138,7 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
             secondsToSet++;
           }
           lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
-          
+
         } else if (obj == btnSecondsDown) {
           if (secondsToSet == 0) {
             secondsToSet = 59;
@@ -153,21 +146,16 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
             secondsToSet--;
           }
           lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
-          
         }
       }
-      
     }
-    
   }
-  
 }
 
-
 void Timer::setDone() {
   lv_label_set_text(time, "00:00");
   lv_label_set_text(txtPlayPause, Symbols::play);
   secondsToSet = 0;
   minutesToSet = 0;
   createButtons();
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index 0d66f2d..d0fc8ed 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -8,35 +8,32 @@
 #include "components/timer/TimerController.h"
 
 namespace Pinetime::Applications::Screens {
-  
-  
+
   class Timer : public Screen {
   public:
-    
-    enum class Modes {
-      Normal, Done
-    };
-    
+    enum class Modes { Normal, Done };
+
     Timer(DisplayApp* app, Controllers::TimerController& timerController);
-    
+
     ~Timer() override;
-    
-    bool Refresh() override;
-    
+
+    void Refresh() override;
+
     void setDone();
-    
+
     void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
-  
+
   private:
-    
     bool running;
     uint8_t secondsToSet = 0;
     uint8_t minutesToSet = 0;
     Controllers::TimerController& timerController;
-    
+
     void createButtons();
-    
-    lv_obj_t* time, * msecTime, * btnPlayPause, * txtPlayPause, * btnMinutesUp, * btnMinutesDown, * btnSecondsUp, * btnSecondsDown, * txtMUp,
-        * txtMDown, * txtSUp, * txtSDown;
+
+    lv_obj_t *time, *msecTime, *btnPlayPause, *txtPlayPause, *btnMinutesUp, *btnMinutesDown, *btnSecondsUp, *btnSecondsDown, *txtMUp,
+      *txtMDown, *txtSUp, *txtSDown;
+
+    lv_task_t* taskRefresh;
   };
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Twos.cpp b/src/displayapp/screens/Twos.cpp
index eb26807..4201d50 100644
--- a/src/displayapp/screens/Twos.cpp
+++ b/src/displayapp/screens/Twos.cpp
@@ -102,10 +102,6 @@ Twos::~Twos() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Twos::Refresh() {
-  return running;
-}
-
 bool Twos::placeNewTile() {
   std::vector<std::pair<int, int>> availableCells;
   for (int row = 0; row < 4; row++) {
@@ -295,4 +291,4 @@ void Twos::updateGridDisplay(Tile grid[][4]) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h
index 3367618..6d85cff 100644
--- a/src/displayapp/screens/Twos.h
+++ b/src/displayapp/screens/Twos.h
@@ -14,7 +14,6 @@ namespace Pinetime {
       public:
         Twos(DisplayApp* app);
         ~Twos() override;
-        bool Refresh() override;
 
         bool OnTouchEvent(TouchEvents event) override;
 
@@ -36,4 +35,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index f188937..b6720bd 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -119,10 +119,12 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
   lv_style_set_line_rounded(&hour_line_style_trace, LV_STATE_DEFAULT, false);
   lv_obj_add_style(hour_body_trace, LV_LINE_PART_MAIN, &hour_line_style_trace);
 
+  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
   UpdateClock();
 }
 
 WatchFaceAnalog::~WatchFaceAnalog() {
+  lv_task_del(taskRefresh);
 
   lv_style_reset(&hour_line_style);
   lv_style_reset(&hour_line_style_trace);
@@ -176,7 +178,7 @@ void WatchFaceAnalog::UpdateClock() {
   }
 }
 
-bool WatchFaceAnalog::Refresh() {
+void WatchFaceAnalog::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
@@ -211,6 +213,4 @@ bool WatchFaceAnalog::Refresh() {
       currentDay = day;
     }
   }
-
-  return true;
 }
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index ac7f0ac..c9b19b4 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -32,7 +32,7 @@ namespace Pinetime {
 
         ~WatchFaceAnalog() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         uint8_t sHour, sMinute, sSecond;
@@ -83,6 +83,8 @@ namespace Pinetime {
         Controllers::Settings& settingsController;
 
         void UpdateClock();
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index f1285ea..9b6aee2 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -100,13 +100,17 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7));
   lv_label_set_text(stepIcon, Symbols::shoe);
   lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
+  Refresh();
 }
 
 WatchFaceDigital::~WatchFaceDigital() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool WatchFaceDigital::Refresh() {
+void WatchFaceDigital::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
@@ -240,6 +244,4 @@ bool WatchFaceDigital::Refresh() {
     lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -5, -2);
     lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
   }
-
-  return running;
 }
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index 76c8d3d..02ec93c 100644
--- a/src/displayapp/screens/WatchFaceDigital.h
+++ b/src/displayapp/screens/WatchFaceDigital.h
@@ -33,7 +33,7 @@ namespace Pinetime {
                          Controllers::MotionController& motionController);
         ~WatchFaceDigital() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
 
@@ -75,6 +75,8 @@ namespace Pinetime {
         Controllers::Settings& settingsController;
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
+
+        lv_task_t* taskRefresh;
       };
     }
   }
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index acc2a27..abee168 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -164,7 +164,3 @@ bool QuickSettings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
       return true;
   }
 }
-
-bool QuickSettings::Refresh() {
-  return running;
-}
diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
index a14f46b..7757f28 100644
--- a/src/displayapp/screens/settings/QuickSettings.h
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -27,8 +27,6 @@ namespace Pinetime {
 
         ~QuickSettings() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
diff --git a/src/displayapp/screens/settings/SettingDisplay.cpp b/src/displayapp/screens/settings/SettingDisplay.cpp
index 4954185..7b31c47 100644
--- a/src/displayapp/screens/settings/SettingDisplay.cpp
+++ b/src/displayapp/screens/settings/SettingDisplay.cpp
@@ -80,10 +80,6 @@ SettingDisplay::~SettingDisplay() {
   settingsController.SaveSettings();
 }
 
-bool SettingDisplay::Refresh() {
-  return running;
-}
-
 void SettingDisplay::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_VALUE_CHANGED) {
     for (int i = 0; i < optionsTotal; i++) {
@@ -110,4 +106,4 @@ void SettingDisplay::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingDisplay.h b/src/displayapp/screens/settings/SettingDisplay.h
index b8ed87e..51b23ac 100644
--- a/src/displayapp/screens/settings/SettingDisplay.h
+++ b/src/displayapp/screens/settings/SettingDisplay.h
@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingDisplay(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingDisplay() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:
diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
index faa843e..bec7972 100644
--- a/src/displayapp/screens/settings/SettingSteps.cpp
+++ b/src/displayapp/screens/settings/SettingSteps.cpp
@@ -70,11 +70,6 @@ SettingSteps::~SettingSteps() {
   settingsController.SaveSettings();
 }
 
-bool SettingSteps::Refresh() {
-  return running;
-}
-
-
 void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   uint32_t value = settingsController.GetStepsGoal();
   if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
@@ -95,4 +90,4 @@ void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
index 0a4c205..5fc05de 100644
--- a/src/displayapp/screens/settings/SettingSteps.h
+++ b/src/displayapp/screens/settings/SettingSteps.h
@@ -10,22 +10,19 @@ namespace Pinetime {
   namespace Applications {
     namespace Screens {
 
-      class SettingSteps : public Screen{
-        public:
-          SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
-          ~SettingSteps() override;
+      class SettingSteps : public Screen {
+      public:
+        SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        ~SettingSteps() override;
 
-          bool Refresh() override;
-          void UpdateSelected(lv_obj_t *object, lv_event_t event);
-         
-        private:          
+        void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
-          Controllers::Settings& settingsController;
+      private:
+        Controllers::Settings& settingsController;
 
-          lv_obj_t * stepValue;
-          lv_obj_t * btnPlus;
-          lv_obj_t * btnMinus;
-          
+        lv_obj_t* stepValue;
+        lv_obj_t* btnPlus;
+        lv_obj_t* btnMinus;
       };
     }
   }
diff --git a/src/displayapp/screens/settings/SettingTimeFormat.cpp b/src/displayapp/screens/settings/SettingTimeFormat.cpp
index 031a2a7..c99e3a0 100644
--- a/src/displayapp/screens/settings/SettingTimeFormat.cpp
+++ b/src/displayapp/screens/settings/SettingTimeFormat.cpp
@@ -64,10 +64,6 @@ SettingTimeFormat::~SettingTimeFormat() {
   settingsController.SaveSettings();
 }
 
-bool SettingTimeFormat::Refresh() {
-  return running;
-}
-
 void SettingTimeFormat::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_VALUE_CHANGED) {
     for (int i = 0; i < optionsTotal; i++) {
@@ -86,4 +82,4 @@ void SettingTimeFormat::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingTimeFormat.h b/src/displayapp/screens/settings/SettingTimeFormat.h
index 9203b45..eac4bdc 100644
--- a/src/displayapp/screens/settings/SettingTimeFormat.h
+++ b/src/displayapp/screens/settings/SettingTimeFormat.h
@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingTimeFormat(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingTimeFormat() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:
diff --git a/src/displayapp/screens/settings/SettingWakeUp.cpp b/src/displayapp/screens/settings/SettingWakeUp.cpp
index 0e08035..646afe6 100644
--- a/src/displayapp/screens/settings/SettingWakeUp.cpp
+++ b/src/displayapp/screens/settings/SettingWakeUp.cpp
@@ -72,10 +72,6 @@ SettingWakeUp::~SettingWakeUp() {
   settingsController.SaveSettings();
 }
 
-bool SettingWakeUp::Refresh() {
-  return running;
-}
-
 void SettingWakeUp::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   using WakeUpMode = Pinetime::Controllers::Settings::WakeUpMode;
   if (event == LV_EVENT_VALUE_CHANGED && !ignoringEvents) {
diff --git a/src/displayapp/screens/settings/SettingWakeUp.h b/src/displayapp/screens/settings/SettingWakeUp.h
index 248dd9a..b9a31dc 100644
--- a/src/displayapp/screens/settings/SettingWakeUp.h
+++ b/src/displayapp/screens/settings/SettingWakeUp.h
@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingWakeUp(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingWakeUp() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 3e73489..1d27acd 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -75,10 +75,6 @@ SettingWatchFace::~SettingWatchFace() {
   settingsController.SaveSettings();
 }
 
-bool SettingWatchFace::Refresh() {
-  return running;
-}
-
 void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_VALUE_CHANGED) {
     for (uint8_t i = 0; i < optionsTotal; i++) {
@@ -90,4 +86,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 1930a22..d4a96c6 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingWatchFace(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingWatchFace() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index e63a358..c799574 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -26,13 +26,6 @@ Settings::~Settings() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Settings::Refresh() {
-
-  if (running)
-    running = screens.Refresh();
-  return running;
-}
-
 bool Settings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index 711a6be..02ccff6 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -14,8 +14,6 @@ namespace Pinetime {
         Settings(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~Settings() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
 
       private:
-- 
cgit v0.10.2


From 331fc2be6931238960c894d0a926f673607455fc Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 19 Jul 2021 17:06:20 +0300
Subject: Set remaining default periods to LV_DISP_DEF_REFR_PERIOD


diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index beb96fa..2d22877 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -147,7 +147,7 @@ Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Mus
 
   musicService.event(Controllers::MusicService::EVENT_MUSIC_OPEN);
 
-  taskRefresh = lv_task_create(RefreshTaskCallback, 5000, LV_TASK_PRIO_MID, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Music::~Music() {
diff --git a/src/displayapp/screens/Paddle.cpp b/src/displayapp/screens/Paddle.cpp
index 87fc872..d43173d 100644
--- a/src/displayapp/screens/Paddle.cpp
+++ b/src/displayapp/screens/Paddle.cpp
@@ -30,7 +30,7 @@ Paddle::Paddle(Pinetime::Applications::DisplayApp* app, Pinetime::Components::Li
   lv_obj_set_style_local_radius(ball, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
   lv_obj_set_size(ball, ballSize, ballSize);
 
-  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Paddle::~Paddle() {
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index 74b49db..0d4feb2 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -101,7 +101,7 @@ StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask)
   lv_obj_align(lapTwoText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 55);
   lv_label_set_text(lapTwoText, "");
 
-  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 StopWatch::~StopWatch() {
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
index ae6ed30..ff3099d 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -74,7 +74,7 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
     createButtons();
   }
 
-  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Timer::~Timer() {
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index b6720bd..95c3fe4 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -119,7 +119,7 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
   lv_style_set_line_rounded(&hour_line_style_trace, LV_STATE_DEFAULT, false);
   lv_obj_add_style(hour_body_trace, LV_LINE_PART_MAIN, &hour_line_style_trace);
 
-  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
   UpdateClock();
 }
 
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index 9b6aee2..e66e7aa 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -101,7 +101,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   lv_label_set_text(stepIcon, Symbols::shoe);
   lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
-  taskRefresh = lv_task_create(RefreshTaskCallback, 20, LV_TASK_PRIO_MID, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
   Refresh();
 }
 
-- 
cgit v0.10.2


From 5e4d3c87e92b8f2dd1020577f3ebad93322b0f6f Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 22 Jul 2021 15:37:34 +0200
Subject: Remove .gitignore


diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 2f9ac18..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,41 +0,0 @@
-.idea/
-# Python virtual environment for DFU images
-.venv/
-
-# CMake
-cmake-build-*
-cmake-*
-CMakeFiles
-**/CMakeCache.txt
-cmake_install.cmake
-Makefile
-build
-tools
-
-# Resulting binary files
-*.a
-*.so
-*.s
-*.hex
-*.bin
-!bootloader/bootloader-5.0.4.bin
-*.map
-*.out
-pinetime*.cbp
-
-# InfiniTime's files
-core
-sdk
-src/Version.h
-docker/post_build.sh
-Testing/Temporary/
-
-# Linux
-**/.directory
-**/*.swp
-
-# OSX/MacOS
-**/.DS_Store
-
-# Windows
-**/thumbs.db
\ No newline at end of file
-- 
cgit v0.10.2


From 547b5a869911bc98e08df05dc56de7ae830f7eeb Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 23 Jul 2021 15:06:08 +0200
Subject: Restore .gitignore


diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2f9ac18
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,41 @@
+.idea/
+# Python virtual environment for DFU images
+.venv/
+
+# CMake
+cmake-build-*
+cmake-*
+CMakeFiles
+**/CMakeCache.txt
+cmake_install.cmake
+Makefile
+build
+tools
+
+# Resulting binary files
+*.a
+*.so
+*.s
+*.hex
+*.bin
+!bootloader/bootloader-5.0.4.bin
+*.map
+*.out
+pinetime*.cbp
+
+# InfiniTime's files
+core
+sdk
+src/Version.h
+docker/post_build.sh
+Testing/Temporary/
+
+# Linux
+**/.directory
+**/*.swp
+
+# OSX/MacOS
+**/.DS_Store
+
+# Windows
+**/thumbs.db
\ No newline at end of file
-- 
cgit v0.10.2


From b3e3d75d0fd077cd4341092f57403b6b3e17c7fd Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sat, 24 Jul 2021 14:25:27 +0200
Subject: Add extra screen in settings to show scrollbar correctly


diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 7334780..43f60a3 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
     {Symbols::clock, "Watch face", Apps::SettingWatchFace},
   }};
 
-  return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
 }
 
 std::unique_ptr<Screen> Settings::CreateScreen2() {
@@ -61,7 +61,7 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
     {Symbols::list, "About", Apps::SysInfo},
   }};
 
-  return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(1, 3, app, settingsController, applications);
 }
 
 std::unique_ptr<Screen> Settings::CreateScreen3() {
@@ -73,5 +73,5 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
     {Symbols::none, "None", Apps::None},
   }};
 
-  return std::make_unique<Screens::List>(2, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
 }
-- 
cgit v0.10.2


From bb26c68f2cb971dd2bb6eaa9916ec2372ebcc646 Mon Sep 17 00:00:00 2001
From: Alexandros Feuerstein <32029275+afeuerstein@users.noreply.github.com>
Date: Sat, 24 Jul 2021 15:39:24 +0200
Subject: minor changes regarding building (#356)

* don't enforce any flashing through debug ports

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d02c10..b442fc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,6 @@ if (NOT NRF5_SDK_PATH)
   message(FATAL_ERROR "The path to the NRF52 SDK must be specified on the command line (add -DNRF5_SDK_PATH=<path>")
 endif ()
 
-if(NOT USE_JLINK AND NOT USE_GDB_CLIENT AND NOT USE_OPENOCD)
-  set(USE_JLINK true)
-endif()
-
 if(USE_JLINK)
   if (NOT NRFJPROG)
     message(FATAL_ERROR "the path to the tool nrfjprog must be specified on the command line (add -DNRFJPROG=<path>")
-- 
cgit v0.10.2


From a1a6eae43f5995e21ff3d535094a6350e1031804 Mon Sep 17 00:00:00 2001
From: Avamander <avamander@gmail.com>
Date: Sun, 18 Apr 2021 19:20:16 +0300
Subject: Added a pre-commit hook that should simplify commiting pre-formatted
 code


diff --git a/hooks/README.md b/hooks/README.md
new file mode 100644
index 0000000..de8fc67
--- /dev/null
+++ b/hooks/README.md
@@ -0,0 +1,5 @@
+# Git hooks
+
+This directory contains Git hooks that simplify contributing to this repository.
+
+You can install them by copying the files into `.git/hooks` in the repository folder or by running `git config --local core.hooksPath hooks`
diff --git a/hooks/pre-commit b/hooks/pre-commit
new file mode 100755
index 0000000..2e918a1
--- /dev/null
+++ b/hooks/pre-commit
@@ -0,0 +1,13 @@
+#!/bin/bash
+for FILE in $(git diff --cached --name-only)
+do
+	if [[ "$FILE" =~ src/[A-Za-z0-9\ \-]+*\.(c|h|cpp|cc)$ ]]; then
+		echo Autoformatting $FILE with clang-format
+		clang-format-11 -style=file -i -- $FILE
+		git add -- $FILE
+	elif [[ "$FILE" =~ src/(components|displayapp|drivers|heartratetask|logging|systemtask)/.*\.(c|h|cpp|cc)$ ]]; then
+		echo Autoformatting $FILE with clang-format
+		clang-format-11 -style=file -i -- $FILE
+		git add -- $FILE
+	fi
+done
-- 
cgit v0.10.2


From 10ef3a749ede4a27fe162bd730b26fb778ffaa85 Mon Sep 17 00:00:00 2001
From: Avamander <avamander@gmail.com>
Date: Sat, 1 May 2021 20:36:27 +0300
Subject: Added autodetection for clang-format version


diff --git a/hooks/pre-commit b/hooks/pre-commit
index 2e918a1..15961f1 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -1,13 +1,19 @@
 #!/bin/bash
+if clang-format --version | grep -q 'version 11\.'; then
+   CLANG_FORMAT_EXECUTABLE="clang-format"
+else
+   CLANG_FORMAT_EXECUTABLE="clang-format-11"
+fi
+
 for FILE in $(git diff --cached --name-only)
 do
 	if [[ "$FILE" =~ src/[A-Za-z0-9\ \-]+*\.(c|h|cpp|cc)$ ]]; then
-		echo Autoformatting $FILE with clang-format
-		clang-format-11 -style=file -i -- $FILE
+		echo Autoformatting $FILE with $CLANG_FORMAT_EXECUTABLE
+		$CLANG_FORMAT_EXECUTABLE -style=file -i -- $FILE
 		git add -- $FILE
 	elif [[ "$FILE" =~ src/(components|displayapp|drivers|heartratetask|logging|systemtask)/.*\.(c|h|cpp|cc)$ ]]; then
-		echo Autoformatting $FILE with clang-format
-		clang-format-11 -style=file -i -- $FILE
+		echo Autoformatting $FILE with $CLANG_FORMAT_EXECUTABLE
+		$CLANG_FORMAT_EXECUTABLE -style=file -i -- $FILE
 		git add -- $FILE
 	fi
 done
-- 
cgit v0.10.2


From 1ba99d242788b50b26b739d571d4866a6c2d0fed Mon Sep 17 00:00:00 2001
From: Avamander <avamander@gmail.com>
Date: Mon, 3 May 2021 14:12:33 +0300
Subject: Made the pre-commit hook fail explicitly when the executable doesn't
 exist


diff --git a/hooks/pre-commit b/hooks/pre-commit
index 15961f1..5e10aa1 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -5,6 +5,12 @@ else
    CLANG_FORMAT_EXECUTABLE="clang-format-11"
 fi
 
+if ! command -v $CLANG_FORMAT_EXECUTABLE &> /dev/null
+then
+    echo $CLANG_FORMAT_EXECUTABLE does not exist, make sure to install it
+    exit 1
+fi
+
 for FILE in $(git diff --cached --name-only)
 do
 	if [[ "$FILE" =~ src/[A-Za-z0-9\ \-]+*\.(c|h|cpp|cc)$ ]]; then
-- 
cgit v0.10.2


From ce26ef8a67f75e551975942c3217a4fd6846f591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 24 Jul 2021 20:23:44 +0200
Subject: Add PineTimeStyle in the list of watchface in README.md


diff --git a/README.md b/README.md
index bd23c86..4ff2128 100644
--- a/README.md
+++ b/README.md
@@ -41,9 +41,10 @@ As of now, here is the list of achievements of this project:
     * Brightness settings
     * Flashlight
     * Settings
- - 2 watch faces:
+ - 3 watch faces:
     * Digital
     * Analog
+    * [PineTimeStyle](https://wiki.pine64.org/wiki/PineTimeStyle)
  - Multiple 'apps' :
     * Music (control the playback of the music on your phone)
     * Heart rate (controls the heart rate sensor and display current heartbeat)
-- 
cgit v0.10.2


From 34949a47c59e7a4d8f67a0188bba6d08a046340d Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sat, 24 Jul 2021 21:29:10 +0300
Subject: Dim screen before sleep (#464)

* Implement dimming

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index b094839..b5ad26f 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -165,8 +165,15 @@ void DisplayApp::Refresh() {
   lastWakeTime = xTaskGetTickCount();
   if (messageReceived) {
     switch (msg) {
-      case Messages::GoToSleep:
+      case Messages::DimScreen:
+        // Backup brightness is the brightness to return to after dimming or sleeping
         brightnessController.Backup();
+        brightnessController.Set(Controllers::BrightnessController::Levels::Low);
+        break;
+      case Messages::RestoreBrightness:
+        brightnessController.Restore();
+        break;
+      case Messages::GoToSleep:
         while (brightnessController.Level() != Controllers::BrightnessController::Levels::Off) {
           brightnessController.Lower();
           vTaskDelay(100);
@@ -230,6 +237,8 @@ void DisplayApp::Refresh() {
             }
           } else if (returnTouchEvent == gesture) {
             LoadApp(returnToApp, returnDirection);
+            brightnessController.Set(settingsController.GetBrightness());
+            brightnessController.Backup();
           } else if (touchMode == TouchModes::Gestures) {
             if (gesture == TouchEvents::Tap) {
               lvgl.SetNewTapEvent(info.x, info.y);
@@ -243,6 +252,8 @@ void DisplayApp::Refresh() {
         } else {
           if (!currentScreen->OnButtonPushed()) {
             LoadApp(returnToApp, returnDirection);
+            brightnessController.Set(settingsController.GetBrightness());
+            brightnessController.Backup();
           }
         }
         break;
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index ce65f84..322505e 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -13,8 +13,10 @@ namespace Pinetime {
         NewNotification,
         TimerDone,
         BleFirmwareUpdateStarted,
-        UpdateTimeOut
+        UpdateTimeOut,
+        DimScreen,
+        RestoreBrightness
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 7efd1d6..8915ce7 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -33,6 +33,13 @@ namespace {
   }
 }
 
+void DimTimerCallback(TimerHandle_t xTimer) {
+
+  NRF_LOG_INFO("DimTimerCallback");
+  auto sysTask = static_cast<SystemTask*>(pvTimerGetTimerID(xTimer));
+  sysTask->OnDim();
+}
+
 void IdleTimerCallback(TimerHandle_t xTimer) {
 
   NRF_LOG_INFO("IdleTimerCallback");
@@ -105,7 +112,7 @@ void SystemTask::Work() {
   APP_GPIOTE_INIT(2);
 
   app_timer_init();
-  
+
   spi.Init();
   spiNorFlash.Init();
   spiNorFlash.Wakeup();
@@ -114,7 +121,6 @@ void SystemTask::Work() {
 
   nimbleController.Init();
   nimbleController.StartAdvertising();
-  brightnessController.Init();
   lcd.Init();
 
   twiMaster.Init();
@@ -179,8 +185,9 @@ void SystemTask::Work() {
     nrf_gpio_cfg_sense_input(pinPowerPresentIrq, NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_HIGH);
   }
 
-  idleTimer = xTimerCreate("idleTimer", pdMS_TO_TICKS(settingsController.GetScreenTimeOut()), pdFALSE, this, IdleTimerCallback);
-  xTimerStart(idleTimer, 0);
+  idleTimer = xTimerCreate("idleTimer", pdMS_TO_TICKS(2000), pdFALSE, this, IdleTimerCallback);
+  dimTimer = xTimerCreate("dimTimer", pdMS_TO_TICKS(settingsController.GetScreenTimeOut() - 2000), pdFALSE, this, DimTimerCallback);
+  xTimerStart(dimTimer, 0);
 
 // Suppress endless loop diagnostic
 #pragma clang diagnostic push
@@ -208,7 +215,7 @@ void SystemTask::Work() {
           doNotGoToSleep = true;
           break;
         case Messages::UpdateTimeOut:
-          xTimerChangePeriod(idleTimer, pdMS_TO_TICKS(settingsController.GetScreenTimeOut()), 0);
+          xTimerChangePeriod(dimTimer, pdMS_TO_TICKS(settingsController.GetScreenTimeOut() - 2000), 0);
           break;
         case Messages::GoToRunning:
           spi.Wakeup();
@@ -220,7 +227,7 @@ void SystemTask::Work() {
           }
 
           nimbleController.StartAdvertising();
-          xTimerStart(idleTimer, 0);
+          xTimerStart(dimTimer, 0);
           spiNorFlash.Wakeup();
           lcd.Wakeup();
 
@@ -230,6 +237,7 @@ void SystemTask::Work() {
 
           isSleeping = false;
           isWakingUp = false;
+          isDimmed = false;
           break;
         case Messages::TouchWakeUp: {
           twiMaster.Wakeup();
@@ -246,6 +254,7 @@ void SystemTask::Work() {
           isGoingToSleep = true;
           NRF_LOG_INFO("[systemtask] Going to sleep");
           xTimerStop(idleTimer, 0);
+          xTimerStop(dimTimer, 0);
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToSleep);
           heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::GoToSleep);
           break;
@@ -283,13 +292,15 @@ void SystemTask::Work() {
             NVIC_SystemReset();
           }
           doNotGoToSleep = false;
-          xTimerStart(idleTimer, 0);
+          xTimerStart(dimTimer, 0);
           break;
         case Messages::OnTouchEvent:
           ReloadIdleTimer();
+          displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
           break;
         case Messages::OnButtonEvent:
           ReloadIdleTimer();
+          displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonPushed);
           break;
         case Messages::OnDisplayTaskSleeping:
           if (BootloaderVersion::IsValid()) {
@@ -381,7 +392,6 @@ void SystemTask::OnButtonPushed() {
   if (!isSleeping) {
     NRF_LOG_INFO("[systemtask] Button pushed");
     PushMessage(Messages::OnButtonEvent);
-    displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonPushed);
   } else {
     if (!isWakingUp) {
       NRF_LOG_INFO("[systemtask] Button pushed, waking up");
@@ -402,7 +412,6 @@ void SystemTask::OnTouchEvent() {
     return;
   if (!isSleeping) {
     PushMessage(Messages::OnTouchEvent);
-    displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
   } else if (!isWakingUp) {
     if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap) or
         settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) {
@@ -430,6 +439,15 @@ void SystemTask::PushMessage(System::Messages msg) {
   }
 }
 
+void SystemTask::OnDim() {
+  if (doNotGoToSleep)
+    return;
+  NRF_LOG_INFO("Dim timeout -> Dim screen")
+  displayApp.PushMessage(Pinetime::Applications::Display::Messages::DimScreen);
+  xTimerStart(idleTimer, 0);
+  isDimmed = true;
+}
+
 void SystemTask::OnIdle() {
   if (doNotGoToSleep)
     return;
@@ -437,8 +455,13 @@ void SystemTask::OnIdle() {
   PushMessage(Messages::GoToSleep);
 }
 
-void SystemTask::ReloadIdleTimer() const {
+void SystemTask::ReloadIdleTimer() {
   if (isSleeping || isGoingToSleep)
     return;
-  xTimerReset(idleTimer, 0);
+  if (isDimmed) {
+    displayApp.PushMessage(Pinetime::Applications::Display::Messages::RestoreBrightness);
+    isDimmed = false;
+  }
+  xTimerReset(dimTimer, 0);
+  xTimerStop(idleTimer, 0);
 }
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index f8cf637..ba43429 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -71,6 +71,7 @@ namespace Pinetime {
       void OnTouchEvent();
 
       void OnIdle();
+      void OnDim();
 
       Pinetime::Controllers::NimbleController& nimble() {
         return nimbleController;
@@ -99,6 +100,7 @@ namespace Pinetime {
       std::atomic<bool> isSleeping {false};
       std::atomic<bool> isGoingToSleep {false};
       std::atomic<bool> isWakingUp {false};
+      std::atomic<bool> isDimmed {false};
       Pinetime::Drivers::Watchdog& watchdog;
       Pinetime::Controllers::NotificationManager& notificationManager;
       Pinetime::Controllers::MotorController& motorController;
@@ -106,8 +108,6 @@ namespace Pinetime {
       Pinetime::Drivers::Bma421& motionSensor;
       Pinetime::Controllers::Settings& settingsController;
       Pinetime::Controllers::HeartRateController& heartRateController;
-            
-      Controllers::BrightnessController brightnessController;
       Pinetime::Controllers::MotionController& motionController;
 
       Pinetime::Applications::DisplayApp& displayApp;
@@ -126,9 +126,10 @@ namespace Pinetime {
 
       static void Process(void* instance);
       void Work();
-      void ReloadIdleTimer() const;
+      void ReloadIdleTimer();
       bool isBleDiscoveryTimerRunning = false;
       uint8_t bleDiscoveryTimer = 0;
+      TimerHandle_t dimTimer;
       TimerHandle_t idleTimer;
       bool doNotGoToSleep = false;
 
-- 
cgit v0.10.2


From ec2469a6c1efea44692cf5e3a90160f96a6013d3 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 25 Jul 2021 17:54:05 +0300
Subject: Code cleanup (#466)

* Code cleanup
* Remove override again

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index b5ad26f..d4a73f5 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -202,7 +202,7 @@ void DisplayApp::Refresh() {
         break;
       case Messages::TimerDone:
         if (currentApp == Apps::Timer) {
-          auto *timer = static_cast<Screens::Timer*>(currentScreen.get());
+          auto* timer = static_cast<Screens::Timer*>(currentScreen.get());
           timer->setDone();
         } else {
           LoadApp(Apps::Timer, DisplayApp::FullRefreshDirections::Down);
@@ -268,7 +268,7 @@ void DisplayApp::Refresh() {
     }
   }
 
-  if(nextApp != Apps::None) {
+  if (nextApp != Apps::None) {
     LoadApp(nextApp, nextDirection);
     nextApp = Apps::None;
   }
@@ -383,8 +383,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SysInfo:
-      currentScreen =
-        std::make_unique<Screens::SystemInfo>(this, dateTimeController, batteryController, brightnessController, bleController, watchdog, motionController);
+      currentScreen = std::make_unique<Screens::SystemInfo>(
+        this, dateTimeController, batteryController, brightnessController, bleController, watchdog, motionController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::FlashLight:
@@ -429,7 +429,7 @@ void DisplayApp::IdleState() {
 }
 
 void DisplayApp::PushMessage(Messages msg) {
-  if(in_isr()) {
+  if (in_isr()) {
     BaseType_t xHigherPriorityTaskWoken;
     xHigherPriorityTaskWoken = pdFALSE;
     xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);
@@ -471,7 +471,7 @@ void DisplayApp::SetTouchMode(DisplayApp::TouchModes mode) {
 }
 
 void DisplayApp::PushMessageToSystemTask(Pinetime::System::Messages message) {
-  if(systemTask != nullptr)
+  if (systemTask != nullptr)
     systemTask->PushMessage(message);
 }
 
diff --git a/src/displayapp/screens/Label.h b/src/displayapp/screens/Label.h
index 62b80be..834f8c8 100644
--- a/src/displayapp/screens/Label.h
+++ b/src/displayapp/screens/Label.h
@@ -15,8 +15,6 @@ namespace Pinetime {
         bool Refresh() override;
 
       private:
-        bool running = true;
-
         lv_obj_t* labelText = nullptr;
         lv_point_t pageIndicatorBasePoints[2];
         lv_point_t pageIndicatorPoints[2];
@@ -25,4 +23,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index a8bb3c1..43a5575 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -32,11 +32,10 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
   lv_label_set_recolor(label, true);
-  
+
   labelStep = lv_label_create(lv_scr_act(), NULL);
   lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
   lv_label_set_text(labelStep, "Steps ---");
-
 }
 
 Motion::~Motion() {
@@ -50,13 +49,12 @@ bool Motion::Refresh() {
 
   lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps());
 
-  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
+  lv_label_set_text_fmt(label,
+                        "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#",
+                        motionController.X() / 0x10,
+                        motionController.Y() / 0x10,
+                        motionController.Z() / 0x10);
   lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
 
   return running;
 }
-
-bool Motion::OnButtonPushed() {
-  running = false;
-  return true;
-}
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index 132b20e..7e65197 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -18,7 +18,6 @@ namespace Pinetime {
         ~Motion() override;
 
         bool Refresh() override;
-        bool OnButtonPushed() override;
 
       private:
         Controllers::MotionController& motionController;
@@ -29,10 +28,7 @@ namespace Pinetime {
         lv_obj_t* label;
 
         lv_obj_t* labelStep;
-        static constexpr uint8_t nbStepsBufferSize = 9;
-        char nbStepsBuffer[nbStepsBufferSize + 1];
-        bool running = true;
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 591f3a4..0efb4dc 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -264,23 +264,23 @@ bool PineTimeStyle::Refresh() {
     char hoursChar[3];
     char ampmChar[5];
 
-      if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
-        sprintf(hoursChar, "%02d", hour);
-      } else {
-        if (hour == 0 && hour != 12) {
-          hour = 12;
-          sprintf(ampmChar, "A\nM");
-        } else if (hour == 12 && hour != 0) {
-          hour = 12;
-          sprintf(ampmChar, "P\nM");
-        } else if (hour < 12 && hour != 0) {
-          sprintf(ampmChar, "A\nM");
-        } else if (hour > 12 && hour != 0) {
-          hour = hour - 12;
-          sprintf(ampmChar, "P\nM");
-        }
-        sprintf(hoursChar, "%02d", hour);
+    if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
+      sprintf(hoursChar, "%02d", hour);
+    } else {
+      if (hour == 0 && hour != 12) {
+        hour = 12;
+        sprintf(ampmChar, "A\nM");
+      } else if (hour == 12 && hour != 0) {
+        hour = 12;
+        sprintf(ampmChar, "P\nM");
+      } else if (hour < 12 && hour != 0) {
+        sprintf(ampmChar, "A\nM");
+      } else if (hour > 12 && hour != 0) {
+        hour = hour - 12;
+        sprintf(ampmChar, "P\nM");
       }
+      sprintf(hoursChar, "%02d", hour);
+    }
 
     if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
         minutesChar[1] != displayedChar[3]) {
@@ -292,9 +292,9 @@ bool PineTimeStyle::Refresh() {
       char hourStr[3];
       char minStr[3];
 
-    if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
+      if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
         lv_label_set_text(timeAMPM, ampmChar);
-    }
+      }
 
       /* Display the time as 2 pairs of digits */
       sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
index 6aabd30..d72e833 100644
--- a/src/displayapp/screens/Steps.cpp
+++ b/src/displayapp/screens/Steps.cpp
@@ -5,13 +5,10 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Steps::Steps(
-    Pinetime::Applications::DisplayApp *app,
-    Controllers::MotionController& motionController,
-    Controllers::Settings &settingsController)
-      : Screen(app),
-      motionController{motionController},
-      settingsController{settingsController} {
+Steps::Steps(Pinetime::Applications::DisplayApp* app,
+             Controllers::MotionController& motionController,
+             Controllers::Settings& settingsController)
+  : Screen(app), motionController {motionController}, settingsController {settingsController} {
 
   stepsArc = lv_arc_create(lv_scr_act(), nullptr);
 
@@ -34,12 +31,12 @@ Steps::Steps(
   lv_label_set_text_fmt(lSteps, "%li", stepsCount);
   lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
 
-  lv_obj_t * lstepsL = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_t* lstepsL = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
   lv_label_set_text_static(lstepsL, "Steps");
   lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
 
-  lv_obj_t * lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_t* lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
   lv_label_set_text_fmt(lstepsGoal, "Goal\n%lu", settingsController.GetStepsGoal());
   lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER);
@@ -59,10 +56,10 @@ Steps::~Steps() {
 bool Steps::Refresh() {
 
   stepsCount = motionController.NbSteps();
-  
+
   lv_label_set_text_fmt(lSteps, "%li", stepsCount);
   lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
-  
+
   lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
 
   return running;
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index f5bf0cc..853434d 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -70,11 +70,6 @@ bool SystemInfo::Refresh() {
   return running;
 }
 
-bool SystemInfo::OnButtonPushed() {
-  running = false;
-  return true;
-}
-
 bool SystemInfo::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }
diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h
index 9d471f6..a9ad652 100644
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -31,12 +31,9 @@ namespace Pinetime {
                             Pinetime::Controllers::MotionController& motionController);
         ~SystemInfo() override;
         bool Refresh() override;
-        bool OnButtonPushed() override;
         bool OnTouchEvent(TouchEvents event) override;
 
       private:
-        bool running = true;
-
         Pinetime::Controllers::DateTime& dateTimeController;
         Pinetime::Controllers::Battery& batteryController;
         Pinetime::Controllers::BrightnessController& brightnessController;
@@ -56,4 +53,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 3fb9c70..2cd2487 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -27,7 +27,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
     batteryController {batteryController},
     dateTimeController {dateTimeController},
     brightness {brightness},
-    motorController{motorController},
+    motorController {motorController},
     settingsController {settingsController} {
 
   // Time
@@ -154,10 +154,6 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
   }
 }
 
-bool QuickSettings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  return false;
-}
-
 bool QuickSettings::Refresh() {
   return running;
 }
diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
index a14f46b..e0fc0a8 100644
--- a/src/displayapp/screens/settings/QuickSettings.h
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -29,7 +29,6 @@ namespace Pinetime {
 
         bool Refresh() override;
 
-        bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
         void UpdateScreen();
-- 
cgit v0.10.2


From 7a6ceadb24a57ae041d02f5a73f484f587517e32 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 25 Jul 2021 18:50:55 +0300
Subject: Update documentation (#467)

* Fix and update documentation
* Add newlines

diff --git a/README.md b/README.md
index 4ff2128..d9de400 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-
 # PineTime
 
 [![Build PineTime Firmware](https://github.com/JF002/InfiniTime/workflows/Build%20PineTime%20Firmware/badge.svg?branch=master)](https://github.com/JF002/InfiniTime/actions)
@@ -12,9 +11,10 @@
 The **Pinetime** smartwatch is built around the NRF52832 MCU (512KB Flash, 64KB RAM), a 240*240 LCD display driven by the ST7789 controller, an accelerometer, a heart rate sensor, and a vibration motor.
 
 # InfiniTime
+
 ![InfiniTime logo](images/infinitime-logo.jpg "InfiniTime Logo")
 
-The goal of this project is to design an open-source firmware for the Pinetime smartwatch : 
+The goal of this project is to design an open-source firmware for the Pinetime smartwatch :
 
  - Code written in **modern C++**;
  - Build system based on **CMake**;
@@ -36,7 +36,7 @@ As of now, here is the list of achievements of this project:
  - Heart rate measurements
  - Step counting
  - Wake-up on wrist rotation
- - Quick actions 
+ - Quick actions
     * Disable vibration on notification
     * Brightness settings
     * Flashlight
@@ -46,20 +46,22 @@ As of now, here is the list of achievements of this project:
     * Analog
     * [PineTimeStyle](https://wiki.pine64.org/wiki/PineTimeStyle)
  - Multiple 'apps' :
-    * Music (control the playback of the music on your phone)
-    * Heart rate (controls the heart rate sensor and display current heartbeat)
+    * Music (control the playback of music on your phone)
+    * Heart rate (measure your heart rate)
     * Navigation (displays navigation instructions coming from the companion app)
     * Notification (displays the last notification received)
     * Paddle (single player pong-like game)
-    * Two (2048 clone game)
-    * Stopwatch (with all the necessary functions such as play, pause, lap, stop)
-    * Motion sensor and step counter (displays the number of steps and the state of the motion sensor in real-time)
+    * Twos (2048 clone game)
+    * Stopwatch
+    * Steps (displays the number of steps taken)
+    * Timer (set a countdown timer that will notify you when it expires)
     * Metronome (vibrates to a given bpm with a customizable beats per bar)
  - User settings:
     * Display timeout
     * Wake-up condition
     * Time format (12/24h)
     * Default watch face
+    * Daily step goal
     * Battery status
     * Firmware validation
     * System information
@@ -70,18 +72,21 @@ As of now, here is the list of achievements of this project:
     * **[Experimental]** [WebBLEWatch](https://hubmartin.github.io/WebBLEWatch/) Synchronize time directly from your web browser. [video](https://youtu.be/IakiuhVDdrY)
  - OTA (Over-the-air) update via BLE
  - [Bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader) based on [MCUBoot](https://juullabs-oss.github.io/mcuboot/)
- 
+
 ## Documentation
 
 ### Getting started
+
  - [Getting started with InfiniTime 1.0 (quick user guide, update bootloader and InfiniTime,...)](doc/gettingStarted/gettingStarted-1.0.md)
  - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/ota-gadgetbridge-nrfconnect.md)
 
 ### Develop
+
  - [Generate the fonts and symbols](src/displayapp/fonts/README.md)
  - [Creating a stopwatch in Pinetime(article)](https://pankajraghav.com/2021/04/03/PINETIME-STOPCLOCK.html)
 
 ### Build, flash and debug
+
  - [Project branches](doc/branches.md)
  - [Versioning](doc/versioning.md)
  - [Files included in the release notes](doc/filesInReleaseNotes.md)
@@ -94,20 +99,23 @@ As of now, here is the list of achievements of this project:
  - Using files from the releases
 
 ### Contribute
+
  - [How to contribute ?](doc/contribute.md)
 
 ### API
+
  - [BLE implementation and API](./doc/ble.md)
- 
+
 ### Architecture and technical topics
+
  - [Memory analysis](./doc/MemoryAnalysis.md)
- 
+
 ### Using the firmware
+
  - [Integration with Gadgetbridge](doc/companionapps/Gadgetbridge.md)
  - [Integration with AmazFish](doc/companionapps/Amazfish.md)
  - [Firmware update, OTA](doc/companionapps/NrfconnectOTA.md)
- 
-    
+
 ## TODO - contribute
 
 This project is far from being finished, and there are still a lot of things to do for this project to become a firmware usable by the general public.
@@ -121,12 +129,13 @@ Here a quick list out of my head of things to do for this project:
  - Measure power consumption and improve battery life
  - Improve documentation, take better pictures and video than mine
  - Improve the UI
- - Create companion app for multiple OSes (Linux, Android, iOS) and platforms (desktop, ARM, mobile). Do not forget the other devices from Pine64 like [the Pinephone](https://www.pine64.org/pinephone/) and the [Pinebook Pro](https://www.pine64.org/pinebook-pro/). 
+ - Create companion app for multiple OSes (Linux, Android, iOS) and platforms (desktop, ARM, mobile). Do not forget the other devices from Pine64 like [the Pinephone](https://www.pine64.org/pinephone/) and the [Pinebook Pro](https://www.pine64.org/pinebook-pro/).
  - Design a simple CI (preferably self-hosted and easy to reproduce).
- 
+
 Do not hesitate to clone/fork the code, hack it and create pull-requests. I'll do my best to review and merge them :)
 
 ## Licenses
+
 This project is released under the GNU General Public License version 3 or, at your option, any later version.
 
 It integrates the following projects:
@@ -134,8 +143,9 @@ It integrates the following projects:
  - UI : **[LittleVGL/LVGL](https://lvgl.io/)** under the MIT license
  - BLE stack : **[NimBLE](https://github.com/apache/mynewt-nimble)** under the Apache 2.0 license
  - Font : **[Jetbrains Mono](https://www.jetbrains.com/fr-fr/lp/mono/)** under the Apache 2.0 license
-  
-## Credits 
+
+## Credits
+
 I’m not working alone on this project. First, many people create PR for this projects. Then, there is the whole #pinetime community : a lot of people all around the world who are hacking, searching, experimenting and programming the Pinetime. We exchange our ideas, experiments and code in the chat rooms and forums.
 
 Here are some people I would like to highlight:
diff --git a/doc/gettingStarted/gettingStarted-1.0.md b/doc/gettingStarted/gettingStarted-1.0.md
index 2ac22b9..88ff207 100644
--- a/doc/gettingStarted/gettingStarted-1.0.md
+++ b/doc/gettingStarted/gettingStarted-1.0.md
@@ -1,7 +1,9 @@
 # Getting started with InfiniTime 1.0
+
 On April 22 2021, InfiniTime and Pine64 [announced the release of InfiniTime 1.0](https://www.pine64.org/2021/04/22/its-time-infinitime-1-0/) and the availability of PineTime smartwatches as *enthusiast grade end-user product*. This page aims to guide you with your first step with your new PineTime.
 
 ## Firmware, InfiniTime, Bootloader, Recovery firmware, OTA, DFU... What is it?
+
 You might have already seen these words by reading the announcement, release notes, or [the wiki guide](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0) and, you may find them misleading if you're not familiar with the project.
 
 Basically, a **firmware** is just a software running on the embedded hardware of a device, the PineTime in this case.
@@ -13,9 +15,10 @@ Basically, a **firmware** is just a software running on the embedded hardware of
 **OTA** and **DFU** refer to the update of the firmware over BLE (**B**luetooth **L**ow **E**nergy). **OTA** means **O**ver **T**he **A**ir, this is a functionality that allows the user to update the firmware how their device using a wireless communication like BLE. When we talk about **DFU** (**D**igital **F**irmware **U**pdate), we refer to the file format and protocol used to send the update of the firmware to the watch over-the-air. InfiniTime implement the (legacy) DFU protocol from Nordic Semiconductor (NRF).
 
 ## How to check the version of InfiniTime and the bootloader?
+
 Since September 2020, all PineTimes (devkits or sealed) are flashed using the **[first iteration of the bootloader](https://github.com/lupyuen/pinetime-rust-mynewt/releases/tag/v4.1.7)** and **[InfiniTime 0.7.1](https://github.com/JF002/InfiniTime/releases/tag/0.7.1)**. There was no recovery firmware at that time.
 
-The bootloader only runs when the watch starts (from an empty battery, for example) or after a reset (after a succesful OTA or a manual reset - long push on the button). 
+The bootloader only runs when the watch starts (from an empty battery, for example) or after a reset (after a successful OTA or a manual reset - long push on the button).
 
 You can recognize this first iteration of the bootloader with it greenish **PINETIME** logo.
 
@@ -30,14 +33,14 @@ And for version >= 1.0 :
 
 ![InfiniTime 1.0 version](version-1.0.jpg)
 
-
-PineTime shipped from June 2020 (to be confirmed) will be flashed with the [new version of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0), the [recovery firmware](https://github.com/JF002/InfiniTime/releases/tag/0.14.1) and [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/tag/1.0.0).
+PineTime shipped from June 2021 (to be confirmed) will be flashed with the [new version of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0), the [recovery firmware](https://github.com/JF002/InfiniTime/releases/tag/0.14.1) and [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/tag/1.0.0).
 
 The bootloader is easily recognizable with it white pine cone that is progressively drawn in green. It also displays its own version on the bottom (1.0.0 as of now).
 
 ![Bootloader 1.0](bootloader-1.0.jpg)
 
 ## How to update your PineTime?
+
 To update your PineTime, you can use one of the compatible companion applications. Here are the main ones:
 
  - **[Amazfish](https://github.com/piggz/harbour-amazfish)** (Desktop Linux, mobile Linux, SailfishOS, runs on the PinebookPro and the Pinephone)
@@ -45,36 +48,41 @@ To update your PineTime, you can use one of the compatible companion application
  - **[Siglo](https://github.com/alexr4535/siglo)** (Linux, GTK based)
  - **NRFConnect** (closed source, Android & iOS).
 
-See [this page](ota-gadgetbridge-nrfconnect.md) for more info about the OTA procedure using Gadgetbrige and NRFCOnnect.
+See [this page](ota-gadgetbridge-nrfconnect.md) for more info about the OTA procedure using Gadgetbridge and NRFConnect.
 
 ### From InfiniTime 0.7.1 / old bootloader
+
 If your PineTime is currently running InfiniTime 0.7.1 and the old bootloader, we strongly recommend you update them to more recent version (Bootloader 1.0.0 and InfiniTime 1.0.0 as of now). We also recommend you install the recovery firmware once the bootloader is up-do-date.
 
 Using the companion app of your choice, you'll need to apply the OTA procedure for these 3 firmwares in this sequence (failing to follow this specific order might temporarily or permanently brick your device):
- 
+
  1. Flash the latest version of InfiniTime. The file to upload is named **pinetime-mcuboot-app-dfu-x.y.z.zip**. Here is the link to [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/download/1.0.0/pinetime-mcuboot-app-dfu-1.0.0.zip).
- 2. Update the bootloader by applying the OTA procedure with the file named [**reloader-mcuboot.zip** from the repo of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/download/1.0.0/reloader-mcuboot.zip). 
+ 2. Update the bootloader by applying the OTA procedure with the file named [**reloader-mcuboot.zip** from the repo of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/download/1.0.0/reloader-mcuboot.zip).
  3. Install the recovery firmware by applying the OTA procedure with the file named [**pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip** from the version 0.14.1 of InfiniTime](https://github.com/JF002/InfiniTime/releases/download/0.14.1/pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip).
 
 You'll find more info about this process in [this wiki page](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0). You can also see the procedure in video [here](https://video.codingfield.com/videos/watch/831077c5-16f3-47b4-9b2b-c4bbfecc6529) and [here (from Amazfish)](https://video.codingfield.com/videos/watch/f7bffb3d-a6a1-43c4-8f01-f4aeff4adf9e)
 
 ### From version > 1.0
+
 If you are already running the new "1.0.0" bootloader, all you have to do is update your version of InfiniTime when it'll be available. We'll write specific instructions when (if) we release a new version of the bootloader.
 
 ### Firmware validation
-The bootloader requires a (manual) validation of the firmware. If the watch reset with an updated firmware that was not validated, the bootloader will consider it as non-functionning and will revert to the previous version of the firmware. This is a safety feature to prevent bricking your device with a faulty firmware.
+
+The bootloader requires a (manual) validation of the firmware. If the watch reset with an updated firmware that was not validated, the bootloader will consider it as non-functioning and will revert to the previous version of the firmware. This is a safety feature to prevent bricking your device with a faulty firmware.
 
 You can validate your updated firmware on InfiniTime >= 1.0 by following this simple procedure:
- 
+
  - From the watchface, swipe **right** to display the *Quick Actions menu*
  - Open the **Settings** app by tapping the *gear* icon on the bottom right
  - Swipe down and tap on the entry named **Firmware**
  - This app shows the version that is currently running. If it's not validated yet, it displays 2 buttons:
     - **Validate** to validate your firmware
     - **Reset** to reset the watch and revert to the previously running version of the firmware
-    
+
 ## InfiniTime 1.0 quick user guide
+
 ### Setting the time
+
 By default, InfiniTime starts on the digital watchface. It'll probably display the epoch time (1 Jan 1970, 00:00). The time will be automatically synchronized once you connect on of the companion app to your PineTime using BLE connectivity. InfiniTime does not provide any way to manually set the time for now.
 
 ### Navigation in the menu
@@ -90,7 +98,7 @@ By default, InfiniTime starts on the digital watchface. It'll probably display t
     - Start the **flashlight** app
     - Enable/disable vibrations on notifications (Do Not Disturb mode)
     - Enter the **settings** menu
- - Settings 
+ - Settings
     - Display timeout
     - Wake up event (Tap, wrist rotation)
     - Time format (12/24H)
@@ -104,9 +112,8 @@ By default, InfiniTime starts on the digital watchface. It'll probably display t
 Most of the time, the bootloader just runs without your intervention (update and load the firmware).
 
 However, you can enable 2 functionalities using the push button:
- 
+
  - Push the button until the pine cone is drawn in **blue** to force the rollback of the previous version of the firmware, even if you've already validated the updated one
  - Push the button until the pine cone is drawn in **red** to load the recovery firmware. This recovery firmware only provides BLE connectivity and OTA functionality.
 
 More info about the bootloader in [its project page](https://github.com/JF002/pinetime-mcuboot-bootloader/blob/master/README.md).
-
-- 
cgit v0.10.2


From a69be1520a61a9153be8e7f79bf6ad9972a9cf6b Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 9 Jul 2021 17:35:52 +0300
Subject: Add task state info to SystemInfo


diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index 853434d..2bb8481 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -207,28 +207,50 @@ bool SystemInfo::sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs) {
 std::unique_ptr<Screen> SystemInfo::CreateScreen4() {
   TaskStatus_t tasksStatus[7];
   lv_obj_t* infoTask = lv_table_create(lv_scr_act(), NULL);
-  lv_table_set_col_cnt(infoTask, 3);
+  lv_table_set_col_cnt(infoTask, 4);
   lv_table_set_row_cnt(infoTask, 8);
-  lv_obj_set_pos(infoTask, 10, 10);
+  lv_obj_set_pos(infoTask, 0, 10);
 
   lv_table_set_cell_value(infoTask, 0, 0, "#");
-  lv_table_set_col_width(infoTask, 0, 50);
-  lv_table_set_cell_value(infoTask, 0, 1, "Task");
-  lv_table_set_col_width(infoTask, 1, 80);
-  lv_table_set_cell_value(infoTask, 0, 2, "Free");
-  lv_table_set_col_width(infoTask, 2, 90);
+  lv_table_set_col_width(infoTask, 0, 30);
+  lv_table_set_cell_value(infoTask, 0, 1, "S"); // State
+  lv_table_set_col_width(infoTask, 1, 30);
+  lv_table_set_cell_value(infoTask, 0, 2, "Task");
+  lv_table_set_col_width(infoTask, 2, 80);
+  lv_table_set_cell_value(infoTask, 0, 3, "Free");
+  lv_table_set_col_width(infoTask, 3, 90);
 
   auto nb = uxTaskGetSystemState(tasksStatus, 7, nullptr);
   std::sort(tasksStatus, tasksStatus + nb, sortById);
   for (uint8_t i = 0; i < nb; i++) {
 
     lv_table_set_cell_value(infoTask, i + 1, 0, std::to_string(tasksStatus[i].xTaskNumber).c_str());
-    lv_table_set_cell_value(infoTask, i + 1, 1, tasksStatus[i].pcTaskName);
+    char state[2] = {0};
+    switch (tasksStatus[i].eCurrentState) {
+      case eReady:
+      case eRunning:
+        state[0] = 'R';
+        break;
+      case eBlocked:
+        state[0] = 'B';
+        break;
+      case eSuspended:
+        state[0] = 'S';
+        break;
+      case eDeleted:
+        state[0] = 'D';
+        break;
+      default:
+        state[0] = 'I'; // Invalid
+        break;
+    }
+    lv_table_set_cell_value(infoTask, i + 1, 1, state);
+    lv_table_set_cell_value(infoTask, i + 1, 2, tasksStatus[i].pcTaskName);
     if (tasksStatus[i].usStackHighWaterMark < 20) {
       std::string str1 = std::to_string(tasksStatus[i].usStackHighWaterMark) + " low";
-      lv_table_set_cell_value(infoTask, i + 1, 2, str1.c_str());
+      lv_table_set_cell_value(infoTask, i + 1, 3, str1.c_str());
     } else {
-      lv_table_set_cell_value(infoTask, i + 1, 2, std::to_string(tasksStatus[i].usStackHighWaterMark).c_str());
+      lv_table_set_cell_value(infoTask, i + 1, 3, std::to_string(tasksStatus[i].usStackHighWaterMark).c_str());
     }
   }
   return std::make_unique<Screens::Label>(3, 5, app, infoTask);
-- 
cgit v0.10.2


From f2f22184b08ce8f43c43f98e11dec88433868ec6 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 13 Jul 2021 16:30:24 +0300
Subject: Add new unique icons for some apps


diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index ec4beb8..8a26084 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -13,7 +13,7 @@
 * Do not enable font compression and horizontal subpixel hinting
 * Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x20-0x7f, 0x410-0x44f`
 * Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following
-  range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569`
+  range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015`
 * Click on Convert, and download the file `jetbrains_mono_bold_20.c` and copy it in `src/DisplayApp/Fonts`
 * Add the font .c file path to src/CMakeLists.txt
 * Add an LV_FONT_DECLARE line in src/libs/lv_conf.h
diff --git a/src/displayapp/fonts/jetbrains_mono_bold_20.c b/src/displayapp/fonts/jetbrains_mono_bold_20.c
index 98243bb..d870552 100644
--- a/src/displayapp/fonts/jetbrains_mono_bold_20.c
+++ b/src/displayapp/fonts/jetbrains_mono_bold_20.c
@@ -734,6 +734,15 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xff, 0x7, 0xef, 0xf0, 0x10, 0xff, 0x0, 0x3,
     0xc0, 0x0,
 
+    /* U+F015 "" */
+    0x0, 0x38, 0xe0, 0x0, 0xf9, 0xc0, 0x3, 0xfb,
+    0x80, 0x1e, 0x3f, 0x0, 0x79, 0x3e, 0x1, 0xe7,
+    0x3c, 0xf, 0x9f, 0xbc, 0x3c, 0xff, 0x9e, 0xf3,
+    0xff, 0x9e, 0xcf, 0xff, 0x98, 0x3f, 0xff, 0x80,
+    0x7f, 0xff, 0x0, 0xfc, 0x7e, 0x1, 0xf8, 0xfc,
+    0x3, 0xf1, 0xf8, 0x7, 0xe3, 0xf0, 0xf, 0xc7,
+    0xe0,
+
     /* U+F017 "" */
     0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfc, 0x1f,
     0xff, 0xc7, 0xf1, 0xfc, 0xfe, 0x3f, 0x9f, 0xc7,
@@ -823,6 +832,14 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xdf, 0x9e, 0x38, 0xf3, 0x7, 0x6, 0x0, 0xe0,
     0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x70, 0x0,
 
+    /* U+F06E "" */
+    0x0, 0xfe, 0x0, 0xf, 0xff, 0x80, 0x3e, 0xf,
+    0x80, 0xf8, 0xf, 0x83, 0xe3, 0x8f, 0x8f, 0x87,
+    0x8f, 0xbf, 0x1f, 0x9f, 0xfe, 0xff, 0x3f, 0xfd,
+    0xfe, 0x7e, 0xf9, 0xf8, 0xf8, 0xf9, 0xe3, 0xe0,
+    0xf8, 0xf, 0x80, 0xf8, 0x3e, 0x0, 0xff, 0xf0,
+    0x0, 0x3f, 0x80, 0x0,
+
     /* U+F095 "" */
     0x0, 0x0, 0x0, 0x0, 0x3e, 0x0, 0x7, 0xf0,
     0x0, 0x7f, 0x0, 0x7, 0xf0, 0x0, 0xff, 0x0,
@@ -861,6 +878,13 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x1, 0xf8, 0x0, 0x9f, 0xc0, 0xf, 0xfc, 0x0,
     0x7f, 0xc0, 0x7, 0xf8, 0x0, 0x1f, 0x0, 0x0,
 
+    /* U+F201 "" */
+    0x40, 0x0, 0x7, 0x0, 0x0, 0x38, 0x1, 0xf9,
+    0xc0, 0x7, 0xce, 0x18, 0x1e, 0x71, 0xe1, 0xf3,
+    0x9f, 0x9d, 0x9d, 0xff, 0xc4, 0xe6, 0x7c, 0x7,
+    0x1, 0xc0, 0x38, 0x0, 0x1, 0xc0, 0x0, 0xe,
+    0x0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0,
+
     /* U+F21E "" */
     0x1e, 0x7, 0x83, 0xf9, 0xfe, 0x7f, 0xff, 0xef,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xff, 0xfc,
@@ -1182,42 +1206,45 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 2484, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
     {.bitmap_index = 2498, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
     {.bitmap_index = 2511, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2561, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2609, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2659, .adv_w = 240, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 2688, .adv_w = 360, .box_w = 23, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 2743, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2782, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2825, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
-    {.bitmap_index = 2853, .adv_w = 280, .box_w = 18, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 2901, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2940, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 2979, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
-    {.bitmap_index = 3007, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3055, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3108, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3127, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3177, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3213, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3261, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3304, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3342, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3380, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3418, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3456, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
-    {.bitmap_index = 3494, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3530, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
-    {.bitmap_index = 3568, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3597, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 3635, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3701, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 3750, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3800, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 3860, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3913, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
-    {.bitmap_index = 3974, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4029, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 4082, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
+    {.bitmap_index = 2561, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2610, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 2658, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 2708, .adv_w = 240, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 2737, .adv_w = 360, .box_w = 23, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 2792, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2831, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2874, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
+    {.bitmap_index = 2902, .adv_w = 280, .box_w = 18, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 2950, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 2989, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3028, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
+    {.bitmap_index = 3056, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3104, .adv_w = 360, .box_w = 23, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 3148, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3201, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3220, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3270, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3306, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3354, .adv_w = 320, .box_w = 21, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 3394, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3437, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3475, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3513, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3551, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3589, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
+    {.bitmap_index = 3627, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3663, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+    {.bitmap_index = 3701, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3730, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 3768, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 3834, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 3883, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3933, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 3993, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4046, .adv_w = 360, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
+    {.bitmap_index = 4107, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4162, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 4215, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
 };
 
 /*---------------------
@@ -1225,11 +1252,11 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
  *--------------------*/
 
 static const uint16_t unicode_list_2[] = {
-    0x0, 0x16, 0x23, 0x26, 0x27, 0x28, 0x39, 0x47,
-    0x4a, 0x4b, 0x4c, 0x50, 0x68, 0x94, 0x128, 0x184,
-    0x1e5, 0x1fb, 0x21d, 0x23f, 0x240, 0x241, 0x242, 0x243,
-    0x251, 0x292, 0x293, 0x2f1, 0x3dc, 0x3fc, 0x45c, 0x54a,
-    0x55f, 0x568, 0x59e, 0x59f, 0x6a8
+    0x0, 0x14, 0x16, 0x23, 0x26, 0x27, 0x28, 0x39,
+    0x47, 0x4a, 0x4b, 0x4c, 0x50, 0x68, 0x6d, 0x94,
+    0x128, 0x184, 0x1e5, 0x1fb, 0x200, 0x21d, 0x23f, 0x240,
+    0x241, 0x242, 0x243, 0x251, 0x292, 0x293, 0x2f1, 0x3dc,
+    0x3fc, 0x45c, 0x54a, 0x55f, 0x568, 0x59e, 0x59f, 0x6a8
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
@@ -1245,7 +1272,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
     },
     {
         .range_start = 61441, .range_length = 1705, .glyph_id_start = 160,
-        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 37, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 40, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
     }
 };
 
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 78c7cd9..d6c3970 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
     {Symbols::paintbrush, Apps::Paint},
     {Symbols::paddle, Apps::Paddle},
     {"2", Apps::Twos},
-    {"M", Apps::Motion},
+    {Symbols::chartLine, Apps::Motion},
     {Symbols::drum, Apps::Metronome},
     {"", Apps::None},
   }};
diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h
index c9d6154..e68a7af 100644
--- a/src/displayapp/screens/Symbols.h
+++ b/src/displayapp/screens/Symbols.h
@@ -41,6 +41,9 @@ namespace Pinetime {
         static constexpr const char* hourGlass = "\xEF\x89\x92";
         static constexpr const char* lapsFlag = "\xEF\x80\xA4";
         static constexpr const char* drum = "\xEF\x95\xA9";
+        static constexpr const char* chartLine = "\xEF\x88\x81";
+        static constexpr const char* eye = "\xEF\x81\xAE";
+        static constexpr const char* home = "\xEF\x80\x95";
 
         // lv_font_sys_48.c
         static constexpr const char* settings = "\xEE\xA4\x82"; // e902
diff --git a/src/displayapp/screens/settings/SettingWakeUp.cpp b/src/displayapp/screens/settings/SettingWakeUp.cpp
index 0e08035..cce9a60 100644
--- a/src/displayapp/screens/settings/SettingWakeUp.cpp
+++ b/src/displayapp/screens/settings/SettingWakeUp.cpp
@@ -36,7 +36,7 @@ SettingWakeUp::SettingWakeUp(Pinetime::Applications::DisplayApp* app, Pinetime::
 
   lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  lv_label_set_text_static(icon, Symbols::clock);
+  lv_label_set_text_static(icon, Symbols::eye);
   lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
 
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 3e73489..02b9081 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -36,7 +36,7 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
 
   lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  lv_label_set_text_static(icon, Symbols::clock);
+  lv_label_set_text_static(icon, Symbols::home);
   lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
 
@@ -90,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index e63a358..0ab2137 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -41,9 +41,9 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
 
   std::array<Screens::List::Applications, 4> applications {{
     {Symbols::sun, "Display", Apps::SettingDisplay},
-    {Symbols::clock, "Wake Up", Apps::SettingWakeUp},
+    {Symbols::eye, "Wake Up", Apps::SettingWakeUp},
     {Symbols::clock, "Time format", Apps::SettingTimeFormat},
-    {Symbols::clock, "Watch face", Apps::SettingWatchFace},
+    {Symbols::home, "Watch face", Apps::SettingWatchFace},
   }};
 
   return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);
-- 
cgit v0.10.2


From 1ae22f45f97bf5135a23ab0dedd87d7fdaff82bd Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 13 Jul 2021 21:09:04 +0300
Subject: Fix cases where Get() isn't used


diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index 8e49c9d..6c9110c 100644
--- a/src/displayapp/screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
@@ -13,8 +13,12 @@ namespace Pinetime {
         DirtyValue() = default; // Use NSDMI
         explicit DirtyValue(T const& v) : value {v} {
         } // Use MIL and const-lvalue-ref
-        bool IsUpdated() const {
-          return isUpdated;
+        bool IsUpdated() {
+          if (this->isUpdated) {
+            this->isUpdated = false;
+            return true;
+          }
+          return false;
         }
         T const& Get() {
           this->isUpdated = false;
-- 
cgit v0.10.2


From 6222b7c22307b114fef0ddd2148472dbebbc5174 Mon Sep 17 00:00:00 2001
From: Grant <Volatile86@gmail.com>
Date: Sun, 25 Jul 2021 10:58:55 -0500
Subject: Correct spelling issue in documentation (#509)

* Correct spelling issue

diff --git a/doc/PinetimeStubWithNrf52DK.md b/doc/PinetimeStubWithNrf52DK.md
index 5213125..c485792 100644
--- a/doc/PinetimeStubWithNrf52DK.md
+++ b/doc/PinetimeStubWithNrf52DK.md
@@ -1,7 +1,7 @@
 # Build a stub for PineTime using NRF52-DK
 [NRF52-DK](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52-DK) is the official developpment kit for NRF52832 SoC from Nordic Semiconductor.
 
-It can be very useful for PineTime developpment:
+It can be very useful for PineTime development:
  * You can use it embedded JLink SWD programmer/debugger to program and debug you code on the PineTime
  * As it's based on the same SoC than the PineTime, you can program it to actually run the same code than the PineTime. 
  
@@ -47,4 +47,4 @@ You also need to enable the I/O expander to disconnect pins from buttons and led
 | --------- | --------- |
 | DETECT    | GND       |
 
-Now, you should be able to program the SoC on the NRF52-DK board, and use it as if it was running on the pintime.
\ No newline at end of file
+Now, you should be able to program the SoC on the NRF52-DK board, and use it as if it was running on the PineTime.
\ No newline at end of file
diff --git a/doc/ble.md b/doc/ble.md
index fdf1a5b..518b99c 100644
--- a/doc/ble.md
+++ b/doc/ble.md
@@ -5,9 +5,9 @@ This page describes the BLE implementation and API built in this firmware.
 **Note** : I'm a beginner in BLE related technologies and the information of this document reflect my current knowledge and understanding of the BLE stack. These informations might be erroneous or incomplete. Feel free to submit a PR if you think you can improve these.  
 
 ## BLE Connection
-When starting the firmware start a BLE advertising : it send small messages that can be received by any *central* device in range. This allows the device to announce its presence to other devices.
+When starting the firmware start a BLE advertising : it sends small messages that can be received by any *central* device in range. This allows the device to announce its presence to other devices.
 
-A companion application (running on a PC, RasberryPi, smartphone) which received this avertising packet can request a connection to the device. This connection procedure allows the 2 devices to negociate communication parameters, security keys,...
+A companion application (running on a PC, RaspberryPi, smartphone) which received this avertising packet can request a connection to the device. This connection procedure allows the 2 devices to negotiate communication parameters, security keys,...
 
 When the connection is established, the pinetime will try to discover services running on the companion application. For now **CTS** (**C**urrent **T**ime **S**ervice) and **ANS** (**A**lert **N**otification **S**ervice) are supported.
 
diff --git a/doc/branches.md b/doc/branches.md
index 0fb8316..ef280f4 100644
--- a/doc/branches.md
+++ b/doc/branches.md
@@ -2,7 +2,7 @@
 The branching model of this project is based on the workflow named [Git flow](https://nvie.com/posts/a-successful-git-branching-model/).
 
 It is based on 2 main branches:
- - **master** : this branch is always ready to be reployed. It means that at any time, we should be able to build the branch and release a new version of the application.
+ - **master** : this branch is always ready to be deployed. It means that at any time, we should be able to build the branch and release a new version of the application.
  - **develop** : this branch contains the latest development that will be integrated in the next release once it's considered as stable.
 
 New features should be implemented in **feature branches** created from **develop**. When the feature is ready, a pull-request is created and it'll be merge into **develop** when it is succesfully reviewed and accepted.
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md
index 5fe593a..87b6dd9 100644
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@@ -163,7 +163,7 @@ J-Link>g
 ```
 
 #### JLink RTT
-RTT is a feature from Segger's JLink devices that allows bidirectionnal communication between the debugger and the target. This feature can be used to get the logs from the embedded software on the development computer.
+RTT is a feature from Segger's JLink devices that allows bidirectional communication between the debugger and the target. This feature can be used to get the logs from the embedded software on the development computer.
 
  - Program the MCU with the code (see above)
  - Start JLinkExe
diff --git a/doc/buildWithDocker.md b/doc/buildWithDocker.md
index 17fb53d..2e4ecbb 100644
--- a/doc/buildWithDocker.md
+++ b/doc/buildWithDocker.md
@@ -13,7 +13,7 @@ Based on Ubuntu 18.04 with the following build dependencies:
 
 The `infinitime-build` image contains all the dependencies you need. The default `CMD` will compile sources found in `/sources`, so you need only mount your code. 
 
-This example  will build the firmware, generate the MCUBoot image and generate the DFU file. For cloning the repo, see [these instructions](../doc/buildAndProgram.md#clone-the-repo). Outputs will be written to **<project_root>/build/output**:
+This example will build the firmware, generate the MCUBoot image and generate the DFU file. For cloning the repo, see [these instructions](../doc/buildAndProgram.md#clone-the-repo). Outputs will be written to **<project_root>/build/output**:
 
 ```bash
 cd <project_root> # e.g. cd ./work/Pinetime
diff --git a/doc/contribute.md b/doc/contribute.md
index 09d2077..9f4c215 100644
--- a/doc/contribute.md
+++ b/doc/contribute.md
@@ -48,7 +48,7 @@ When reviewing PR, the author and contributors will first look at the **descript
 
 Then, reviewing **a few files that were modified for a single purpose** is a lot more easier than to review 30 files modified for many reasons (bug fix, UI improvements, typos in doc,...), even if all these changes make sense. Also, it's possible that we agree on some modification but not on some other, and we won't be able to merge the PR because of the changes that are not accepted.
 
-We do our best to keep the code as consistent as possible, and that mean we pay attention to the **formatting** of the code. If the code formatting is not consistent with our code base, we'll ask you to review it, which will take more time.
+We do our best to keep the code as consistent as possible, and that means we pay attention to the **formatting** of the code. If the code formatting is not consistent with our code base, we'll ask you to review it, which will take more time.
 
 The last step of the review consists in **testing** the modification. If it doesn't work out of the box, we'll ask your to review your code and to ensure that it works as expected.
 
diff --git a/doc/filesInReleaseNotes.md b/doc/filesInReleaseNotes.md
index 78c20b5..1a37fef 100644
--- a/doc/filesInReleaseNotes.md
+++ b/doc/filesInReleaseNotes.md
@@ -18,7 +18,7 @@ This firmware is standalone, meaning that it does not need a bootloader to actua
 **This firmware must be flashed at address 0x00 in the main flash memory**
 
 ### Bootloader
-The bootloader  is maintained by [lupyuen](https://github.com/lupyuen) and is a binary version of [this release](https://github.com/lupyuen/pinetime-rust-mynewt/releases/tag/v5.0.4).
+The bootloader is maintained by [lupyuen](https://github.com/lupyuen) and is a binary version of [this release](https://github.com/lupyuen/pinetime-rust-mynewt/releases/tag/v5.0.4).
 
  - **bootloader.hex** : Firmware in Intel HEX file format.
  
-- 
cgit v0.10.2


From 574434550ac372953954813e36a26d6d4c2a5cc6 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 23 Jul 2021 23:58:40 +0300
Subject: Fix slow scroll


diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 9f10f50..c8d5e4b 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -119,7 +119,6 @@ Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Mus
   constexpr int8_t MIDDLE_OFFSET = -25;
   txtArtist = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(txtArtist, LV_LABEL_LONG_SROLL_CIRC);
-  lv_label_set_anim_speed(txtArtist, 1);
   lv_obj_align(txtArtist, nullptr, LV_ALIGN_IN_LEFT_MID, 12, MIDDLE_OFFSET + 1 * FONT_HEIGHT);
   lv_label_set_align(txtArtist, LV_ALIGN_IN_LEFT_MID);
   lv_obj_set_width(txtArtist, LV_HOR_RES - 12);
@@ -127,7 +126,6 @@ Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Mus
 
   txtTrack = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(txtTrack, LV_LABEL_LONG_SROLL_CIRC);
-  lv_label_set_anim_speed(txtTrack, 1);
   lv_obj_align(txtTrack, nullptr, LV_ALIGN_IN_LEFT_MID, 12, MIDDLE_OFFSET + 2 * FONT_HEIGHT + LINE_PAD);
 
   lv_label_set_align(txtTrack, LV_ALIGN_IN_LEFT_MID);
@@ -303,4 +301,4 @@ bool Music::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
       return true;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 38b1242..5c23ed1 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -184,7 +184,6 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   }
   lv_label_set_text(alert_type, title);
   lv_label_set_long_mode(alert_type, LV_LABEL_LONG_SROLL_CIRC);
-  lv_label_set_anim_speed(alert_type, 3);
   lv_obj_set_width(alert_type, 180);
   lv_obj_align(alert_type, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 16);
 
-- 
cgit v0.10.2


From 7b75ca591d31ccd8883a1a1ff83cfd271959dbaa Mon Sep 17 00:00:00 2001
From: Jonathan Vander Mey <jvandermey@evertz.com>
Date: Sat, 17 Jul 2021 00:41:15 -0400
Subject: Fix compile warnings


diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index 2bb8481..e7c5b65 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -20,6 +20,8 @@ namespace {
         return "BMA421";
       case Pinetime::Controllers::MotionController::DeviceTypes::BMA425:
         return "BMA425";
+      case Pinetime::Controllers::MotionController::DeviceTypes::Unknown:
+        return "???";
     }
     return "???";
   }
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index 18fc3fa..73109c5 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -295,6 +295,7 @@ typedef void* lv_img_decoder_user_data_t;
 #define LV_TICK_CUSTOM     1
 #if LV_TICK_CUSTOM == 1
 #define LV_TICK_CUSTOM_INCLUDE  "FreeRTOS.h"       /*Header for the system time function*/
+uint32_t xTaskGetTickCount(); /*Forward declare to avoid compiler warning*/
 #define LV_TICK_CUSTOM_SYS_TIME_EXPR (xTaskGetTickCount()) /*Expression evaluating to current system time in ms*/
 #endif   /*LV_TICK_CUSTOM*/
 
-- 
cgit v0.10.2


From 514481ef7f9c71ad816b31d979c6ab39ce9380dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sun, 25 Jul 2021 19:55:21 +0200
Subject: Tile event handler : read the event data only if the event is a
 "value changed event". LVGL sends many other event and some of them do not
 set the event data (global static variable) to a valid address, which may
 cause an invalid read. I noticed that when porting this class on RISC-V
 platform (BL602).


diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 3eb127c..d5d6cb8 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -6,15 +6,17 @@ using namespace Pinetime::Applications::Screens;
 
 namespace {
   static void lv_update_task(struct _lv_task_t* task) {
-    auto user_data = static_cast<Tile*>(task->user_data);
+    auto* user_data = static_cast<Tile*>(task->user_data);
     user_data->UpdateScreen();
   }
 
   static void event_handler(lv_obj_t* obj, lv_event_t event) {
+    if (event != LV_EVENT_VALUE_CHANGED) return;
+
     Tile* screen = static_cast<Tile*>(obj->user_data);
-    uint32_t* eventDataPtr = (uint32_t*) lv_event_get_data();
+    auto* eventDataPtr = (uint32_t*) lv_event_get_data();
     uint32_t eventData = *eventDataPtr;
-    screen->OnObjectEvent(obj, event, eventData);
+    screen->OnValueChangedEvent(obj, eventData);
   }
 }
 
@@ -124,9 +126,9 @@ bool Tile::Refresh() {
   return running;
 }
 
-void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
-    running = false;
-  }
+void Tile::OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId) {
+  if(obj != btnm1) return;
+
+  app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
+  running = false;
 }
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index 4ebd81c..765a8de 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -32,7 +32,7 @@ namespace Pinetime {
 
         bool Refresh() override;
         void UpdateScreen();
-        void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
+        void OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId);
 
       private:
         Pinetime::Controllers::Battery& batteryController;
-- 
cgit v0.10.2


From e6bc485679022c51486ac3a28b8473b95ff0d115 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 25 Jul 2021 22:18:39 +0200
Subject: Increment settings value, remove old hacky fix


diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index cddef63..40cafe9 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -154,7 +154,7 @@ namespace Pinetime {
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0001;
+      static constexpr uint32_t settingsVersion = 0x0002;
       struct SettingsData {
 
         uint32_t version = settingsVersion;
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index b27bd9c..afce698 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -52,7 +52,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     settingsController {settingsController},
     motionController {motionController} {
 
-  /* This sets the watchface number to return to after leaving the menu */
+  // This sets the watchface number to return to after leaving the menu
   settingsController.SetClockFace(2);
 
   displayedChar[0] = 0;
@@ -61,14 +61,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
-  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
-  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
-      settingsController.SetPTSColorTime(11);
-      settingsController.SetPTSColorBar(11);
-      settingsController.SetPTSColorBG(3);
-  }
-
-  /* Create a 200px wide background rectangle */
+  //Create a 200px wide background rectangle
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
@@ -76,8 +69,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
-  /* Display the time */
-
+  // Display the time
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
   lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
@@ -96,16 +88,14 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
 
-  /* Create a 40px wide bar down the right side of the screen */
-
+  // Create a 40px wide bar down the right side of the screen
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  /* Display icons */
-
+  // Display icons
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(batteryIcon, Symbols::batteryFull);
@@ -123,8 +113,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
 
-  /* Calendar icon */
-
+  // Calendar icon
   calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -161,8 +150,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(calendarCrossBar2, 8, 3);
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  /* Display date */
-
+  // Display date
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(dateDayOfWeek, "THU");
@@ -303,7 +291,7 @@ bool PineTimeStyle::Refresh() {
         lv_label_set_text(timeAMPM, ampmChar);
     }
 
-      /* Display the time as 2 pairs of digits */
+      // Display the time as 2 pairs of digits
       sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
       lv_label_set_text(timeDD1, hourStr);
 
-- 
cgit v0.10.2


From 79ee65bfd53d31dd282dbbb7952296cc6f1212eb Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 27 Jul 2021 22:41:48 +0300
Subject: Increase ADC precision


diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 54b9ffd..e334eea 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -39,7 +39,7 @@ void Battery::SaadcInit() {
 
   nrf_saadc_channel_config_t adcChannelConfig = {.resistor_p = NRF_SAADC_RESISTOR_DISABLED,
                                                  .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
-                                                 .gain = NRF_SAADC_GAIN1_5,
+                                                 .gain = NRF_SAADC_GAIN1_4,
                                                  .reference = NRF_SAADC_REFERENCE_INTERNAL,
                                                  .acq_time = NRF_SAADC_ACQTIME_40US,
                                                  .mode = NRF_SAADC_MODE_SINGLE_ENDED,
@@ -59,11 +59,11 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
     APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
 
     // A hardware voltage divider divides the battery voltage by 2
-    // ADC gain is 1/5
-    // thus adc_voltage = battery_voltage / 2 * gain = battery_voltage / 10
+    // ADC gain is 1/4
+    // thus adc_voltage = battery_voltage / 2 * gain = battery_voltage / 8
     // reference_voltage is 0.6V
     // p_event->data.done.p_buffer[0] = (adc_voltage / reference_voltage) * 1024
-    voltage = p_event->data.done.p_buffer[0] * 6000 / 1024;
+    voltage = p_event->data.done.p_buffer[0] * (0.6 * 8 * 1000) / 1024;
 
     if (voltage > battery_max) {
       percentRemaining = 100;
-- 
cgit v0.10.2


From e6dcb3009fe6f847a7486dbb1b3143bbf49a15b9 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 1 Aug 2021 13:05:48 +0300
Subject: Improvements


diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index 8088302..b25e6bc 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -16,41 +16,37 @@ void MotorController::Init() {
   nrf_gpio_pin_set(pinMotor);
   app_timer_init();
 
-  app_timer_create(&shortVibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrate);
-  app_timer_create(&longVibTimer, APP_TIMER_MODE_REPEATED, vibrate);
-  isBusy = false;
+  app_timer_create(&shortVibTimer, APP_TIMER_MODE_SINGLE_SHOT, StopMotor);
+  app_timer_create(&longVibTimer, APP_TIMER_MODE_REPEATED, Ring);
 }
 
-void MotorController::runForDuration(uint8_t motorDuration) {
+void MotorController::Ring(void* p_context) {
+  auto* motorController = static_cast<MotorController*>(p_context);
+  motorController->RunForDuration(50);
+}
 
-  if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF || isBusy)
+void MotorController::RunForDuration(uint8_t motorDuration) {
+  if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF) {
     return;
+  }
 
   nrf_gpio_pin_clear(pinMotor);
-  /* Start timer for motorDuration miliseconds and timer triggers vibrate() when it finishes*/
-  app_timer_start(shortVibTimer, APP_TIMER_TICKS(motorDuration), NULL);
+  app_timer_start(shortVibTimer, APP_TIMER_TICKS(motorDuration), nullptr);
 }
 
-void MotorController::startRunning(uint8_t motorDuration) {
-  if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF || isBusy )
+void MotorController::StartRinging() {
+  if (settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF) {
     return;
-  //prevent other vibrations while running
-  isBusy = true;
-  nrf_gpio_pin_clear(pinMotor);
-  app_timer_start(longVibTimer, APP_TIMER_TICKS(motorDuration), NULL);
+  }
+  Ring(this);
+  app_timer_start(longVibTimer, APP_TIMER_TICKS(1000), this);
 }
 
-void MotorController::stopRunning() {
-  
+void MotorController::StopRinging() {
   app_timer_stop(longVibTimer);
   nrf_gpio_pin_set(pinMotor);
-  isBusy = false;
 }
 
-void MotorController::vibrate(void* p_context) {
-  if (nrf_gpio_pin_out_read(pinMotor) == 0) {
-    nrf_gpio_pin_set(pinMotor);
-  } else {
-    nrf_gpio_pin_clear(pinMotor);
-  }
+void MotorController::StopMotor(void* p_context) {
+  nrf_gpio_pin_set(pinMotor);
 }
diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
index 5daeb8c..d2c9fe5 100644
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -12,14 +12,14 @@ namespace Pinetime {
     public:
       MotorController(Controllers::Settings& settingsController);
       void Init();
-      void runForDuration(uint8_t motorDuration);
-      void startRunning(uint8_t motorDuration);
-      void stopRunning();
+      void RunForDuration(uint8_t motorDuration);
+      void StartRinging();
+      static void StopRinging();
 
     private:
+      static void Ring(void* p_context);
       Controllers::Settings& settingsController;
-      static void vibrate(void* p_context);
-      bool isBusy;
-      };
+      static void StopMotor(void* p_context);
+    };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index bdd703e..d4a73f5 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -336,12 +336,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
 
     case Apps::Notifications:
       currentScreen = std::make_unique<Screens::Notifications>(
-        this, notificationManager, systemTask->nimble().alertService(), motorController, Screens::Notifications::Modes::Normal);
+        this, notificationManager, systemTask->nimble().alertService(), Screens::Notifications::Modes::Normal);
       ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::NotificationsPreview:
       currentScreen = std::make_unique<Screens::Notifications>(
-        this, notificationManager, systemTask->nimble().alertService(), motorController, Screens::Notifications::Modes::Preview);
+        this, notificationManager, systemTask->nimble().alertService(), Screens::Notifications::Modes::Preview);
       ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::Timer:
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index 7bfbccb..16c34f4 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -109,9 +109,9 @@ bool Metronome::Refresh() {
         startTime = xTaskGetTickCount();
         if (counter == 0) {
           counter = bpb;
-          motorController.SetDuration(90);
+          motorController.RunForDuration(90);
         } else {
-          motorController.SetDuration(30);
+          motorController.RunForDuration(30);
         }
       }
       break;
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 5eecb42..5096917 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -11,13 +11,8 @@ extern lv_font_t jetbrains_mono_bold_20;
 Notifications::Notifications(DisplayApp* app,
                              Pinetime::Controllers::NotificationManager& notificationManager,
                              Pinetime::Controllers::AlertNotificationService& alertNotificationService,
-                             Controllers::MotorController& motorController,
                              Modes mode)
-    : Screen(app),
-      notificationManager{notificationManager},
-      alertNotificationService{alertNotificationService},
-      motorController{motorController},
-      mode{mode} {
+  : Screen(app), notificationManager {notificationManager}, alertNotificationService {alertNotificationService}, mode {mode} {
   notificationManager.ClearNewNotificationFlag();
   auto notification = notificationManager.GetLastNotification();
   if (notification.valid) {
@@ -28,10 +23,7 @@ Notifications::Notifications(DisplayApp* app,
                                                      notification.category,
                                                      notificationManager.NbNotifications(),
                                                      mode,
-                                                     alertNotificationService,
-                                                     motorController,
-                                                     &timeoutTickCountEnd,
-                                                     &timeoutTickCountStart);
+                                                     alertNotificationService);
     validDisplay = true;
   } else {
     currentItem = std::make_unique<NotificationItem>("Notification",
@@ -40,14 +32,10 @@ Notifications::Notifications(DisplayApp* app,
                                                      notification.category,
                                                      notificationManager.NbNotifications(),
                                                      Modes::Preview,
-                                                     alertNotificationService,
-                                                     motorController,
-                                                     &timeoutTickCountEnd,
-                                                     &timeoutTickCountStart);
+                                                     alertNotificationService);
   }
 
-  if (mode == Modes::Preview) {
-
+  if (mode == Modes::Preview && notification.category != Controllers::NotificationManager::Categories::IncomingCall) {
     timeoutLine = lv_line_create(lv_scr_act(), nullptr);
 
     lv_obj_set_style_local_line_width(timeoutLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
@@ -61,11 +49,13 @@ Notifications::Notifications(DisplayApp* app,
 }
 
 Notifications::~Notifications() {
+  // make sure we stop any vibrations before exiting
+  Controllers::MotorController::StopRinging();
   lv_obj_clean(lv_scr_act());
 }
 
 bool Notifications::Refresh() {
-  if (mode == Modes::Preview && !currentItem->timeoutOnHold) {
+  if (mode == Modes::Preview && timeoutLine != nullptr) {
     auto tick = xTaskGetTickCount();
     int32_t pos = 240 - ((tick - timeoutTickCountStart) / ((timeoutTickCountEnd - timeoutTickCountStart) / 240));
     if (pos < 0)
@@ -74,10 +64,7 @@ bool Notifications::Refresh() {
     timeoutLinePoints[1].x = pos;
     lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
   }
-  //make sure we stop any vibrations before exiting
-  if (!running)
-    motorController.stopRunning();
-  return running;
+  return running && currentItem->IsRunning();
 }
 
 bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
@@ -105,10 +92,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        previousNotification.category,
                                                        notificationManager.NbNotifications(),
                                                        mode,
-                                                       alertNotificationService,
-                                                       motorController,
-                                                       &timeoutTickCountEnd,
-                                                       &timeoutTickCountStart);
+                                                       alertNotificationService);
     }
       return true;
     case Pinetime::Applications::TouchEvents::SwipeUp: {
@@ -133,10 +117,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        nextNotification.category,
                                                        notificationManager.NbNotifications(),
                                                        mode,
-                                                       alertNotificationService,
-                                                       motorController,
-                                                       &timeoutTickCountEnd,
-                                                       &timeoutTickCountStart);
+                                                       alertNotificationService);
     }
       return true;
     case Pinetime::Applications::TouchEvents::LongTap: {
@@ -149,19 +130,9 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
 }
 
 namespace {
-  static void AcceptIncomingCallEventHandler(lv_obj_t* obj, lv_event_t event) {
-    auto* item = static_cast<Notifications::NotificationItem*>(obj->user_data);
-    item->OnAcceptIncomingCall(event);
-  }
-
-  static void MuteIncomingCallEventHandler(lv_obj_t* obj, lv_event_t event) {
+  void CallEventHandler(lv_obj_t* obj, lv_event_t event) {
     auto* item = static_cast<Notifications::NotificationItem*>(obj->user_data);
-    item->OnMuteIncomingCall(event);
-  }
-
-  static void RejectIncomingCallEventHandler(lv_obj_t* obj, lv_event_t event) {
-    auto* item = static_cast<Notifications::NotificationItem*>(obj->user_data);
-    item->OnRejectIncomingCall(event);
+    item->OnCallButtonEvent(obj, event);
   }
 }
 
@@ -171,12 +142,8 @@ Notifications::NotificationItem::NotificationItem(const char* title,
                                                   Controllers::NotificationManager::Categories category,
                                                   uint8_t notifNb,
                                                   Modes mode,
-                                                  Pinetime::Controllers::AlertNotificationService& alertNotificationService,
-                                                  Controllers::MotorController& motorController,
-                                                  uint32_t* timeoutEnd,
-                                                  uint32_t* timeoutStart)
-    : notifNr{notifNr}, notifNb{notifNb}, mode{mode}, alertNotificationService{alertNotificationService},
-      motorController{motorController}, timeoutEnd{timeoutEnd}, timeoutStart{timeoutStart} {
+                                                  Pinetime::Controllers::AlertNotificationService& alertNotificationService)
+  : notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService} {
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
 
   lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x222222));
@@ -234,7 +201,7 @@ Notifications::NotificationItem::NotificationItem(const char* title,
 
       bt_accept = lv_btn_create(lv_scr_act(), nullptr);
       bt_accept->user_data = this;
-      lv_obj_set_event_cb(bt_accept, AcceptIncomingCallEventHandler);
+      lv_obj_set_event_cb(bt_accept, CallEventHandler);
       lv_obj_set_size(bt_accept, 76, 76);
       lv_obj_align(bt_accept, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
       label_accept = lv_label_create(bt_accept, nullptr);
@@ -243,7 +210,7 @@ Notifications::NotificationItem::NotificationItem(const char* title,
 
       bt_reject = lv_btn_create(lv_scr_act(), nullptr);
       bt_reject->user_data = this;
-      lv_obj_set_event_cb(bt_reject, RejectIncomingCallEventHandler);
+      lv_obj_set_event_cb(bt_reject, CallEventHandler);
       lv_obj_set_size(bt_reject, 76, 76);
       lv_obj_align(bt_reject, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
       label_reject = lv_label_create(bt_reject, nullptr);
@@ -252,13 +219,12 @@ Notifications::NotificationItem::NotificationItem(const char* title,
 
       bt_mute = lv_btn_create(lv_scr_act(), nullptr);
       bt_mute->user_data = this;
-      lv_obj_set_event_cb(bt_mute, MuteIncomingCallEventHandler);
+      lv_obj_set_event_cb(bt_mute, CallEventHandler);
       lv_obj_set_size(bt_mute, 76, 76);
       lv_obj_align(bt_mute, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
       label_mute = lv_label_create(bt_mute, nullptr);
       lv_label_set_text(label_mute, Symbols::volumMute);
       lv_obj_set_style_local_bg_color(bt_mute, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
-      timeoutOnHold = true;
     } break;
   }
 
@@ -269,35 +235,24 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   lv_label_set_text(backgroundLabel, "");
 }
 
-void Notifications::NotificationItem::OnAcceptIncomingCall(lv_event_t event) {
-  if (event != LV_EVENT_CLICKED)
+void Notifications::NotificationItem::OnCallButtonEvent(lv_obj_t* obj, lv_event_t event) {
+  if (event != LV_EVENT_CLICKED) {
     return;
-  callPreviewInteraction();
-  alertNotificationService.AcceptIncomingCall();
-}
+  }
 
-void Notifications::NotificationItem::OnMuteIncomingCall(lv_event_t event) {
-  if (event != LV_EVENT_CLICKED)
-    return;
-  callPreviewInteraction();
-  alertNotificationService.MuteIncomingCall();
-}
+  Controllers::MotorController::StopRinging();
 
-void Notifications::NotificationItem::OnRejectIncomingCall(lv_event_t event) {
-  if (event != LV_EVENT_CLICKED)
-    return;
-  callPreviewInteraction();
-  alertNotificationService.RejectIncomingCall();
-}
+  if (obj == bt_accept) {
+    alertNotificationService.AcceptIncomingCall();
+  } else if (obj == bt_reject) {
+    alertNotificationService.RejectIncomingCall();
+  } else if (obj == bt_mute) {
+    alertNotificationService.MuteIncomingCall();
+  }
 
-inline void Notifications::NotificationItem::callPreviewInteraction() {
-  *timeoutStart = xTaskGetTickCount();
-  *timeoutEnd = *timeoutStart + (5 * 1024);
-  timeoutOnHold = false;
-  motorController.stopRunning();
+  running = false;
 }
 
-
 Notifications::NotificationItem::~NotificationItem() {
   lv_obj_clean(lv_scr_act());
 }
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 32bd077..9244e9f 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -5,7 +5,6 @@
 #include <memory>
 #include "Screen.h"
 #include "components/ble/NotificationManager.h"
-#include "components/motor/MotorController.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -20,7 +19,6 @@ namespace Pinetime {
         explicit Notifications(DisplayApp* app,
                                Pinetime::Controllers::NotificationManager& notificationManager,
                                Pinetime::Controllers::AlertNotificationService& alertNotificationService,
-                               Controllers::MotorController& motorController,
                                Modes mode);
         ~Notifications() override;
 
@@ -35,22 +33,14 @@ namespace Pinetime {
                            Controllers::NotificationManager::Categories,
                            uint8_t notifNb,
                            Modes mode,
-                           Pinetime::Controllers::AlertNotificationService& alertNotificationService,
-                           Controllers::MotorController& motorController,
-                           uint32_t* timeoutEnd,
-                           uint32_t* timeoutStart);
+                           Pinetime::Controllers::AlertNotificationService& alertNotificationService);
           ~NotificationItem();
-          bool Refresh() {
-            return false;
+          bool IsRunning() const {
+            return running;
           }
-          void OnAcceptIncomingCall(lv_event_t event);
-          void OnMuteIncomingCall(lv_event_t event);
-          void OnRejectIncomingCall(lv_event_t event);
-          
-          bool timeoutOnHold = false;
+          void OnCallButtonEvent(lv_obj_t*, lv_event_t event);
+
         private:
-          void callPreviewInteraction();
-          
           uint8_t notifNr = 0;
           uint8_t notifNb = 0;
           char pageText[4];
@@ -66,11 +56,9 @@ namespace Pinetime {
           lv_obj_t* label_mute;
           lv_obj_t* label_reject;
           lv_obj_t* bottomPlaceholder;
-          uint32_t* timeoutEnd;
-          uint32_t* timeoutStart;
           Modes mode;
           Pinetime::Controllers::AlertNotificationService& alertNotificationService;
-          Controllers::MotorController& motorController;
+          bool running = true;
         };
 
       private:
@@ -83,11 +71,10 @@ namespace Pinetime {
         Modes mode = Modes::Normal;
         std::unique_ptr<NotificationItem> currentItem;
         Controllers::NotificationManager::Notification::Id currentId;
-        Controllers::MotorController& motorController;
         bool validDisplay = false;
 
         lv_point_t timeoutLinePoints[2] {{0, 1}, {239, 1}};
-        lv_obj_t* timeoutLine;
+        lv_obj_t* timeoutLine = nullptr;
         uint32_t timeoutTickCountStart;
         uint32_t timeoutTickCountEnd;
       };
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 5e46e2e..0421d10 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -140,7 +140,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
 
     if (lv_obj_get_state(btn3, LV_BTN_PART_MAIN) & LV_STATE_CHECKED) {
       settingsController.SetVibrationStatus(Controllers::Settings::Vibration::ON);
-      motorController.runForDuration(35);
+      motorController.RunForDuration(35);
       lv_label_set_text_static(btn3_lvl, Symbols::notificationsOn);
     } else {
       settingsController.SetVibrationStatus(Controllers::Settings::Vibration::OFF);
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index f05ade6..7426ac2 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -267,16 +267,17 @@ void SystemTask::Work() {
             GoToRunning();
           }
           if (notificationManager.GetLastNotification().category == Controllers::NotificationManager::Categories::IncomingCall) {
-            motorController.startRunning(500);
+            motorController.StartRinging();
           } else {
-            motorController.runForDuration(35);
+            motorController.RunForDuration(35);
           }
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
+          break;
         case Messages::OnTimerDone:
           if (isSleeping && !isWakingUp) {
             GoToRunning();
           }
-          motorController.runForDuration(35);
+          motorController.RunForDuration(35);
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
           break;
         case Messages::BleConnected:
@@ -329,7 +330,7 @@ void SystemTask::Work() {
           stepCounterMustBeReset = true;
           break;
         case Messages::OnChargingEvent:
-          motorController.SetDuration(15);
+          motorController.RunForDuration(15);
 	  // Battery level is updated on every message - there's no need to do anything
           break;
 
-- 
cgit v0.10.2


From a618f43b4d8b1d0868c37e10193d3c95ce080040 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 1 Aug 2021 14:13:32 +0300
Subject: Fixes


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index d4a73f5..bdd703e 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -336,12 +336,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
 
     case Apps::Notifications:
       currentScreen = std::make_unique<Screens::Notifications>(
-        this, notificationManager, systemTask->nimble().alertService(), Screens::Notifications::Modes::Normal);
+        this, notificationManager, systemTask->nimble().alertService(), motorController, Screens::Notifications::Modes::Normal);
       ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::NotificationsPreview:
       currentScreen = std::make_unique<Screens::Notifications>(
-        this, notificationManager, systemTask->nimble().alertService(), Screens::Notifications::Modes::Preview);
+        this, notificationManager, systemTask->nimble().alertService(), motorController, Screens::Notifications::Modes::Preview);
       ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::Timer:
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 5096917..c061c14 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -11,6 +11,7 @@ extern lv_font_t jetbrains_mono_bold_20;
 Notifications::Notifications(DisplayApp* app,
                              Pinetime::Controllers::NotificationManager& notificationManager,
                              Pinetime::Controllers::AlertNotificationService& alertNotificationService,
+                             Pinetime::Controllers::MotorController& motorController,
                              Modes mode)
   : Screen(app), notificationManager {notificationManager}, alertNotificationService {alertNotificationService}, mode {mode} {
   notificationManager.ClearNewNotificationFlag();
@@ -35,16 +36,21 @@ Notifications::Notifications(DisplayApp* app,
                                                      alertNotificationService);
   }
 
-  if (mode == Modes::Preview && notification.category != Controllers::NotificationManager::Categories::IncomingCall) {
-    timeoutLine = lv_line_create(lv_scr_act(), nullptr);
+  if (mode == Modes::Preview) {
+    if (notification.category == Controllers::NotificationManager::Categories::IncomingCall) {
+      motorController.StartRinging();
+    } else {
+      motorController.RunForDuration(35);
+      timeoutLine = lv_line_create(lv_scr_act(), nullptr);
 
-    lv_obj_set_style_local_line_width(timeoutLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
-    lv_obj_set_style_local_line_color(timeoutLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
-    lv_obj_set_style_local_line_rounded(timeoutLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true);
+      lv_obj_set_style_local_line_width(timeoutLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
+      lv_obj_set_style_local_line_color(timeoutLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+      lv_obj_set_style_local_line_rounded(timeoutLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true);
 
-    lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
-    timeoutTickCountStart = xTaskGetTickCount();
-    timeoutTickCountEnd = timeoutTickCountStart + (5 * 1024);
+      lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
+      timeoutTickCountStart = xTaskGetTickCount();
+      timeoutTickCountEnd = timeoutTickCountStart + (5 * 1024);
+    }
   }
 }
 
@@ -68,8 +74,9 @@ bool Notifications::Refresh() {
 }
 
 bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  if (mode != Modes::Normal)
-    return true;
+  if (mode != Modes::Normal) {
+    return false;
+  }
 
   switch (event) {
     case Pinetime::Applications::TouchEvents::SwipeDown: {
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 9244e9f..a02d9b4 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include "Screen.h"
 #include "components/ble/NotificationManager.h"
+#include "components/motor/MotorController.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -19,6 +20,7 @@ namespace Pinetime {
         explicit Notifications(DisplayApp* app,
                                Pinetime::Controllers::NotificationManager& notificationManager,
                                Pinetime::Controllers::AlertNotificationService& alertNotificationService,
+                               Pinetime::Controllers::MotorController& motorController,
                                Modes mode);
         ~Notifications() override;
 
-- 
cgit v0.10.2


From 09aaa5871071857dbcd955ce8ea8e33e95960678 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 1 Aug 2021 16:19:09 +0300
Subject: Remove floating point calculation


diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index e334eea..f8a64ec 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -61,9 +61,9 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
     // A hardware voltage divider divides the battery voltage by 2
     // ADC gain is 1/4
     // thus adc_voltage = battery_voltage / 2 * gain = battery_voltage / 8
-    // reference_voltage is 0.6V
+    // reference_voltage is 600mV
     // p_event->data.done.p_buffer[0] = (adc_voltage / reference_voltage) * 1024
-    voltage = p_event->data.done.p_buffer[0] * (0.6 * 8 * 1000) / 1024;
+    voltage = p_event->data.done.p_buffer[0] * (8 * 600) / 1024;
 
     if (voltage > battery_max) {
       percentRemaining = 100;
-- 
cgit v0.10.2


From f9319dfb91a38c773b4af221f2fd0d975cf061f2 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 1 Aug 2021 21:19:33 +0300
Subject: Remove leftover


diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 7426ac2..3553f44 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -266,11 +266,6 @@ void SystemTask::Work() {
           if (isSleeping && !isWakingUp) {
             GoToRunning();
           }
-          if (notificationManager.GetLastNotification().category == Controllers::NotificationManager::Categories::IncomingCall) {
-            motorController.StartRinging();
-          } else {
-            motorController.RunForDuration(35);
-          }
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
           break;
         case Messages::OnTimerDone:
-- 
cgit v0.10.2


From 65423b3c945002b5828f8be3b42e27bc9c83d8b4 Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Thu, 25 Feb 2021 16:18:08 +0000
Subject: added devcontainer files


diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..c6a3588
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,43 @@
+FROM ubuntu:18.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -qq \
+    && apt-get install -y \
+# x86_64 / generic packages
+      bash \
+      build-essential \
+      cmake \
+      git \
+      make \
+      python3 \
+      python3-pip \
+      tar \
+      unzip \
+      wget \ 
+      curl \
+# aarch64 packages
+      libffi-dev \
+      libssl-dev \
+      python3-dev \ 
+      rustc \
+    && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
+
+RUN adduser infinitime
+
+RUN pip3 install adafruit-nrfutil
+# required for McuBoot
+RUN pip3 install setuptools_rust
+
+WORKDIR /opt/
+# build.sh knows how to compile
+COPY build.sh .
+
+# Lets get each in a separate docker layer for better downloads
+# GCC
+RUN bash -c "source /opt/build.sh; GetGcc;"
+# NrfSdk
+RUN bash -c "source /opt/build.sh; GetNrfSdk;"
+# McuBoot
+RUN bash -c "source /opt/build.sh; GetMcuBoot;"
+
+ENV SOURCES_DIR /workspaces/Pinetime
diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
new file mode 100755
index 0000000..8f0d0fa
--- /dev/null
+++ b/.devcontainer/build.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+(return 0 2>/dev/null) && SOURCED="true" || SOURCED="false"
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+set -x
+set -e
+
+# Default locations if the var isn't already set
+export TOOLS_DIR="${TOOLS_DIR:=/opt}"
+export SOURCES_DIR="${SOURCES_DIR:=/sources}"
+export BUILD_DIR="${BUILD_DIR:=$SOURCES_DIR/build}"
+export OUTPUT_DIR="${OUTPUT_DIR:=$BUILD_DIR/output}"
+
+export BUILD_TYPE=${BUILD_TYPE:=Release}
+export GCC_ARM_VER=${GCC_ARM_VER:="gcc-arm-none-eabi-9-2020-q2-update"}
+export NRF_SDK_VER=${NRF_SDK_VER:="nRF5_SDK_15.3.0_59ac345"}
+
+MACHINE="$(uname -m)"
+[[ "$MACHINE" == "arm64" ]] && MACHINE="aarch64"
+
+main() {
+  local target="$1"
+
+  mkdir -p "$TOOLS_DIR"
+  
+  [[ ! -d "$TOOLS_DIR/$GCC_ARM_VER" ]] && GetGcc
+  [[ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ]] && GetNrfSdk
+  [[ ! -d "$TOOLS_DIR/mcuboot" ]] && GetMcuBoot
+
+  mkdir -p "$BUILD_DIR"
+
+  CmakeGenerate
+  CmakeBuild $target
+  BUILD_RESULT=$? 
+  if [ "$DISABLE_POSTBUILD" != "true" -a "$BUILD_RESULT" == 0 ]; then
+    source "$BUILD_DIR/post_build.sh"
+  fi
+}
+
+GetGcc() {
+  GCC_SRC="$GCC_ARM_VER-$MACHINE-linux.tar.bz"
+  wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/$GCC_SRC -O - | tar -xj -C $TOOLS_DIR/
+}
+
+GetMcuBoot() {
+  git clone https://github.com/JuulLabs-OSS/mcuboot.git "$TOOLS_DIR/mcuboot"
+  pip3 install -r "$TOOLS_DIR/mcuboot/scripts/requirements.txt"
+}
+
+GetNrfSdk() {
+  wget -q "https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/$NRF_SDK_VER.zip" -O /tmp/$NRF_SDK_VER
+  unzip -q /tmp/$NRF_SDK_VER -d "$TOOLS_DIR/"
+  rm /tmp/$NRF_SDK_VER
+}
+
+CmakeGenerate() {
+  # We can swap the CD and trailing SOURCES_DIR for -B and -S respectively
+  # once we go to newer CMake (Ubuntu 18.10 gives us CMake 3.10)
+  cd "$BUILD_DIR"
+
+  cmake -G "Unix Makefiles" \
+    -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+    -DUSE_OPENOCD=1 \
+    -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_VER" \
+    -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
+    "$SOURCES_DIR"
+  cmake -L -N .
+}
+
+CmakeBuild() {
+  local target="$1"
+  [[ -n "$target" ]] && target="--target $target"
+  if cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc)
+    then return 0; else return 1; 
+  fi
+}
+
+[[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!"
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..fb81d28
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,32 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.154.2/containers/cpp
+{
+	// "name": "Pinetime",
+	// "image": "feabhas/pinetime-dev"
+	"build": {
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-10, debian-9, ubuntu-20.04, ubuntu-18.04
+		// "args": { "VARIANT": "ubuntu-20.04" }
+	},
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"ms-vscode.cpptools"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "gcc -v",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	// "remoteUser": "vscode"
+	"remoteUser": "infinitime"
+}
\ No newline at end of file
-- 
cgit v0.10.2


From 273a94f298cc96a1415499d00559fed3a741af71 Mon Sep 17 00:00:00 2001
From: "AzureAD\\NiallCooling" <niall.cooling@feabhas.com>
Date: Thu, 25 Feb 2021 17:16:01 +0000
Subject: removed dependency on build.sh


diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c6a3588..7e96152 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -22,8 +22,6 @@ RUN apt-get update -qq \
       rustc \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
-RUN adduser infinitime
-
 RUN pip3 install adafruit-nrfutil
 # required for McuBoot
 RUN pip3 install setuptools_rust
@@ -34,10 +32,19 @@ COPY build.sh .
 
 # Lets get each in a separate docker layer for better downloads
 # GCC
-RUN bash -c "source /opt/build.sh; GetGcc;"
+# RUN bash -c "source /opt/build.sh; GetGcc;"
+RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -O - | tar -xj -C /opt
+# RUN rm gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
 # NrfSdk
-RUN bash -c "source /opt/build.sh; GetNrfSdk;"
+# RUN bash -c "source /opt/build.sh; GetNrfSdk;"
+RUN wget -q "https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip" -O /tmp/nRF5_SDK_15.3.0_59ac345
+RUN unzip -q /tmp/nRF5_SDK_15.3.0_59ac345 -d /opt
+RUN rm /tmp/nRF5_SDK_15.3.0_59ac345
 # McuBoot
-RUN bash -c "source /opt/build.sh; GetMcuBoot;"
+# RUN bash -c "source /opt/build.sh; GetMcuBoot;"
+RUN git clone https://github.com/JuulLabs-OSS/mcuboot.git
+RUN pip3 install -r ./mcuboot/scripts/requirements.txt
+
+RUN adduser infinitime
 
 ENV SOURCES_DIR /workspaces/Pinetime
-- 
cgit v0.10.2


From 382db668ed513836a52ff4fdc49b0ee7a08a1527 Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Thu, 25 Feb 2021 17:49:40 +0000
Subject: macOS and Win10 dockerfile


diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7e96152..2c223bc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -27,14 +27,15 @@ RUN pip3 install adafruit-nrfutil
 RUN pip3 install setuptools_rust
 
 WORKDIR /opt/
-# build.sh knows how to compile
+# build.sh knows how to compile but it problimatic on Win10
 COPY build.sh .
+# create_build_openocd.sh uses cmake to crate to build directory
+COPY create_build_openocd.sh .
 
 # Lets get each in a separate docker layer for better downloads
 # GCC
 # RUN bash -c "source /opt/build.sh; GetGcc;"
 RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -O - | tar -xj -C /opt
-# RUN rm gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
 # NrfSdk
 # RUN bash -c "source /opt/build.sh; GetNrfSdk;"
 RUN wget -q "https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip" -O /tmp/nRF5_SDK_15.3.0_59ac345
diff --git a/.devcontainer/create_build_openocd.sh b/.devcontainer/create_build_openocd.sh
new file mode 100755
index 0000000..860ffa1
--- /dev/null
+++ b/.devcontainer/create_build_openocd.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+rm -rf build/
+cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Debug -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fb81d28..1740a8e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -24,7 +24,7 @@
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "gcc -v",
+	// "postCreateCommand": "/opt/create_build_openocd.sh",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
-- 
cgit v0.10.2


From 937d3e19335758ac76607a1d75c8844b49dd3c3e Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Fri, 26 Feb 2021 08:14:30 +0000
Subject: added dos2unix to docker for Win10 and default to release build


diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2c223bc..bb7dddb 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -15,6 +15,7 @@ RUN apt-get update -qq \
       unzip \
       wget \ 
       curl \
+      dos2unix \
 # aarch64 packages
       libffi-dev \
       libssl-dev \
diff --git a/.devcontainer/create_build_openocd.sh b/.devcontainer/create_build_openocd.sh
index 860ffa1..c5bff5c 100755
--- a/.devcontainer/create_build_openocd.sh
+++ b/.devcontainer/create_build_openocd.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 rm -rf build/
-cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Debug -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild
\ No newline at end of file
+cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1740a8e..90b6ece 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -17,14 +17,15 @@
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"ms-vscode.cpptools"
+		"ms-vscode.cpptools",
+		"ms-vscode.cmake-tools",
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "/opt/create_build_openocd.sh",
+	// "postCreateCommand": "bash /opt/create_build_openocd.sh",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
-- 
cgit v0.10.2


From c50f2b70c23ff36de8f290ab0e4408be7eeed62c Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Fri, 26 Feb 2021 15:09:58 +0000
Subject: added clang-tidy/format to container


diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index bb7dddb..55f3013 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -16,6 +16,8 @@ RUN apt-get update -qq \
       wget \ 
       curl \
       dos2unix \
+      clang-format \
+      clang-tidy \
 # aarch64 packages
       libffi-dev \
       libssl-dev \
-- 
cgit v0.10.2


From c0b84537b35fd358e929962a962c53e50019079e Mon Sep 17 00:00:00 2001
From: Niall Cooling <niall.cooling@gmail.com>
Date: Fri, 26 Mar 2021 17:37:01 +0000
Subject: added extra .sh build files


diff --git a/.devcontainer/build_app.sh b/.devcontainer/build_app.sh
new file mode 100644
index 0000000..0f578cc
--- /dev/null
+++ b/.devcontainer/build_app.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+cmake --build /workspaces/Pinetime/build --config Release -- -j6 pinetime-app
\ No newline at end of file
diff --git a/.devcontainer/make_build_dir.sh b/.devcontainer/make_build_dir.sh
new file mode 100644
index 0000000..0b86b30
--- /dev/null
+++ b/.devcontainer/make_build_dir.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 /workspaces/Pinetime
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..b409ec9
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "gnu11",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "linux-gcc-x64",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
-- 
cgit v0.10.2


From f7643a4d828ec3c60f418b6d9a660097eb44e05e Mon Sep 17 00:00:00 2001
From: Tim Keller <geekboy1011@gmail.com>
Date: Sun, 25 Jul 2021 20:12:34 +0000
Subject: Added cmake variants


diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 55f3013..4534c7e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:latest
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -qq \
@@ -18,12 +18,20 @@ RUN apt-get update -qq \
       dos2unix \
       clang-format \
       clang-tidy \
+      locales \
+      libncurses5 \
 # aarch64 packages
       libffi-dev \
       libssl-dev \
       python3-dev \ 
       rustc \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
+    
+#SET LOCALE 
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8 
 
 RUN pip3 install adafruit-nrfutil
 # required for McuBoot
@@ -32,9 +40,10 @@ RUN pip3 install setuptools_rust
 WORKDIR /opt/
 # build.sh knows how to compile but it problimatic on Win10
 COPY build.sh .
+RUN chmod +x build.sh
 # create_build_openocd.sh uses cmake to crate to build directory
 COPY create_build_openocd.sh .
-
+RUN chmod +x create_build_openocd.sh
 # Lets get each in a separate docker layer for better downloads
 # GCC
 # RUN bash -c "source /opt/build.sh; GetGcc;"
@@ -51,4 +60,6 @@ RUN pip3 install -r ./mcuboot/scripts/requirements.txt
 
 RUN adduser infinitime
 
-ENV SOURCES_DIR /workspaces/Pinetime
+ENV NRF5_SDK_PATH /opt/nRF5_SDK_15.3.0_59ac345
+ENV ARM_NONE_EABI_TOOLCHAIN_PATH /opt/gcc-arm-none-eabi-9-2020-q2-update
+ENV SOURCES_DIR /workspaces/InfiniTime
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
new file mode 100644
index 0000000..ff9307b
--- /dev/null
+++ b/.devcontainer/README.md
@@ -0,0 +1,60 @@
+# VScode devcontainer
+This is a docker-based interactive development environment using VSCode and Docker Devcontainers removing the need to install any tools locally*
+
+
+
+## Requirements
+
+- VScode
+  - [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension
+- Docker
+- OpenOCD - For debugging
+
+## Using
+
+### Code editing, and building.
+
+1. Clone InifiniTime and update submodules
+2. Launch VSCode
+3. Open InifiTime directory, 
+4. Allow VSCode to open folder with devcontainer. 
+
+After this the environment will be built if you do not currently have a container setup, it will install all the necessary tools and extra VSCode extensions. 
+
+In order to build InfiniTime we need to run the initial submodule init and Cmake commands.
+
+#### Manually 
+
+ You can use the VSCode terminal to run the CMake commands as outlined in the [build instructions](blob/develop/doc/buildAndProgram.md) 
+
+#### Script
+
+The dev enviroment comes with some scripts to make this easier, They are located in /opt/.
+
+There are also VSCode tasks provided should you desire to use those. 
+
+The task BuildInit will update submodules and configure for openocd
+
+
+
+### Build
+
+You can use the build.sh script located in /opt/
+
+There will also eventually be a Build task. - Not written yet
+
+
+
+### Debugging
+
+Docker on windows does not support passing USB devices to the underlying WSL2 subsystem, To get around this we use openocd in server mode running on the host.
+
+`openocd -f <yourinterface> -f <nrf52.cfg target file>`
+
+This will launch openocd in server mode and attach it to the MCU. 
+
+The default launch.json file expects openocd to be listening on port 3333, edit if needed
+
+
+## Current Issues
+Currently WSL2 Has some real performance issues with IO on a windows host. Accessing files on the virtualized filesystem is much faster. Using VSCodes "clone in container" feature of the Remote - Containers will get around this. After the container is built you will need to update the submodules and follow the build isntructions like normal 
\ No newline at end of file
diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
old mode 100755
new mode 100644
diff --git a/.devcontainer/create_build_openocd.sh b/.devcontainer/create_build_openocd.sh
old mode 100755
new mode 100644
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 90b6ece..223b651 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,6 +19,7 @@
 	"extensions": [
 		"ms-vscode.cpptools",
 		"ms-vscode.cmake-tools",
+		"marus25.cortex-debug"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/.devcontainer/make_build_dir.sh b/.devcontainer/make_build_dir.sh
index 0b86b30..7624003 100644
--- a/.devcontainer/make_build_dir.sh
+++ b/.devcontainer/make_build_dir.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 /workspaces/Pinetime
+cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 ${SOURCES_DIR}
diff --git a/.gitignore b/.gitignore
index 2f9ac18..6de76a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 
 # CMake
 cmake-build-*
-cmake-*
+cmake-*/
 CMakeFiles
 **/CMakeCache.txt
 cmake_install.cmake
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index b409ec9..f5c74b3 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -1,15 +1,18 @@
 {
     "configurations": [
         {
-            "name": "Linux",
+            "name": "nrfCC",
             "includePath": [
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/**",
+                "${workspaceFolder}/src/**",
+                "${workspaceFolder}/src"
             ],
             "defines": [],
-            "compilerPath": "/usr/bin/gcc",
-            "cStandard": "gnu11",
-            "cppStandard": "gnu++14",
-            "intelliSenseMode": "linux-gcc-x64",
+            "compilerPath": "${env:ARM_NONE_EABI_TOOLCHAIN_PATH}/bin/arm-none-eabi-gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++14",
+            "intelliSenseMode": "linux-gcc-arm",
+            "configurationProvider": "ms-vscode.cmake-tools",
             "compileCommands": "${workspaceFolder}/build/compile_commands.json"
         }
     ],
diff --git a/.vscode/cmake-variants.json b/.vscode/cmake-variants.json
new file mode 100644
index 0000000..d00e638
--- /dev/null
+++ b/.vscode/cmake-variants.json
@@ -0,0 +1,62 @@
+{
+    "buildType": {
+      "default": "release",
+        "choices": { 
+          "debug": {
+            "short": "Debug",
+            "long": "Emit debug information without performing optimizations",
+            "buildType": "Debug"
+          },
+          "release": {
+            "short": "Release",
+            "long": "Perform optimizations",
+            "buildType": "Release"
+          }    
+        }
+    },
+    "programmer":{
+        "default": "OpenOCD",
+        "choices":{
+            "OpenOCD":{
+                "short":"OpenOCD",
+                "long": "Use OpenOCD",
+                "settings":{
+                    "USE_OPENOCD":1
+                }
+            },
+            "JLink":{
+                "short":"JLink",
+                "long": "Use JLink",
+                "settings":{
+                    "USE_JLINK":1
+                }
+            },
+            "GDB":{
+                "short":"GDB",
+                "long": "Use GDB",
+                "settings":{
+                    "USE_GDB_CLIENT":1
+                }
+            }
+        }
+    },
+    "DFU": {
+        "default": "no",
+          "choices": { 
+            "no": {
+              "short": "No DFU",
+              "long": "Do not build DFU",
+              "settings": {
+                  "BUILD_DFU":0
+                }
+            },
+            "yes": {
+                "short": "Build DFU",
+                "long": "Build DFU",
+                "settings": {
+                    "BUILD_DFU":1
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..78fc118
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,46 @@
+  {
+    "version": "0.1.0",
+    "configurations": [
+        {
+            "name": "Debug - Openocd docker Remote",
+            "type":"cortex-debug",
+            "cortex-debug.armToolchainPath":"${env:COMPILER_DIR}/bin",
+            "cwd": "${workspaceRoot}",
+            "executable": "${command:cmake.launchTargetPath}",
+            "request": "launch",
+            "servertype": "external",
+            // This may need to be arm-none-eabi-gdb depending on your system
+            "gdbPath" : "${env:COMPILER_DIR}/bin/arm-none-eabi-gdb",
+            // Connect to an already running OpenOCD instance
+            "gdbTarget": "host.docker.internal:3333",
+            "svdFile": "${workspaceRoot}/nrf52.svd",
+            "runToMain": true,
+            // Work around for stopping at main on restart
+            "postRestartCommands": [
+                "break main",
+                "continue"
+            ]
+        },
+        {
+            "name": "Debug - Openocd Local",
+            "type":"cortex-debug",
+            "cortex-debug.armToolchainPath":"${env:COMPILER_DIR}/bin",
+            "cwd": "${workspaceRoot}",
+            "executable": "${command:cmake.launchTargetPath}",
+            "request": "launch",
+            "servertype": "openocd",
+            // This may need to be arm-none-eabi-gdb depending on your system
+            "gdbPath" : "${env:COMPILER_DIR}/bin/arm-none-eabi-gdb",
+            // Connect to an already running OpenOCD instance
+            "gdbTarget": "localhost:3333",
+            "svdFile": "${workspaceRoot}/nrf52.svd",
+            "runToMain": true,
+            // Work around for stopping at main on restart
+            "postRestartCommands": [
+                "break main",
+                "continue"
+            ]
+        }
+
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 05b1175..3b68662 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,59 +1,8 @@
 {
-    "files.associations": {
-        "chrono": "cpp",
-        "list": "cpp",
-        "array": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "*.tcc": "cpp",
-        "cctype": "cpp",
-        "charconv": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "condition_variable": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "algorithm": "cpp",
-        "functional": "cpp",
-        "iterator": "cpp",
-        "memory": "cpp",
-        "memory_resource": "cpp",
-        "netfwd": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "random": "cpp",
-        "ratio": "cpp",
-        "string": "cpp",
-        "string_view": "cpp",
-        "system_error": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "utility": "cpp",
-        "fstream": "cpp",
-        "initializer_list": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "ostream": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "thread": "cpp",
-        "cinttypes": "cpp",
-        "typeinfo": "cpp"
-    }
-}
\ No newline at end of file
+    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
+    "cmake.configureArgs": [
+        "-DARM_NONE_EABI_TOOLCHAIN_PATH=${env:ARM_NONE_EABI_TOOLCHAIN_PATH}",
+        "-DNRF5_SDK_PATH=${env:NRF5_SDK_PATH}",
+    ],
+    "cmake.generator": "Unix Makefiles"
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..17f51f5
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,44 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "create openocd build",
+			"type": "shell",
+			"command": "/opt/create_build_openocd.sh",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"problemMatcher": []
+		},
+		{
+			"label": "update submodules",
+			"type": "shell",
+			"command": "git submodule update --init",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			},
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"problemMatcher": []
+		},
+		{
+			"label": "BuildInit",
+			"dependsOn": [
+				"update submodules",
+				"create openocd build"
+			],
+			"problemMatcher": []
+		}
+	]
+}
\ No newline at end of file
-- 
cgit v0.10.2


From e9248b225e78e36ff04f7c26244adf200e17020e Mon Sep 17 00:00:00 2001
From: Tim Keller <geekboy1011@gmail.com>
Date: Mon, 26 Jul 2021 01:14:23 +0000
Subject: Updated documentation


diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index ff9307b..c8aef57 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -33,7 +33,7 @@ The dev enviroment comes with some scripts to make this easier, They are located
 
 There are also VSCode tasks provided should you desire to use those. 
 
-The task BuildInit will update submodules and configure for openocd
+The task "update submodules" will update the git submodules
 
 
 
@@ -41,7 +41,7 @@ The task BuildInit will update submodules and configure for openocd
 
 You can use the build.sh script located in /opt/
 
-There will also eventually be a Build task. - Not written yet
+CMake is also configured and controlls for the CMake plugin are available in VSCode
 
 
 
diff --git a/.vscode/cmake-variants.json b/.vscode/cmake-variants.json
index d00e638..9c95a63 100644
--- a/.vscode/cmake-variants.json
+++ b/.vscode/cmake-variants.json
@@ -47,14 +47,14 @@
               "short": "No DFU",
               "long": "Do not build DFU",
               "settings": {
-                  "BUILD_DFU":0
+                  "BUILD_DFU":"0"
                 }
             },
             "yes": {
                 "short": "Build DFU",
                 "long": "Build DFU",
                 "settings": {
-                    "BUILD_DFU":1
+                    "BUILD_DFU":"1"
                 }
             }
         }
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..1cc0526
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+    "recommendations": ["ms-vscode.cpptools","ms-vscode.cmake-tools","marus25.cortex-debug"]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 78fc118..7cf3acd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,13 +4,13 @@
         {
             "name": "Debug - Openocd docker Remote",
             "type":"cortex-debug",
-            "cortex-debug.armToolchainPath":"${env:COMPILER_DIR}/bin",
+            "cortex-debug.armToolchainPath":"${env:ARM_NONE_EABI_TOOLCHAIN_PATH}/bin",
             "cwd": "${workspaceRoot}",
             "executable": "${command:cmake.launchTargetPath}",
             "request": "launch",
             "servertype": "external",
             // This may need to be arm-none-eabi-gdb depending on your system
-            "gdbPath" : "${env:COMPILER_DIR}/bin/arm-none-eabi-gdb",
+            "gdbPath" : "${env:ARM_NONE_EABI_TOOLCHAIN_PATH}/bin/arm-none-eabi-gdb",
             // Connect to an already running OpenOCD instance
             "gdbTarget": "host.docker.internal:3333",
             "svdFile": "${workspaceRoot}/nrf52.svd",
@@ -24,13 +24,13 @@
         {
             "name": "Debug - Openocd Local",
             "type":"cortex-debug",
-            "cortex-debug.armToolchainPath":"${env:COMPILER_DIR}/bin",
+            "cortex-debug.armToolchainPath":"${env:ARM_NONE_EABI_TOOLCHAIN_PATH}/bin",
             "cwd": "${workspaceRoot}",
             "executable": "${command:cmake.launchTargetPath}",
             "request": "launch",
             "servertype": "openocd",
             // This may need to be arm-none-eabi-gdb depending on your system
-            "gdbPath" : "${env:COMPILER_DIR}/bin/arm-none-eabi-gdb",
+            "gdbPath" : "${env:ARM_NONE_EABI_TOOLCHAIN_PATH}/bin/arm-none-eabi-gdb",
             // Connect to an already running OpenOCD instance
             "gdbTarget": "localhost:3333",
             "svdFile": "${workspaceRoot}/nrf52.svd",
diff --git a/README.md b/README.md
index bd23c86..4b067dc 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ As of now, here is the list of achievements of this project:
  - [Build the project](doc/buildAndProgram.md)
  - [Flash the firmware using OpenOCD and STLinkV2](doc/openOCD.md)
  - [Build the project with Docker](doc/buildWithDocker.md)
+ - [Build the project with VSCode](doc/buildWithVScode.md)
  - [Bootloader, OTA and DFU](./bootloader/README.md)
  - [Stub using NRF52-DK](./doc/PinetimeStubWithNrf52DK.md)
  - Logging with JLink RTT.
diff --git a/doc/buildWithVScode.md b/doc/buildWithVScode.md
new file mode 100644
index 0000000..31174d1
--- /dev/null
+++ b/doc/buildWithVScode.md
@@ -0,0 +1,42 @@
+# Build and Develop the project using VS Code
+
+The .VSCode folder contains configuration files for developing InfiniTime with VS Code. Effort was made to have these rely on Environment variables instead of hardcoded paths.
+
+## Environment Setup
+
+To support as many setups as possible the VS Code configuration files expect there to be certain environment variables to be set.
+
+ Variable | Description | Example
+----------|-------------|--------
+**ARM_NONE_EABI_TOOLCHAIN_PATH**|path to the toolchain directory|`export ARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update`
+**NRF5_SDK_PATH**|path to the NRF52 SDK|`export NRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345`
+
+## VS Code Extensions
+
+We leverage a few VS Code extensions for ease of development.
+
+#### Required Extensions
+
+- [C/C++](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools) - C/C++ IntelliSense, debugging, and code browsing.
+- [CMake Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) - Extended CMake support in Visual Studio Code
+
+#### Optional Extensions
+
+[Cortex-Debug](https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug) - ARM Cortex-M GDB Debugger support for VSCode
+
+Cortex-Debug is only required for interactive debugging using VS Codes built in GDB support.
+
+
+
+## VS Code/Docker DevContainer
+
+The .devcontainer folder contains the configuration and scripts for using a Docker dev container for building InfiniTime
+
+Using the [Remote-Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension is recommended. It will handle configuring the Docker virtual machine and setting everything up. 
+
+More documentation is available in the [readme in .devcontainer](.devcontainer/readme.md)	
+
+
+
+
+
-- 
cgit v0.10.2


From 7f2ee62aedd359d34af6569bc691e216a49a7f5d Mon Sep 17 00:00:00 2001
From: Tim Keller <geekboy1011@gmail.com>
Date: Mon, 26 Jul 2021 15:43:48 +0000
Subject: Typos for days


diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index c8aef57..1932a9d 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -1,11 +1,11 @@
-# VScode devcontainer
-This is a docker-based interactive development environment using VSCode and Docker Devcontainers removing the need to install any tools locally*
+# VS Code Dev Container
+This is a docker-based interactive development environment using VS Code and Docker Dev Containers removing the need to install any tools locally*
 
 
 
 ## Requirements
 
-- VScode
+- VS Code
   - [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension
 - Docker
 - OpenOCD - For debugging
@@ -14,24 +14,24 @@ This is a docker-based interactive development environment using VSCode and Dock
 
 ### Code editing, and building.
 
-1. Clone InifiniTime and update submodules
-2. Launch VSCode
-3. Open InifiTime directory, 
-4. Allow VSCode to open folder with devcontainer. 
+1. Clone InfiniTime and update submodules
+2. Launch VS Code
+3. Open InfiniTime directory, 
+4. Allow VS Code to open folder with devcontainer. 
 
 After this the environment will be built if you do not currently have a container setup, it will install all the necessary tools and extra VSCode extensions. 
 
-In order to build InfiniTime we need to run the initial submodule init and Cmake commands.
+In order to build InfiniTime we need to run the initial submodule init and CMake commands.
 
 #### Manually 
 
- You can use the VSCode terminal to run the CMake commands as outlined in the [build instructions](blob/develop/doc/buildAndProgram.md) 
+ You can use the VS Code terminal to run the CMake commands as outlined in the [build instructions](blob/develop/doc/buildAndProgram.md) 
 
 #### Script
 
-The dev enviroment comes with some scripts to make this easier, They are located in /opt/.
+The dev environment comes with some scripts to make this easier, They are located in /opt/.
 
-There are also VSCode tasks provided should you desire to use those. 
+There are also VS Code tasks provided should you desire to use those. 
 
 The task "update submodules" will update the git submodules
 
@@ -41,20 +41,20 @@ The task "update submodules" will update the git submodules
 
 You can use the build.sh script located in /opt/
 
-CMake is also configured and controlls for the CMake plugin are available in VSCode
+CMake is also configured and controls for the CMake plugin are available in VS Code
 
 
 
 ### Debugging
 
-Docker on windows does not support passing USB devices to the underlying WSL2 subsystem, To get around this we use openocd in server mode running on the host.
+Docker on windows does not support passing USB devices to the underlying WSL2 subsystem, To get around this we use OpenOCD in server mode running on the host.
 
 `openocd -f <yourinterface> -f <nrf52.cfg target file>`
 
-This will launch openocd in server mode and attach it to the MCU. 
+This will launch OpenOCD in server mode and attach it to the MCU. 
 
-The default launch.json file expects openocd to be listening on port 3333, edit if needed
+The default launch.json file expects OpenOCD to be listening on port 3333, edit if needed
 
 
 ## Current Issues
-Currently WSL2 Has some real performance issues with IO on a windows host. Accessing files on the virtualized filesystem is much faster. Using VSCodes "clone in container" feature of the Remote - Containers will get around this. After the container is built you will need to update the submodules and follow the build isntructions like normal 
\ No newline at end of file
+Currently WSL2 Has some real performance issues with IO on a windows host. Accessing files on the virtualized filesystem is much faster. Using VS Codes "clone in container" feature of the Remote - Containers will get around this. After the container is built you will need to update the submodules and follow the build instructions like normal 
\ No newline at end of file
diff --git a/doc/buildWithVScode.md b/doc/buildWithVScode.md
index 31174d1..c1df17b 100644
--- a/doc/buildWithVScode.md
+++ b/doc/buildWithVScode.md
@@ -1,6 +1,6 @@
 # Build and Develop the project using VS Code
 
-The .VSCode folder contains configuration files for developing InfiniTime with VS Code. Effort was made to have these rely on Environment variables instead of hardcoded paths.
+The .VS Code folder contains configuration files for developing InfiniTime with VS Code. Effort was made to have these rely on Environment variables instead of hardcoded paths.
 
 ## Environment Setup
 
@@ -22,7 +22,7 @@ We leverage a few VS Code extensions for ease of development.
 
 #### Optional Extensions
 
-[Cortex-Debug](https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug) - ARM Cortex-M GDB Debugger support for VSCode
+[Cortex-Debug](https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug) - ARM Cortex-M GDB Debugger support for VS Code
 
 Cortex-Debug is only required for interactive debugging using VS Codes built in GDB support.
 
-- 
cgit v0.10.2


From d2dc719b318a256d3d6f2fea3bdcf30c5eb40969 Mon Sep 17 00:00:00 2001
From: Tim Keller <geekboy1011@gmail.com>
Date: Sun, 8 Aug 2021 22:51:31 +0000
Subject: Fix intellisense


diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index f5c74b3..f8da48d 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -12,7 +12,7 @@
             "cStandard": "c11",
             "cppStandard": "c++14",
             "intelliSenseMode": "linux-gcc-arm",
-            "configurationProvider": "ms-vscode.cmake-tools",
+            "configurationProvider": "ms-vscode.cpp-tools",
             "compileCommands": "${workspaceFolder}/build/compile_commands.json"
         }
     ],
-- 
cgit v0.10.2


From 44889adda074af2a7a5fe61b19667521755dd24d Mon Sep 17 00:00:00 2001
From: Tim Keller <geekboy1011@gmail.com>
Date: Mon, 9 Aug 2021 00:16:17 +0000
Subject: Setup plugins for Clang-tidy/format


diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4534c7e..1dd68f2 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update -qq \
       wget \ 
       curl \
       dos2unix \
-      clang-format \
+      clang-format-12 \
       clang-tidy \
       locales \
       libncurses5 \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 223b651..778fe9c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,7 +19,9 @@
 	"extensions": [
 		"ms-vscode.cpptools",
 		"ms-vscode.cmake-tools",
-		"marus25.cortex-debug"
+		"marus25.cortex-debug",
+		"notskm.clang-tidy",
+		"mjohns.clang-format"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3b68662..8f0e63f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,5 +4,6 @@
         "-DARM_NONE_EABI_TOOLCHAIN_PATH=${env:ARM_NONE_EABI_TOOLCHAIN_PATH}",
         "-DNRF5_SDK_PATH=${env:NRF5_SDK_PATH}",
     ],
-    "cmake.generator": "Unix Makefiles"
+    "cmake.generator": "Unix Makefiles",
+    "clang-tidy.buildPath": "build/compile_commands.json"
 }
-- 
cgit v0.10.2


From baa7e1bf12b58224e9461a5a605dcebabcf9504e Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 9 Aug 2021 17:45:24 +0300
Subject: Optimize twiMaster


diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index fc9edf8..e4c03d5 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -9,21 +9,25 @@ using namespace Pinetime::Drivers;
 // TODO use DMA/IRQ
 
 TwiMaster::TwiMaster(const Modules module, const Parameters& params) : module {module}, params {params} {
+  mutex = xSemaphoreCreateBinary();
 }
 
-void TwiMaster::Init() {
-  if(mutex == nullptr)
-    mutex = xSemaphoreCreateBinary();
-  
+void TwiMaster::ConfigurePins() const {
   NRF_GPIO->PIN_CNF[params.pinScl] =
-    ((uint32_t) GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) | ((uint32_t) GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | ((uint32_t) GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
+    (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
+    (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
+    (GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
+    (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
 
   NRF_GPIO->PIN_CNF[params.pinSda] =
-    ((uint32_t) GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) | ((uint32_t) GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | ((uint32_t) GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
+    (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
+    (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
+    (GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
+    (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
+}
+
+void TwiMaster::Init() {
+  ConfigurePins();
 
   switch (module) {
     case Modules::TWIM1:
@@ -179,7 +183,8 @@ void TwiMaster::Sleep() {
 }
 
 void TwiMaster::Wakeup() {
-  Init();
+  ConfigurePins();
+  twiBaseAddress->ENABLE = (TWIM_ENABLE_ENABLE_Enabled << TWIM_ENABLE_ENABLE_Pos);
   NRF_LOG_INFO("[TWIMASTER] Wakeup");
 }
 
@@ -194,16 +199,8 @@ void TwiMaster::FixHwFreezed() {
   uint32_t twi_state = NRF_TWI1->ENABLE;
   twiBaseAddress->ENABLE = TWIM_ENABLE_ENABLE_Disabled << TWI_ENABLE_ENABLE_Pos;
 
-  NRF_GPIO->PIN_CNF[params.pinScl] =
-    ((uint32_t) GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) | ((uint32_t) GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | ((uint32_t) GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
-
-  NRF_GPIO->PIN_CNF[params.pinSda] =
-    ((uint32_t) GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) | ((uint32_t) GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | ((uint32_t) GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) |
-    ((uint32_t) GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
+  ConfigurePins();
 
   // Re-enable I²C
   twiBaseAddress->ENABLE = twi_state;
-}
\ No newline at end of file
+}
diff --git a/src/drivers/TwiMaster.h b/src/drivers/TwiMaster.h
index 6175b99..b8d36d5 100644
--- a/src/drivers/TwiMaster.h
+++ b/src/drivers/TwiMaster.h
@@ -26,6 +26,8 @@ namespace Pinetime {
       void Sleep();
       void Wakeup();
 
+      void ConfigurePins() const;
+
     private:
       ErrorCodes Read(uint8_t deviceAddress, uint8_t* buffer, size_t size, bool stop);
       ErrorCodes Write(uint8_t deviceAddress, const uint8_t* data, size_t size, bool stop);
@@ -41,4 +43,4 @@ namespace Pinetime {
       static constexpr uint32_t HwFreezedDelay {161000};
     };
   }
-}
\ No newline at end of file
+}
-- 
cgit v0.10.2


From d35a54c060700e537d3e39723b7ee9b1d71b36d8 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 9 Aug 2021 21:49:35 +0300
Subject: Try to fix bootloop


diff --git a/src/main.cpp b/src/main.cpp
index ffbba5e..a18c394 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,7 @@
 #include <libraries/gpiote/app_gpiote.h>
 #include <libraries/timer/app_timer.h>
 #include <softdevice/common/nrf_sdh.h>
+#include <nrf_delay.h>
 
 // nimble
 #define min // workaround: nimble's min/max macros conflict with libstdc++
@@ -300,6 +301,14 @@ int main(void) {
 
   nrf_drv_clock_init();
 
+  // Unblock i2c?
+  nrf_gpio_cfg_output(pinTwiScl);
+  for (uint8_t i = 0; i < 16; i++) {
+    nrf_gpio_pin_toggle(pinTwiScl);
+    nrf_delay_us(5);
+  }
+  nrf_gpio_cfg_default(pinTwiScl);
+
   debounceTimer = xTimerCreate("debounceTimer", 200, pdFALSE, (void*) 0, DebounceTimerCallback);
   debounceChargeTimer = xTimerCreate("debounceTimerCharge", 200, pdFALSE, (void*) 0, DebounceTimerChargeCallback);
 
-- 
cgit v0.10.2


From ff81a72533e479388d49334d0ec3e0635b6e7f40 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 9 Aug 2021 22:07:06 +0300
Subject: Better pin configuration


diff --git a/src/main.cpp b/src/main.cpp
index a18c394..39d8906 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -302,7 +302,12 @@ int main(void) {
   nrf_drv_clock_init();
 
   // Unblock i2c?
-  nrf_gpio_cfg_output(pinTwiScl);
+  nrf_gpio_cfg(pinTwiScl,
+               NRF_GPIO_PIN_DIR_OUTPUT,
+               NRF_GPIO_PIN_INPUT_DISCONNECT,
+               NRF_GPIO_PIN_NOPULL,
+               NRF_GPIO_PIN_S0D1,
+               NRF_GPIO_PIN_NOSENSE);
   for (uint8_t i = 0; i < 16; i++) {
     nrf_gpio_pin_toggle(pinTwiScl);
     nrf_delay_us(5);
-- 
cgit v0.10.2


From 5eb56d9a06652cb10358ecba051bbfe8ec2957a7 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 9 Aug 2021 22:11:35 +0300
Subject: Set pin before loop


diff --git a/src/main.cpp b/src/main.cpp
index 39d8906..d301be6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -308,6 +308,7 @@ int main(void) {
                NRF_GPIO_PIN_NOPULL,
                NRF_GPIO_PIN_S0D1,
                NRF_GPIO_PIN_NOSENSE);
+  nrf_gpio_pin_set(pinTwiScl);
   for (uint8_t i = 0; i < 16; i++) {
     nrf_gpio_pin_toggle(pinTwiScl);
     nrf_delay_us(5);
-- 
cgit v0.10.2


From 2194a339cf55772c944fc1302ca740805d931983 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 10 Aug 2021 11:26:43 +0300
Subject: Only enable the bus when needed


diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index e4c03d5..34aac07 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -72,8 +72,10 @@ void TwiMaster::Init() {
 
 TwiMaster::ErrorCodes TwiMaster::Read(uint8_t deviceAddress, uint8_t registerAddress, uint8_t* data, size_t size) {
   xSemaphoreTake(mutex, portMAX_DELAY);
+  Wakeup();
   auto ret = Write(deviceAddress, &registerAddress, 1, false);
   ret = Read(deviceAddress, data, size, true);
+  Sleep();
   xSemaphoreGive(mutex);
   return ret;
 }
@@ -81,9 +83,11 @@ TwiMaster::ErrorCodes TwiMaster::Read(uint8_t deviceAddress, uint8_t registerAdd
 TwiMaster::ErrorCodes TwiMaster::Write(uint8_t deviceAddress, uint8_t registerAddress, const uint8_t* data, size_t size) {
   ASSERT(size <= maxDataSize);
   xSemaphoreTake(mutex, portMAX_DELAY);
+  Wakeup();
   internalBuffer[0] = registerAddress;
   std::memcpy(internalBuffer + 1, data, size);
   auto ret = Write(deviceAddress, internalBuffer, size + 1, true);
+  Sleep();
   xSemaphoreGive(mutex);
   return ret;
 }
@@ -179,13 +183,11 @@ void TwiMaster::Sleep() {
   }
   nrf_gpio_cfg_default(6);
   nrf_gpio_cfg_default(7);
-  NRF_LOG_INFO("[TWIMASTER] Sleep");
 }
 
 void TwiMaster::Wakeup() {
   ConfigurePins();
   twiBaseAddress->ENABLE = (TWIM_ENABLE_ENABLE_Enabled << TWIM_ENABLE_ENABLE_Pos);
-  NRF_LOG_INFO("[TWIMASTER] Wakeup");
 }
 
 /* Sometimes, the TWIM device just freeze and never set the event EVENTS_LASTTX.
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 8915ce7..4316330 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -219,7 +219,6 @@ void SystemTask::Work() {
           break;
         case Messages::GoToRunning:
           spi.Wakeup();
-          twiMaster.Wakeup();
 
           // Double Tap needs the touch screen to be in normal mode
           if (!settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) {
@@ -240,9 +239,7 @@ void SystemTask::Work() {
           isDimmed = false;
           break;
         case Messages::TouchWakeUp: {
-          twiMaster.Wakeup();
           auto touchInfo = touchPanel.GetTouchInfo();
-          twiMaster.Sleep();
           if (touchInfo.isTouch and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
                                       settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
                                      (touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
@@ -315,7 +312,6 @@ void SystemTask::Work() {
           if (!settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) {
             touchPanel.Sleep();
           }
-          twiMaster.Sleep();
 
           isSleeping = true;
           isGoingToSleep = false;
@@ -367,17 +363,12 @@ void SystemTask::UpdateMotion() {
   if (isSleeping && !settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist))
     return;
 
-  if (isSleeping)
-    twiMaster.Wakeup();
-
   if (stepCounterMustBeReset) {
     motionSensor.ResetStepCounter();
     stepCounterMustBeReset = false;
   }
 
   auto motionValues = motionSensor.Process();
-  if (isSleeping)
-    twiMaster.Sleep();
 
   motionController.IsSensorOk(motionSensor.IsOk());
   motionController.Update(motionValues.x, motionValues.y, motionValues.z, motionValues.steps);
-- 
cgit v0.10.2


From 90ea1071d1df4bf80f2a7d62467aca44c8a63d75 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 10 Aug 2021 11:52:20 +0300
Subject: Explicitly disable pullup


diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index 34aac07..52f93d8 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -16,12 +16,14 @@ void TwiMaster::ConfigurePins() const {
   NRF_GPIO->PIN_CNF[params.pinScl] =
     (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
     (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
+    (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) |
     (GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
     (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
 
   NRF_GPIO->PIN_CNF[params.pinSda] =
     (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
     (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
+    (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) |
     (GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
     (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
 }
-- 
cgit v0.10.2


From c086520c9796322043d9617e6cff5c554529d640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 24 Jul 2021 13:01:11 +0200
Subject: Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and
 PineTimeStyle, inspired by PR #232 by nscooling.


diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index 28a70ab..d6aa83c 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@@ -55,9 +55,9 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
   auto time = date::make_time(currentDateTime - dp);
   auto yearMonthDay = date::year_month_day(dp);
 
-  year = (int) yearMonthDay.year();
-  month = static_cast<Months>((unsigned) yearMonthDay.month());
-  day = (unsigned) yearMonthDay.day();
+  year = static_cast<int>(yearMonthDay.year());
+  month = static_cast<Months>(static_cast<unsigned>(yearMonthDay.month()));
+  day = static_cast<unsigned>(yearMonthDay.day());
   dayOfWeek = static_cast<Days>(date::weekday(yearMonthDay).iso_encoding());
 
   hour = time.hours().count();
@@ -75,31 +75,31 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
 }
 
 const char* DateTime::MonthShortToString() {
-  return DateTime::MonthsString[(uint8_t) month];
+  return DateTime::MonthsString[static_cast<uint8_t>(month)];
 }
 
 const char* DateTime::MonthShortToStringLow() {
-  return DateTime::MonthsStringLow[(uint8_t) month];
+  return DateTime::MonthsStringLow[static_cast<uint8_t>(month)];
 }
 
 const char* DateTime::MonthsToStringLow() {
-  return DateTime::MonthsLow[(uint8_t) month];
+  return DateTime::MonthsLow[static_cast<uint8_t>(month)];
 }
 
 const char* DateTime::DayOfWeekToString() {
-  return DateTime::DaysString[(uint8_t) dayOfWeek];
+  return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)];
 }
 
 const char* DateTime::DayOfWeekShortToString() {
-  return DateTime::DaysStringShort[(uint8_t) dayOfWeek];
+  return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)];
 }
 
 const char* DateTime::DayOfWeekToStringLow() {
-  return DateTime::DaysStringLow[(uint8_t) dayOfWeek];
+  return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)];
 }
 
 const char* DateTime::DayOfWeekShortToStringLow() {
-  return DateTime::DaysStringShortLow[(uint8_t) dayOfWeek];
+  return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)];
 }
 
 void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index e068497..86afee0 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -2,11 +2,6 @@
 
 #include <date/date.h>
 #include <lvgl/lvgl.h>
-#include <cstdio>
-#include "BatteryIcon.h"
-#include "BleIcon.h"
-#include "NotificationIcon.h"
-#include "Symbols.h"
 #include "components/battery/BatteryController.h"
 #include "components/motion/MotionController.h"
 #include "components/ble/BleController.h"
@@ -88,17 +83,4 @@ std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
                                                      notificatioManager,
                                                      settingsController,
                                                      motionController);
-}
-
-/*
-// Examples for more watch faces
-std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
-  return std::make_unique<Screens::WatchFaceMinimal>(app, dateTimeController, batteryController, bleController, notificatioManager,
-settingsController);
-}
-
-std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
-  return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
-settingsController);
-}
-*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index a48feea..7968cce 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -9,9 +9,6 @@
 #include "components/datetime/DateTimeController.h"
 
 namespace Pinetime {
-  namespace Drivers {
-    class BMA421;
-  }
   namespace Controllers {
     class Settings;
     class Battery;
@@ -51,10 +48,6 @@ namespace Pinetime {
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
         std::unique_ptr<Screen> PineTimeStyleScreen();
-
-        // Examples for more watch faces
-        // std::unique_ptr<Screen> WatchFaceMinimalScreen();
-        // std::unique_ptr<Screen> WatchFaceCustomScreen();
       };
     }
   }
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 0efb4dc..98fd976 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -51,7 +51,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     notificatioManager {notificatioManager},
     settingsController {settingsController},
     motionController {motionController} {
-
   /* This sets the watchface number to return to after leaving the menu */
   settingsController.SetClockFace(2);
 
@@ -62,7 +61,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[4] = 0;
 
   /* Create a 200px wide background rectangle */
-
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -70,7 +68,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
   /* Display the time */
-
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
   lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
@@ -90,7 +87,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
 
   /* Create a 40px wide bar down the right side of the screen */
-
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -98,7 +94,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
   /* Display icons */
-
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(batteryIcon, Symbols::batteryFull);
@@ -117,7 +112,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
 
   /* Calendar icon */
-
   calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -155,7 +149,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
   /* Display date */
-
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(dateDayOfWeek, "THU");
@@ -223,26 +216,17 @@ bool PineTimeStyle::Refresh() {
 
   bleState = bleController.IsConnected();
   if (bleState.IsUpdated()) {
-    if (bleState.Get() == true) {
-      lv_label_set_text(bleIcon, BleIcon::GetIcon(true));
-      lv_obj_realign(bleIcon);
-    } else {
-      lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
-    }
+    lv_label_set_text(bleIcon, BleIcon::GetIcon(bleState.Get()));
+    lv_obj_realign(bleIcon);
   }
 
   notificationState = notificatioManager.AreNewNotificationsAvailable();
   if (notificationState.IsUpdated()) {
-    if (notificationState.Get() == true) {
-      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
-      lv_obj_realign(notificationIcon);
-    } else {
-      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
-    }
+    lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
+    lv_obj_realign(notificationIcon);
   }
 
   currentDateTime = dateTimeController.CurrentDateTime();
-
   if (currentDateTime.IsUpdated()) {
     auto newDateTime = currentDateTime.Get();
 
@@ -250,9 +234,9 @@ bool PineTimeStyle::Refresh() {
     auto time = date::make_time(newDateTime - dp);
     auto yearMonthDay = date::year_month_day(dp);
 
-    auto year = (int) yearMonthDay.year();
-    auto month = static_cast<Pinetime::Controllers::DateTime::Months>((unsigned) yearMonthDay.month());
-    auto day = (unsigned) yearMonthDay.day();
+    auto year = static_cast<int>(yearMonthDay.year());
+    auto month = static_cast<Pinetime::Controllers::DateTime::Months>(static_cast<unsigned>(yearMonthDay.month()));
+    auto day = static_cast<unsigned>(yearMonthDay.day());
     auto dayOfWeek = static_cast<Pinetime::Controllers::DateTime::Days>(date::weekday(yearMonthDay).iso_encoding());
 
     int hour = time.hours().count();
@@ -263,9 +247,8 @@ bool PineTimeStyle::Refresh() {
 
     char hoursChar[3];
     char ampmChar[5];
-
     if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
-      sprintf(hoursChar, "%02d", hour);
+        sprintf(hoursChar, "%02d", hour);
     } else {
       if (hour == 0 && hour != 12) {
         hour = 12;
@@ -282,41 +265,26 @@ bool PineTimeStyle::Refresh() {
       sprintf(hoursChar, "%02d", hour);
     }
 
-    if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
+    if (hoursChar[0] != displayedChar[0] or hoursChar[1] != displayedChar[1] or minutesChar[0] != displayedChar[2] or
         minutesChar[1] != displayedChar[3]) {
       displayedChar[0] = hoursChar[0];
       displayedChar[1] = hoursChar[1];
       displayedChar[2] = minutesChar[0];
       displayedChar[3] = minutesChar[1];
 
-      char hourStr[3];
-      char minStr[3];
-
       if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
         lv_label_set_text(timeAMPM, ampmChar);
       }
 
-      /* Display the time as 2 pairs of digits */
-      sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
-      lv_label_set_text(timeDD1, hourStr);
-
-      sprintf(minStr, "%c%c", minutesChar[0], minutesChar[1]);
-      lv_label_set_text(timeDD2, minStr);
+      lv_label_set_text_fmt(timeDD1, "%s", hoursChar);
+      lv_label_set_text_fmt(timeDD2, "%s", minutesChar);
     }
 
     if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
-      char dayOfWeekStr[4];
-      char dayStr[3];
-      char monthStr[4];
-
-      sprintf(dayOfWeekStr, "%s", dateTimeController.DayOfWeekShortToString());
-      sprintf(dayStr, "%d", day);
-      sprintf(monthStr, "%s", dateTimeController.MonthShortToString());
-
-      lv_label_set_text(dateDayOfWeek, dayOfWeekStr);
-      lv_label_set_text(dateDay, dayStr);
+      lv_label_set_text_fmt(dateDayOfWeek, "%s", dateTimeController.DayOfWeekShortToString());
+      lv_label_set_text_fmt(dateDay, "%d", day);
       lv_obj_realign(dateDay);
-      lv_label_set_text(dateMonth, monthStr);
+      lv_label_set_text_fmt(dateMonth, "%s", dateTimeController.MonthShortToString());
 
       currentYear = year;
       currentMonth = month;
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 3b4ded1..f4cd28e 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -32,8 +32,6 @@ namespace Pinetime {
 
         bool Refresh() override;
 
-        void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
-
       private:
         char displayedChar[5];
 
@@ -67,9 +65,6 @@ namespace Pinetime {
         lv_obj_t* calendarBar2;
         lv_obj_t* calendarCrossBar1;
         lv_obj_t* calendarCrossBar2;
-        lv_obj_t* heartbeatIcon;
-        lv_obj_t* heartbeatValue;
-        lv_obj_t* heartbeatBpm;
         lv_obj_t* notificationIcon;
         lv_obj_t* stepGauge;
         lv_color_t needle_colors[1];
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index f188937..621929b 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -10,38 +10,37 @@ LV_IMG_DECLARE(bg_clock);
 using namespace Pinetime::Applications::Screens;
 
 namespace {
-
-constexpr auto HOUR_LENGTH = 70;
-constexpr auto MINUTE_LENGTH = 90;
-constexpr auto SECOND_LENGTH = 110;
+constexpr int16_t HourLength = 70;
+constexpr int16_t MinuteLength = 90;
+constexpr int16_t SecondLength = 110;
 
 // sin(90) = 1 so the value of _lv_trigo_sin(90) is the scaling factor
 const auto LV_TRIG_SCALE = _lv_trigo_sin(90);
 
-int16_t cosine(int16_t angle) {
+int16_t Cosine(int16_t angle) {
   return _lv_trigo_sin(angle + 90);
 }
 
-int16_t sine(int16_t angle) {
+int16_t Sine(int16_t angle) {
   return _lv_trigo_sin(angle);
 }
 
-int16_t coordinate_x_relocate(int16_t x) {
+int16_t CoordinateXRelocate(int16_t x) {
   return (x + LV_HOR_RES / 2);
 }
 
-int16_t coordinate_y_relocate(int16_t y) {
+int16_t CoordinateYRelocate(int16_t y) {
   return std::abs(y - LV_HOR_RES / 2);
 }
 
-lv_point_t coordinate_relocate(int16_t radius, int16_t angle) {
+lv_point_t CoordinateRelocate(int16_t radius, int16_t angle) {
   return lv_point_t{
-    .x = coordinate_x_relocate(radius * static_cast<int32_t>(sine(angle)) / LV_TRIG_SCALE),
-    .y = coordinate_y_relocate(radius * static_cast<int32_t>(cosine(angle)) / LV_TRIG_SCALE)
+    .x = CoordinateXRelocate(radius * static_cast<int32_t>(Sine(angle)) / LV_TRIG_SCALE),
+    .y = CoordinateYRelocate(radius * static_cast<int32_t>(Cosine(angle)) / LV_TRIG_SCALE)
   };
 }
 
-} // namespace
+}
 
 WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
                                  Controllers::DateTime& dateTimeController,
@@ -123,7 +122,6 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
 }
 
 WatchFaceAnalog::~WatchFaceAnalog() {
-
   lv_style_reset(&hour_line_style);
   lv_style_reset(&hour_line_style_trace);
   lv_style_reset(&minute_line_style);
@@ -134,18 +132,17 @@ WatchFaceAnalog::~WatchFaceAnalog() {
 }
 
 void WatchFaceAnalog::UpdateClock() {
-
   hour = dateTimeController.Hours();
   minute = dateTimeController.Minutes();
   second = dateTimeController.Seconds();
 
   if (sMinute != minute) {
     auto const angle = minute * 6;
-    minute_point[0] = coordinate_relocate(30, angle);
-    minute_point[1] = coordinate_relocate(MINUTE_LENGTH, angle);
+    minute_point[0] = CoordinateRelocate(30, angle);
+    minute_point[1] = CoordinateRelocate(MinuteLength, angle);
 
-    minute_point_trace[0] = coordinate_relocate(5, angle);
-    minute_point_trace[1] = coordinate_relocate(31, angle);
+    minute_point_trace[0] = CoordinateRelocate(5, angle);
+    minute_point_trace[1] = CoordinateRelocate(31, angle);
 
     lv_line_set_points(minute_body, minute_point, 2);
     lv_line_set_points(minute_body_trace, minute_point_trace, 2);
@@ -156,11 +153,11 @@ void WatchFaceAnalog::UpdateClock() {
     sMinute = minute;
     auto const angle = (hour * 30 + minute / 2);
 
-    hour_point[0] = coordinate_relocate(30, angle);
-    hour_point[1] = coordinate_relocate(HOUR_LENGTH, angle);
+    hour_point[0] = CoordinateRelocate(30, angle);
+    hour_point[1] = CoordinateRelocate(HourLength, angle);
 
-    hour_point_trace[0] = coordinate_relocate(5, angle);
-    hour_point_trace[1] = coordinate_relocate(31, angle);
+    hour_point_trace[0] = CoordinateRelocate(5, angle);
+    hour_point_trace[1] = CoordinateRelocate(31, angle);
 
     lv_line_set_points(hour_body, hour_point, 2);
     lv_line_set_points(hour_body_trace, hour_point_trace, 2);
@@ -170,8 +167,8 @@ void WatchFaceAnalog::UpdateClock() {
     sSecond = second;
     auto const angle = second * 6;
 
-    second_point[0] = coordinate_relocate(-20, angle);
-    second_point[1] = coordinate_relocate(SECOND_LENGTH, angle);
+    second_point[0] = CoordinateRelocate(-20, angle);
+    second_point[1] = CoordinateRelocate(SecondLength, angle);
     lv_line_set_points(second_body, second_point, 2);
   }
 }
@@ -186,16 +183,12 @@ bool WatchFaceAnalog::Refresh() {
   notificationState = notificationManager.AreNewNotificationsAvailable();
 
   if (notificationState.IsUpdated()) {
-    if (notificationState.Get() == true)
-      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
-    else
-      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
+    lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
   }
 
   currentDateTime = dateTimeController.CurrentDateTime();
 
   if (currentDateTime.IsUpdated()) {
-
     month = dateTimeController.Month();
     day = dateTimeController.Day();
     dayOfWeek = dateTimeController.DayOfWeek();
@@ -203,7 +196,6 @@ bool WatchFaceAnalog::Refresh() {
     UpdateClock();
 
     if ((month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
-
       lv_label_set_text_fmt(label_date_day, "%s\n%02i", dateTimeController.DayOfWeekShortToString(), day);
 
       currentMonth = month;
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index ac7f0ac..5d8c6a2 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -58,14 +58,12 @@ namespace Pinetime {
         lv_obj_t* minute_body_trace;
         lv_obj_t* second_body;
 
-        // ##
         lv_point_t hour_point[2];
         lv_point_t hour_point_trace[2];
         lv_point_t minute_point[2];
         lv_point_t minute_point_trace[2];
         lv_point_t second_point[2];
 
-        // ##
         lv_style_t hour_line_style;
         lv_style_t hour_line_style_trace;
         lv_style_t minute_line_style;
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index f1285ea..7a240f1 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -12,9 +12,6 @@
 #include "components/ble/NotificationManager.h"
 #include "components/heartrate/HeartRateController.h"
 #include "components/motion/MotionController.h"
-#include "components/settings/Settings.h"
-#include "../DisplayApp.h"
-
 using namespace Pinetime::Applications::Screens;
 
 WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
@@ -36,12 +33,6 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
     motionController {motionController} {
   settingsController.SetClockFace(0);
 
-  displayedChar[0] = 0;
-  displayedChar[1] = 0;
-  displayedChar[2] = 0;
-  displayedChar[3] = 0;
-  displayedChar[4] = 0;
-
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text(batteryIcon, Symbols::batteryFull);
   lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -5, 2);
@@ -56,7 +47,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   lv_label_set_text(bleIcon, Symbols::bluetooth);
   lv_obj_align(bleIcon, batteryPlug, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
-  notificationIcon = lv_label_create(lv_scr_act(), NULL);
+  notificationIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
   lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
   lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 10, 0);
@@ -111,17 +102,13 @@ bool WatchFaceDigital::Refresh() {
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
     lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
-    auto isCharging = batteryController.IsCharging() || batteryController.IsPowerPresent();
+    auto isCharging = batteryController.IsCharging() or batteryController.IsPowerPresent();
     lv_label_set_text(batteryPlug, BatteryIcon::GetPlugIcon(isCharging));
   }
 
   bleState = bleController.IsConnected();
   if (bleState.IsUpdated()) {
-    if (bleState.Get() == true) {
-      lv_label_set_text(bleIcon, BleIcon::GetIcon(true));
-    } else {
-      lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
-    }
+    lv_label_set_text(bleIcon, BleIcon::GetIcon(bleState.Get()));
   }
   lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -5, 5);
   lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0);
@@ -129,10 +116,7 @@ bool WatchFaceDigital::Refresh() {
 
   notificationState = notificatioManager.AreNewNotificationsAvailable();
   if (notificationState.IsUpdated()) {
-    if (notificationState.Get() == true)
-      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
-    else
-      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
+    lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
   }
 
   currentDateTime = dateTimeController.CurrentDateTime();
@@ -144,9 +128,9 @@ bool WatchFaceDigital::Refresh() {
     auto time = date::make_time(newDateTime - dp);
     auto yearMonthDay = date::year_month_day(dp);
 
-    auto year = (int) yearMonthDay.year();
-    auto month = static_cast<Pinetime::Controllers::DateTime::Months>((unsigned) yearMonthDay.month());
-    auto day = (unsigned) yearMonthDay.day();
+    auto year = static_cast<int>(yearMonthDay.year());
+    auto month = static_cast<Pinetime::Controllers::DateTime::Months>(static_cast<unsigned>(yearMonthDay.month()));
+    auto day = static_cast<unsigned>(yearMonthDay.day());
     auto dayOfWeek = static_cast<Pinetime::Controllers::DateTime::Days>(date::weekday(yearMonthDay).iso_encoding());
 
     int hour = time.hours().count();
@@ -175,15 +159,13 @@ bool WatchFaceDigital::Refresh() {
       sprintf(hoursChar, "%02d", hour);
     }
 
-    if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
-        minutesChar[1] != displayedChar[3]) {
+    if ((hoursChar[0] != displayedChar[0]) or (hoursChar[1] != displayedChar[1]) or (minutesChar[0] != displayedChar[2]) or
+        (minutesChar[1] != displayedChar[3])) {
       displayedChar[0] = hoursChar[0];
       displayedChar[1] = hoursChar[1];
       displayedChar[2] = minutesChar[0];
       displayedChar[3] = minutesChar[1];
 
-      char timeStr[6];
-
       if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
         lv_label_set_text(label_time_ampm, ampmChar);
         if (hoursChar[0] == '0') {
@@ -191,8 +173,7 @@ bool WatchFaceDigital::Refresh() {
         }
       }
 
-      sprintf(timeStr, "%c%c:%c%c", hoursChar[0], hoursChar[1], minutesChar[0], minutesChar[1]);
-      lv_label_set_text(label_time, timeStr);
+      lv_label_set_text_fmt(label_time, "%s:%s", hoursChar, minutesChar);
 
       if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
         lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 0, 0);
@@ -202,13 +183,11 @@ bool WatchFaceDigital::Refresh() {
     }
 
     if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
-      char dateStr[22];
       if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
-        sprintf(dateStr, "%s %d %s %d", dateTimeController.DayOfWeekShortToString(), day, dateTimeController.MonthShortToString(), year);
+        lv_label_set_text_fmt(label_date, "%s %d %s %d", dateTimeController.DayOfWeekShortToString(), day, dateTimeController.MonthShortToString(), year);
       } else {
-        sprintf(dateStr, "%s %s %d %d", dateTimeController.DayOfWeekShortToString(), dateTimeController.MonthShortToString(), day, year);
+        lv_label_set_text_fmt(label_date, "%s %s %d %d", dateTimeController.DayOfWeekShortToString(), dateTimeController.MonthShortToString(), day, year);
       }
-      lv_label_set_text(label_date, dateStr);
       lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_CENTER, 0, 60);
 
       currentYear = year;
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index 76c8d3d..6a6e1ac 100644
--- a/src/displayapp/screens/WatchFaceDigital.h
+++ b/src/displayapp/screens/WatchFaceDigital.h
@@ -35,10 +35,8 @@ namespace Pinetime {
 
         bool Refresh() override;
 
-        void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
-
       private:
-        char displayedChar[5];
+        char displayedChar[5] {};
 
         uint16_t currentYear = 1970;
         Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
@@ -63,7 +61,6 @@ namespace Pinetime {
         lv_obj_t* batteryPlug;
         lv_obj_t* heartbeatIcon;
         lv_obj_t* heartbeatValue;
-        lv_obj_t* heartbeatBpm;
         lv_obj_t* stepIcon;
         lv_obj_t* stepValue;
         lv_obj_t* notificationIcon;
-- 
cgit v0.10.2


From 7e92577c14895f57f5adda27ad54adbbc4b7ffe9 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 10 Aug 2021 21:02:51 +0300
Subject: Revert "Merge branch 'unblock_i2c' into develop"

This reverts commit 275a84b3238874d213271f4287e6c1c5bfcb4353, reversing
changes made to 9fb37550886f09f6510e99a5b452262c53c3987c.

diff --git a/src/main.cpp b/src/main.cpp
index 9a5b0cf..62e4446 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,7 +5,6 @@
 #include <libraries/gpiote/app_gpiote.h>
 #include <libraries/timer/app_timer.h>
 #include <softdevice/common/nrf_sdh.h>
-#include <nrf_delay.h>
 
 // nimble
 #define min // workaround: nimble's min/max macros conflict with libstdc++
@@ -306,20 +305,6 @@ int main(void) {
 
   nrf_drv_clock_init();
 
-  // Unblock i2c?
-  nrf_gpio_cfg(pinTwiScl,
-               NRF_GPIO_PIN_DIR_OUTPUT,
-               NRF_GPIO_PIN_INPUT_DISCONNECT,
-               NRF_GPIO_PIN_NOPULL,
-               NRF_GPIO_PIN_S0D1,
-               NRF_GPIO_PIN_NOSENSE);
-  nrf_gpio_pin_set(pinTwiScl);
-  for (uint8_t i = 0; i < 16; i++) {
-    nrf_gpio_pin_toggle(pinTwiScl);
-    nrf_delay_us(5);
-  }
-  nrf_gpio_cfg_default(pinTwiScl);
-
   debounceTimer = xTimerCreate("debounceTimer", 200, pdFALSE, (void*) 0, DebounceTimerCallback);
   debounceChargeTimer = xTimerCreate("debounceTimerCharge", 200, pdFALSE, (void*) 0, DebounceTimerChargeCallback);
 
-- 
cgit v0.10.2


From 8a694adb0979339664da0af6d51c480d26c5527b Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 10 Aug 2021 22:03:34 +0300
Subject: Rework TouchHandler into not a task


diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index 456c3e6..fc9edf8 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -12,10 +12,9 @@ TwiMaster::TwiMaster(const Modules module, const Parameters& params) : module {m
 }
 
 void TwiMaster::Init() {
-  sleeping = false;
   if(mutex == nullptr)
     mutex = xSemaphoreCreateBinary();
-
+  
   NRF_GPIO->PIN_CNF[params.pinScl] =
     ((uint32_t) GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) | ((uint32_t) GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
     ((uint32_t) GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | ((uint32_t) GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
@@ -177,14 +176,11 @@ void TwiMaster::Sleep() {
   nrf_gpio_cfg_default(6);
   nrf_gpio_cfg_default(7);
   NRF_LOG_INFO("[TWIMASTER] Sleep");
-  sleeping = true;
 }
 
 void TwiMaster::Wakeup() {
-  if (sleeping) {
-    Init();
-    NRF_LOG_INFO("[TWIMASTER] Wakeup");
-  }
+  Init();
+  NRF_LOG_INFO("[TWIMASTER] Wakeup");
 }
 
 /* Sometimes, the TWIM device just freeze and never set the event EVENTS_LASTTX.
@@ -210,4 +206,4 @@ void TwiMaster::FixHwFreezed() {
 
   // Re-enable I²C
   twiBaseAddress->ENABLE = twi_state;
-}
+}
\ No newline at end of file
diff --git a/src/drivers/TwiMaster.h b/src/drivers/TwiMaster.h
index 5748ec6..6175b99 100644
--- a/src/drivers/TwiMaster.h
+++ b/src/drivers/TwiMaster.h
@@ -39,7 +39,6 @@ namespace Pinetime {
       uint8_t internalBuffer[maxDataSize + registerSize];
       uint32_t txStartedCycleCount = 0;
       static constexpr uint32_t HwFreezedDelay {161000};
-      bool sleeping;
     };
   }
-}
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 62e4446..dffec28 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -166,8 +166,7 @@ Pinetime::System::SystemTask systemTask(spi,
 
 void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
   if (pin == pinTouchIrq) {
-    twiMaster.Wakeup();
-    touchHandler.WakeUp();
+    systemTask.OnTouchEvent();
     return;
   }
 
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 7ba7cf6..5f36313 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -150,9 +150,6 @@ void SystemTask::Work() {
   heartRateSensor.Disable();
   heartRateApp.Start();
 
-  touchHandler.Register(this);
-  touchHandler.Start();
-
   nrf_gpio_cfg_sense_input(pinButton, (nrf_gpio_pin_pull_t) GPIO_PIN_CNF_PULL_Pulldown, (nrf_gpio_pin_sense_t) GPIO_PIN_CNF_SENSE_High);
   nrf_gpio_cfg_output(15);
   nrf_gpio_pin_set(15);
@@ -244,6 +241,8 @@ void SystemTask::Work() {
           isDimmed = false;
           break;
         case Messages::TouchWakeUp: {
+          twiMaster.Wakeup();
+          touchHandler.GetNewTouchInfo();
           auto gesture = touchHandler.GestureGet();
           if ((gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap &&
                settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) ||
@@ -299,6 +298,9 @@ void SystemTask::Work() {
           xTimerStart(dimTimer, 0);
           break;
         case Messages::OnTouchEvent:
+          if (touchHandler.GetNewTouchInfo()) {
+            touchHandler.UpdateLvglTouchPoint();
+          }
           ReloadIdleTimer();
           break;
         case Messages::OnButtonEvent:
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index 187aa69..c1a3c0d 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -18,61 +18,47 @@ Pinetime::Drivers::Cst816S::Gestures TouchHandler::GestureGet() {
   return returnGesture;
 }
 
-void TouchHandler::Start() {
-  if (pdPASS != xTaskCreate(TouchHandler::Process, "Touch", 100, this, 0, &taskHandle)) {
-    APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
-  }
-}
-
-void TouchHandler::Process(void* instance) {
-  auto* app = static_cast<TouchHandler*>(instance);
-  app->Work();
-}
-
-void TouchHandler::Work() {
-  bool slideReleased = true;
-  while (true) {
-    vTaskSuspend(taskHandle);
+bool TouchHandler::GetNewTouchInfo() {
+  info = touchPanel.GetTouchInfo();
 
-    info = touchPanel.GetTouchInfo();
-
-    if (info.isValid) {
-      if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
-        if (slideReleased) {
-          if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown ||
-              info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
-              info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp ||
-              info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
-            slideReleased = false;
-          }
-          gesture = info.gesture;
-        }
-      }
+  if (!info.isValid) {
+    return false;
+  }
 
-      if (!systemTask->IsSleeping()) {
+  if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
+    if (slideReleased) {
+      if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown ||
+          info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
+          info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp ||
+          info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
         if (info.touching) {
-          if (!isCancelled) {
-            lvgl.SetNewTouchPoint(info.x, info.y, true);
-          }
-        } else {
-          if (isCancelled) {
-            lvgl.SetNewTouchPoint(-1, -1, false);
-            isCancelled = false;
-          } else {
-            lvgl.SetNewTouchPoint(info.x, info.y, false);
-          }
-          slideReleased = true;
+          gesture = info.gesture;
+          slideReleased = false;
         }
+      } else {
+        gesture = info.gesture;
       }
-      systemTask->OnTouchEvent();
     }
   }
-}
 
-void TouchHandler::Register(Pinetime::System::SystemTask* systemTask) {
-  this->systemTask = systemTask;
+  if (!info.touching) {
+    slideReleased = true;
+  }
+
+  return true;
 }
 
-void TouchHandler::WakeUp() {
-  vTaskResume(taskHandle);
+void TouchHandler::UpdateLvglTouchPoint() {
+  if (info.touching) {
+    if (!isCancelled) {
+      lvgl.SetNewTouchPoint(info.x, info.y, true);
+    }
+  } else {
+    if (isCancelled) {
+      lvgl.SetNewTouchPoint(-1, -1, false);
+      isCancelled = false;
+    } else {
+      lvgl.SetNewTouchPoint(info.x, info.y, false);
+    }
+  }
 }
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index 6b8189f..38cb36c 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -19,9 +19,9 @@ namespace Pinetime {
       public:
         explicit TouchHandler(Drivers::Cst816S&, Components::LittleVgl&);
         void CancelTap();
+        bool GetNewTouchInfo();
+        void UpdateLvglTouchPoint();
         void Register(Pinetime::System::SystemTask* systemTask);
-        void Start();
-        void WakeUp();
 
         bool IsTouching() const {
           return info.touching;
@@ -34,16 +34,13 @@ namespace Pinetime {
         }
         Drivers::Cst816S::Gestures GestureGet();
       private:
-        static void Process(void* instance);
-        void Work();
 
         Pinetime::Drivers::Cst816S::TouchInfos info;
-        Pinetime::System::SystemTask* systemTask = nullptr;
-        TaskHandle_t taskHandle;
         Pinetime::Drivers::Cst816S& touchPanel;
         Pinetime::Components::LittleVgl& lvgl;
         Pinetime::Drivers::Cst816S::Gestures gesture;
         bool isCancelled = false;
+        bool slideReleased = true;
     };
   }
 }
-- 
cgit v0.10.2


From 6776776421bd73c8e8f927af3ffc45ce77fe0e0d Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 10 Aug 2021 22:18:21 +0300
Subject: Make diff smaller and revert some changes in DisplayApp


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index b4fc885..e26a96f 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -52,6 +52,28 @@ namespace {
   static inline bool in_isr(void) {
     return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) != 0;
   }
+
+  TouchEvents ConvertGesture(Pinetime::Drivers::Cst816S::Gestures gesture) {
+    switch (gesture) {
+      case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
+        return TouchEvents::Tap;
+      case Pinetime::Drivers::Cst816S::Gestures::LongPress:
+        return TouchEvents::LongTap;
+      case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
+        return TouchEvents::DoubleTap;
+      case Pinetime::Drivers::Cst816S::Gestures::SlideRight:
+        return TouchEvents::SwipeRight;
+      case Pinetime::Drivers::Cst816S::Gestures::SlideLeft:
+        return TouchEvents::SwipeLeft;
+      case Pinetime::Drivers::Cst816S::Gestures::SlideDown:
+        return TouchEvents::SwipeDown;
+      case Pinetime::Drivers::Cst816S::Gestures::SlideUp:
+        return TouchEvents::SwipeUp;
+      case Pinetime::Drivers::Cst816S::Gestures::None:
+      default:
+        return TouchEvents::None;
+    }
+  }
 }
 
 DisplayApp::DisplayApp(Drivers::St7789& lcd,
@@ -185,6 +207,41 @@ void DisplayApp::Refresh() {
           LoadApp(Apps::Timer, DisplayApp::FullRefreshDirections::Down);
         }
         break;
+      case Messages::TouchEvent: {
+        if (state != States::Running) {
+          break;
+        }
+        auto gesture = ConvertGesture(touchHandler.GestureGet());
+        if (gesture == TouchEvents::None) {
+          break;
+        }
+        if (!currentScreen->OnTouchEvent(gesture)) {
+          if (currentApp == Apps::Clock) {
+            switch (gesture) {
+              case TouchEvents::SwipeUp:
+                LoadApp(Apps::Launcher, DisplayApp::FullRefreshDirections::Up);
+                break;
+              case TouchEvents::SwipeDown:
+                LoadApp(Apps::Notifications, DisplayApp::FullRefreshDirections::Down);
+                break;
+              case TouchEvents::SwipeRight:
+                LoadApp(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
+                break;
+              case TouchEvents::DoubleTap:
+                PushMessageToSystemTask(System::Messages::GoToSleep);
+                break;
+              default:
+                break;
+            }
+          } else if (returnTouchEvent == gesture) {
+            LoadApp(returnToApp, returnDirection);
+            brightnessController.Set(settingsController.GetBrightness());
+            brightnessController.Backup();
+          }
+        } else {
+          touchHandler.CancelTap();
+        }
+      } break;
       case Messages::ButtonPushed:
         if (currentApp == Apps::Clock) {
           PushMessageToSystemTask(System::Messages::GoToSleep);
@@ -207,44 +264,14 @@ void DisplayApp::Refresh() {
     }
   }
 
-  auto gesture = GetGesture();
-  if (gesture != TouchEvents::None) {
-    if (!currentScreen->OnTouchEvent(gesture)) {
-      if (currentApp == Apps::Clock) {
-        switch (gesture) {
-          case TouchEvents::SwipeUp:
-            LoadApp(Apps::Launcher, DisplayApp::FullRefreshDirections::Up);
-            break;
-          case TouchEvents::SwipeDown:
-            LoadApp(Apps::Notifications, DisplayApp::FullRefreshDirections::Down);
-            break;
-          case TouchEvents::SwipeRight:
-            LoadApp(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
-            break;
-          case TouchEvents::DoubleTap:
-            PushMessageToSystemTask(System::Messages::GoToSleep);
-            break;
-          default:
-            break;
-        }
-      } else if (returnTouchEvent == gesture) {
-        LoadApp(returnToApp, returnDirection);
-        brightnessController.Set(settingsController.GetBrightness());
-        brightnessController.Backup();
-      }
-    } else {
-      touchHandler.CancelTap();
-    }
+  if (nextApp != Apps::None) {
+    LoadApp(nextApp, nextDirection);
+    nextApp = Apps::None;
   }
 
   if (touchHandler.IsTouching()) {
     currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
   }
-
-  if (nextApp != Apps::None) {
-    LoadApp(nextApp, nextDirection);
-    nextApp = Apps::None;
-  }
 }
 
 void DisplayApp::RunningState() {
@@ -407,30 +434,6 @@ void DisplayApp::PushMessage(Messages msg) {
   }
 }
 
-TouchEvents DisplayApp::GetGesture() {
-  auto gesture = touchHandler.GestureGet();
-  switch (gesture) {
-    case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-      return TouchEvents::Tap;
-    case Pinetime::Drivers::Cst816S::Gestures::LongPress:
-      return TouchEvents::LongTap;
-    case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
-      return TouchEvents::DoubleTap;
-    case Pinetime::Drivers::Cst816S::Gestures::SlideRight:
-      return TouchEvents::SwipeRight;
-    case Pinetime::Drivers::Cst816S::Gestures::SlideLeft:
-      return TouchEvents::SwipeLeft;
-    case Pinetime::Drivers::Cst816S::Gestures::SlideDown:
-      return TouchEvents::SwipeDown;
-    case Pinetime::Drivers::Cst816S::Gestures::SlideUp:
-      return TouchEvents::SwipeUp;
-    case Pinetime::Drivers::Cst816S::Gestures::None:
-    default:
-      return TouchEvents::None;
-  }
-  return TouchEvents::None;
-}
-
 void DisplayApp::SetFullRefresh(DisplayApp::FullRefreshDirections direction) {
   switch (direction) {
     case DisplayApp::FullRefreshDirections::Down:
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index 2648098..322505e 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -8,6 +8,7 @@ namespace Pinetime {
         UpdateDateTime,
         UpdateBleConnection,
         UpdateBatteryLevel,
+        TouchEvent,
         ButtonPushed,
         NewNotification,
         TimerDone,
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 5f36313..3ee26c5 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -302,6 +302,7 @@ void SystemTask::Work() {
             touchHandler.UpdateLvglTouchPoint();
           }
           ReloadIdleTimer();
+          displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
           break;
         case Messages::OnButtonEvent:
           ReloadIdleTimer();
-- 
cgit v0.10.2


From cd7ca458fa959ba6d60b2cf107b198e462315abd Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 10 Aug 2021 22:37:41 +0300
Subject: Remove leftover


diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index 38cb36c..e2140ca 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -21,7 +21,6 @@ namespace Pinetime {
         void CancelTap();
         bool GetNewTouchInfo();
         void UpdateLvglTouchPoint();
-        void Register(Pinetime::System::SystemTask* systemTask);
 
         bool IsTouching() const {
           return info.touching;
-- 
cgit v0.10.2


From fe33c756b7326cbf0a6c70822b70cff4dc2e3401 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Wed, 11 Aug 2021 18:31:40 +0300
Subject: Fix longpress gesture


diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index c1a3c0d..735b311 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -26,14 +26,15 @@ bool TouchHandler::GetNewTouchInfo() {
   }
 
   if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
-    if (slideReleased) {
+    if (gestureReleased) {
       if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown ||
           info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
           info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp ||
-          info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
+          info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight ||
+          info.gesture == Pinetime::Drivers::Cst816S::Gestures::LongPress) {
         if (info.touching) {
           gesture = info.gesture;
-          slideReleased = false;
+          gestureReleased = false;
         }
       } else {
         gesture = info.gesture;
@@ -42,7 +43,7 @@ bool TouchHandler::GetNewTouchInfo() {
   }
 
   if (!info.touching) {
-    slideReleased = true;
+    gestureReleased = true;
   }
 
   return true;
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index e2140ca..f544293 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -39,7 +39,7 @@ namespace Pinetime {
         Pinetime::Components::LittleVgl& lvgl;
         Pinetime::Drivers::Cst816S::Gestures gesture;
         bool isCancelled = false;
-        bool slideReleased = true;
+        bool gestureReleased = true;
     };
   }
 }
-- 
cgit v0.10.2


From 1d341a7aeb16acb45f25b16590630efd655ecd30 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Thu, 12 Aug 2021 14:06:58 +0300
Subject: Don't reconfigure pins


diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index 52f93d8..429a6eb 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -180,15 +180,10 @@ TwiMaster::ErrorCodes TwiMaster::Write(uint8_t deviceAddress, const uint8_t* dat
 }
 
 void TwiMaster::Sleep() {
-  while (twiBaseAddress->ENABLE != 0) {
-    twiBaseAddress->ENABLE = (TWIM_ENABLE_ENABLE_Disabled << TWIM_ENABLE_ENABLE_Pos);
-  }
-  nrf_gpio_cfg_default(6);
-  nrf_gpio_cfg_default(7);
+  twiBaseAddress->ENABLE = (TWIM_ENABLE_ENABLE_Disabled << TWIM_ENABLE_ENABLE_Pos);
 }
 
 void TwiMaster::Wakeup() {
-  ConfigurePins();
   twiBaseAddress->ENABLE = (TWIM_ENABLE_ENABLE_Enabled << TWIM_ENABLE_ENABLE_Pos);
 }
 
-- 
cgit v0.10.2


From 6bffc7d52840affc5c037d1bb783172b99d4731a Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 12 Aug 2021 21:28:41 +0200
Subject: Tidying


diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 04128b2..6b0cc59 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -62,7 +62,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[4] = 0;
 
   //Create a 200px wide background rectangle
-
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
-- 
cgit v0.10.2


From fbb4e8c6ae461697e7151927205ce134eb26de53 Mon Sep 17 00:00:00 2001
From: mabuch <marcel.buechler@gmail.com>
Date: Sat, 14 Aug 2021 14:47:00 +0200
Subject: fix Github Action build Firmware


diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4a71b7e..f25fd31 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Install Embedded Arm Toolchain arm-none-eabi-gcc
         if:   steps.cache-toolchain.outputs.cache-hit != 'true'  # Install toolchain if not found in cache
-        uses: fiam/arm-none-eabi-gcc@v1.0.2
+        uses: fiam/arm-none-eabi-gcc@v1.0.4
         with:
           # GNU Embedded Toolchain for Arm release name, in the V-YYYY-qZ format (e.g. "9-2019-q4")
           release: 9-2020-q2
@@ -83,10 +83,16 @@ jobs:
         if:   steps.cache-mcuboot.outputs.cache-hit != 'true'  # Install MCUBoot if not found in cache
         run:  |
           cd ${{ runner.temp }}
-          git clone --branch v1.5.0 https://github.com/JuulLabs-OSS/mcuboot
+          git clone --branch v1.5.0 https://github.com/mcu-tools/mcuboot
 
       - name: Install imgtool dependencies
-        run:  pip3 install --user -r ${{ runner.temp }}/mcuboot/scripts/requirements.txt
+        run:  |
+          pip3 install --user -r ${{ runner.temp }}/mcuboot/scripts/requirements.txt
+
+      # cbor is a dependency that is not currently included in mcuboot requirements.txt
+      - name: Install imgtool dependencies (cbor)
+        run:  |
+          pip3 install --user cbor
 
       - name: Install adafruit-nrfutil
         run:  |
@@ -99,6 +105,8 @@ jobs:
 
       - name: Checkout source files
         uses: actions/checkout@v2
+        with:
+          submodules: recursive
 
       - name: Show files
         run:  set ; pwd ; ls -l
@@ -110,7 +118,7 @@ jobs:
         run:  |
           mkdir -p build
           cd build
-          cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 ../
+          cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../
 
         #########################################################################################
         # Make and Upload DFU Package
@@ -125,19 +133,10 @@ jobs:
           cd build
           make pinetime-mcuboot-app
 
-      - name: Create firmware image
-        run:  |
-          # The generated firmware binary looks like "pinetime-mcuboot-app-0.8.2.bin"
-          ls -l build/src/pinetime-mcuboot-app*.bin
-          ${{ runner.temp }}/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header build/src/pinetime-mcuboot-app*.bin build/src/pinetime-mcuboot-app-img.bin
-          ${{ runner.temp }}/mcuboot/scripts/imgtool.py verify build/src/pinetime-mcuboot-app-img.bin
-
-      - name: Create DFU package
+      - name: Unzip DFU package
         run:  |
-          ~/.local/bin/adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/src/pinetime-mcuboot-app-img.bin build/src/pinetime-mcuboot-app-dfu.zip
-          unzip -v build/src/pinetime-mcuboot-app-dfu.zip
           # Unzip the package because Upload Artifact will zip up the files
-          unzip build/src/pinetime-mcuboot-app-dfu.zip -d build/src/pinetime-mcuboot-app-dfu
+          unzip build/src/pinetime-mcuboot-app-dfu*.zip -d build/src/pinetime-mcuboot-app-dfu
 
       - name: Upload DFU package
         uses: actions/upload-artifact@v2
-- 
cgit v0.10.2


From 40afae3833efd2220bac168467d82e3ca6c350be Mon Sep 17 00:00:00 2001
From: mabuch <marcel.buechler@gmail.com>
Date: Sat, 14 Aug 2021 20:46:29 +0200
Subject: Github Action - update mcuboot version


diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f25fd31..4744eae 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -83,17 +83,12 @@ jobs:
         if:   steps.cache-mcuboot.outputs.cache-hit != 'true'  # Install MCUBoot if not found in cache
         run:  |
           cd ${{ runner.temp }}
-          git clone --branch v1.5.0 https://github.com/mcu-tools/mcuboot
+          git clone --branch v1.7.2 https://github.com/mcu-tools/mcuboot
 
       - name: Install imgtool dependencies
         run:  |
           pip3 install --user -r ${{ runner.temp }}/mcuboot/scripts/requirements.txt
 
-      # cbor is a dependency that is not currently included in mcuboot requirements.txt
-      - name: Install imgtool dependencies (cbor)
-        run:  |
-          pip3 install --user cbor
-
       - name: Install adafruit-nrfutil
         run:  |
           pip3 install --user wheel
-- 
cgit v0.10.2


From f0e9d13329f5647a8e55b89d167f8306d58cb518 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sat, 14 Aug 2021 21:58:38 +0300
Subject: Update contribute.md (#475)

* Update contribute.md
* Add newlines and remove spaces
* Replace CONTRIBUTING.md with doc/contribute.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index a6fa682..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,33 +0,0 @@
-This contribution guide is in progress, improvements are welcome.
-
-### Code style
-
-Any C++ code PRs should aim to follow the style of existing code in the project. 
-
-Using an autoformatter is heavily recommended, but make sure it's configured properly. 
-
-There's currently preconfigured autoformatter rules for: 
-
-  * CLion (IntelliJ) in .idea/codeStyles/Project.xml
-  
-You can use those to configure your own IDE if it's not already on the list.
-
-#### Linting errors and compiler warnings
-
-Try to avoid any currently enabled warnings and try to reduce the amount of linter errors.
-
-#### Spelling
-
-Make sure you spellcheck your code before commiting it.
-
-#### TODO, FIXME
-
-Check before commiting that you haven't forgotten anything, preferably don't leave these in your commits.
-
-#### Licence headers
-
-You should add your name to the comma-space separated list of contributors if there's a license header.
-
-### License
-
-By contributing you agree to licence your code under the repository's general license (which is currently GPL-v3+).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 120000
index 0000000..15e2c68
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1 @@
+doc/contribute.md
\ No newline at end of file
diff --git a/doc/contribute.md b/doc/contribute.md
index 9f4c215..0c34e2a 100644
--- a/doc/contribute.md
+++ b/doc/contribute.md
@@ -1,68 +1,89 @@
 # How to contribute?
+
 ## Report bugs
-You use your Pinetime and find a bug in the firmware? [Create an issue on Github](https://github.com/JF002/InfiniTime/issues) explaining the bug, how to reproduce it, the version of the firmware you use...
+
+Have you found a bug in the firmware? [Create an issue on Github](https://github.com/JF002/InfiniTime/issues) explaining the bug, how to reproduce it, the version of the firmware you use...
+
 ## Write and improve documentation
+
 Documentation might be incomplete, or not clear enough, and it is always possible to improve it with better wording, pictures, photo, video,...
 
 As the documentation is part of the source code, you can submit your improvements to the documentation by submitting a pull request (see below).
+
 ## Fix bugs, add functionalities and improve the code
+
 You want to fix a bug, add a cool new functionality or improve the code? See *How to submit a pull request below*.
+
 ## Spread the word
-The Pinetime is a cool open source project that deserves to be known. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open-source firmware for a smartwatch!
+
+The Pinetime is a cool open source project that deserves to be known. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open source firmware for a smartwatch!
 
 # How to submit a pull request ?
 
 ## TL;DR
+
  - Create a branch from develop;
  - Work on a single subject in this branch. Create multiple branches/pulls-requests if you want to work on multiple subjects (bugs, features,...);
  - Test your modifications on the actual hardware;
  - Check the code formatting against our coding conventions and [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy);
  - Clean your code and remove files that are not needed;
- - Write documentation related to your new feature is applicable;
- - Create the pull-request and write a great description about it : what does your PR do, why, how,... Add pictures and video if possible;
+ - Write documentation related to your new feature if applicable;
+ - Create a pull request and write a great description about it : what does your PR do, why, how,... Add pictures and video if possible;
  - Wait for someone to review your PR and take part in the review process;
  - Your PR will eventually be merged :)
 
-Your contribution is more than welcome!
+Your contributions are more than welcome!
 
-If you want to fix a bug, add a functionality or improve the code, you'll first need to create a branch from the **develop** branch (see [this page about the branching model](./branches.md)). This branch is called a feature branch, and you should choose a name that explains what you are working on (ex: "add-doc-about-contributions"). In this branch, **focus on only one topic, bug or feature**. For example, if you created this branch to work on the UI of a specific application, do not commit modifications about the SPI driver. If you want to work on multiple topics, create one branch per topic.
+If you want to fix a bug, add functionality or improve the code, you'll first need to create a branch from the **develop** branch (see [this page about the branching model](./branches.md)). This branch is called a feature branch, and you should choose a name that explains what you are working on (ex: "add-doc-about-contributions"). In this branch, **focus on only one topic, bug or feature**. For example, if you created this branch to work on the UI of a specific application, do not commit modifications about the SPI driver. If you want to work on multiple topics, create one branch for each topic.
 
 When your feature branch is ready, **make sure it actually works** and **do not forget to write documentation** about it if it's relevant.
 
-I **strongly discourage to create a PR containing modifications that haven't been tested**. If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedback about your code.
+**Creating a pull request containing modifications that haven't been tested is strongly discouraged.** If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedback about your code.
 
 Also, before submitting your PR, check the coding style of your code against the **coding conventions** detailed below. This project also provides [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy) configuration files. You can use them to ensure correct formatting of your code.
 
-Do not forget to check the files you are going to commit and remove those who are not necessary (config files from your IDE, for example). Remove old comments, commented code,...
+Don't forget to check the files you are going to commit and remove those which aren't necessary (config files from your IDE, for example). Remove old comments, commented code,...
 
-Then, you can submit a pull-request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how is it designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of your work.
+Then, you can submit a pull request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how it is designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of your work.
 
 Other contributors can post comments about the pull request, maybe ask for more info or adjustments in the code.
 
-Once the pull request is reviewed and accepted, it'll be merge in **develop** and will be released in the next release version of the firmware.
+Once the pull request is reviewed and accepted, it'll be merged into **develop** and will be released in the next version of the firmware.
 
 ## Why  all these rules?
-Reviewing pull-requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Every little thing you do to make their lives easier will **increase the chances your PR will be merge quickly**.
 
-When reviewing PR, the author and contributors will first look at the **description**. If it's easy to understand what the PR does, why the modification is needed or interesting and how it's done, a good part of the work is already done : we understand the PR and its context.
+Reviewing pull requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Everything you do to make reviewing easier will **get your PR merged faster**.
 
-Then, reviewing **a few files that were modified for a single purpose** is a lot more easier than to review 30 files modified for many reasons (bug fix, UI improvements, typos in doc,...), even if all these changes make sense. Also, it's possible that we agree on some modification but not on some other, and we won't be able to merge the PR because of the changes that are not accepted.
+When reviewing PRs, the author and contributors will first look at the **description**. If it's easy to understand what the PR does, why the modification is needed or interesting and how it's done, a good part of the work is already done : we understand the PR and its context.
 
-We do our best to keep the code as consistent as possible, and that means we pay attention to the **formatting** of the code. If the code formatting is not consistent with our code base, we'll ask you to review it, which will take more time.
+Then, reviewing **a few files that were modified for a single purpose** is a lot more easier than to review 30 files modified for many reasons (bug fix, UI improvements, typos in doc,...), even if all these changes make sense. Also, it's possible that we agree on some modification but not on some other, so we won't be able to merge the PR because of the changes that are not accepted.
 
-The last step of the review consists in **testing** the modification. If it doesn't work out of the box, we'll ask your to review your code and to ensure that it works as expected.
+We do our best to keep the code as consistent as possible. If the formatting of the code in your PR is not consistent with our code base, we'll ask you to review it, which will take more time.
 
-It's totally normal for a PR to need some more work even after it was created, that's why we review them. But every round trip takes time, and it's good practice to try to reduce them as much as possible by following those simple rules.
+The last step of the review consists of **testing** the modification. If it doesn't work out of the box, we'll ask your to review your code and to ensure that it works as expected.
+
+It's totally normal for a PR to need some more work even after it was created, that's why we review them. But every round trip takes time, so it's good practice to try to reduce them as much as possible by following those simple rules.
 
 # Coding convention
+
 ## Language
-The language of this project is **C++**, and all new code must be written in C++. (Modern) C++ provides a lot of useful tools and functionalities that are beneficial for embedded software development like `constexpr`, `template` and anything that provides zero-cost abstraction.  
 
-It's OK to include C code if this code comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK.
+The language of this project is **C++**, and all new code must be written in C++. (Modern) C++ provides a lot of useful tools and functionalities that are beneficial for embedded software development like `constexpr`, `template` and anything that provides zero-cost abstraction.
+
+C code is accepted if it comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK.
 
 ## Coding style
+
 The most important rule to follow is to try to keep the code as easy to read and maintain as possible.
 
+Using an autoformatter is highly recommended, but make sure it's configured properly.
+
+There are preconfigured autoformatter rules for:
+
+  * CLion (IntelliJ) in .idea/codeStyles/Project.xml
+
+If there are no preconfigured rules for your IDE, you can use one of the existing ones to configure your IDE.
+
  - **Indentation** : 2 spaces, no tabulation
  - **Opening brace** at the end of the line
  - **Naming** : Choose self-describing variable name
-- 
cgit v0.10.2


From e51c3eee4ed50ccec55c105fd93a46b7715601b3 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 9 Aug 2021 21:49:35 +0300
Subject: Try to fix bootloop


diff --git a/src/main.cpp b/src/main.cpp
index ffbba5e..a18c394 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,7 @@
 #include <libraries/gpiote/app_gpiote.h>
 #include <libraries/timer/app_timer.h>
 #include <softdevice/common/nrf_sdh.h>
+#include <nrf_delay.h>
 
 // nimble
 #define min // workaround: nimble's min/max macros conflict with libstdc++
@@ -300,6 +301,14 @@ int main(void) {
 
   nrf_drv_clock_init();
 
+  // Unblock i2c?
+  nrf_gpio_cfg_output(pinTwiScl);
+  for (uint8_t i = 0; i < 16; i++) {
+    nrf_gpio_pin_toggle(pinTwiScl);
+    nrf_delay_us(5);
+  }
+  nrf_gpio_cfg_default(pinTwiScl);
+
   debounceTimer = xTimerCreate("debounceTimer", 200, pdFALSE, (void*) 0, DebounceTimerCallback);
   debounceChargeTimer = xTimerCreate("debounceTimerCharge", 200, pdFALSE, (void*) 0, DebounceTimerChargeCallback);
 
-- 
cgit v0.10.2


From 10f610b2191ed0783a2f36a5e869019fc548aa24 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 9 Aug 2021 22:07:06 +0300
Subject: Better pin configuration


diff --git a/src/main.cpp b/src/main.cpp
index a18c394..39d8906 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -302,7 +302,12 @@ int main(void) {
   nrf_drv_clock_init();
 
   // Unblock i2c?
-  nrf_gpio_cfg_output(pinTwiScl);
+  nrf_gpio_cfg(pinTwiScl,
+               NRF_GPIO_PIN_DIR_OUTPUT,
+               NRF_GPIO_PIN_INPUT_DISCONNECT,
+               NRF_GPIO_PIN_NOPULL,
+               NRF_GPIO_PIN_S0D1,
+               NRF_GPIO_PIN_NOSENSE);
   for (uint8_t i = 0; i < 16; i++) {
     nrf_gpio_pin_toggle(pinTwiScl);
     nrf_delay_us(5);
-- 
cgit v0.10.2


From 7c28de0b6fa7fa33ff10d09847742a35de26cf2b Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 9 Aug 2021 22:11:35 +0300
Subject: Set pin before loop


diff --git a/src/main.cpp b/src/main.cpp
index 39d8906..d301be6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -308,6 +308,7 @@ int main(void) {
                NRF_GPIO_PIN_NOPULL,
                NRF_GPIO_PIN_S0D1,
                NRF_GPIO_PIN_NOSENSE);
+  nrf_gpio_pin_set(pinTwiScl);
   for (uint8_t i = 0; i < 16; i++) {
     nrf_gpio_pin_toggle(pinTwiScl);
     nrf_delay_us(5);
-- 
cgit v0.10.2


From 61927751612a9dc8e53fe7882c1e576a90843bc4 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 13 Aug 2021 22:03:27 +0300
Subject: Improve metronome


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index d4a73f5..49a56a0 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -414,6 +414,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       break;
     case Apps::Metronome:
       currentScreen = std::make_unique<Screens::Metronome>(this, motorController, *systemTask);
+      ReturnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::None);
       break;
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index 7bfbccb..ce23cc3 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -1,35 +1,15 @@
 #include "Metronome.h"
-
-#include "Screen.h"
 #include "Symbols.h"
-#include "lvgl/lvgl.h"
-#include "FreeRTOSConfig.h"
-#include "task.h"
-
-#include <string>
-#include <tuple>
 
 using namespace Pinetime::Applications::Screens;
 
 namespace {
-  float calculateDelta(const TickType_t startTime, const TickType_t currentTime) {
-    TickType_t delta = 0;
-    // Take care of overflow
-    if (startTime > currentTime) {
-      delta = 0xffffffff - startTime;
-      delta += (currentTime + 1);
-    } else {
-      delta = currentTime - startTime;
-    }
-    return static_cast<float>(delta) / static_cast<float>(configTICK_RATE_HZ);
-  }
-
-  static void eventHandler(lv_obj_t* obj, lv_event_t event) {
-    Metronome* screen = static_cast<Metronome*>(obj->user_data);
+  void eventHandler(lv_obj_t* obj, lv_event_t event) {
+    auto* screen = static_cast<Metronome*>(obj->user_data);
     screen->OnEvent(obj, event);
   }
 
-  lv_obj_t* createLabel(const char* name, lv_obj_t* reference, lv_align_t align, lv_font_t* font, uint8_t x = 0, uint8_t y = 0) {
+  lv_obj_t* createLabel(const char* name, lv_obj_t* reference, lv_align_t align, lv_font_t* font, uint8_t x, uint8_t y) {
     lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
     lv_obj_set_style_local_text_font(label, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font);
     lv_obj_set_style_local_text_color(label, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
@@ -41,7 +21,7 @@ namespace {
 }
 
 Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorController, System::SystemTask& systemTask)
-  : Screen(app), running {true}, currentState {States::Stopped}, startTime {}, motorController {motorController}, systemTask {systemTask} {
+  : Screen(app), motorController {motorController}, systemTask {systemTask} {
 
   bpmArc = lv_arc_create(lv_scr_act(), nullptr);
   bpmArc->user_data = this;
@@ -52,10 +32,10 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl
   lv_arc_set_value(bpmArc, bpm);
   lv_obj_set_size(bpmArc, 210, 210);
   lv_arc_set_adjustable(bpmArc, true);
-  lv_obj_align(bpmArc, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 7);
+  lv_obj_align(bpmArc, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 0);
 
-  bpmValue = createLabel(std::to_string(lv_arc_get_value(bpmArc)).c_str(), bpmArc, LV_ALIGN_IN_TOP_MID, &jetbrains_mono_76, 0, 55);
-  bpmLegend = createLabel("bpm", bpmValue, LV_ALIGN_OUT_BOTTOM_MID, &jetbrains_mono_bold_20, 0, 0);
+  bpmValue = createLabel("120", bpmArc, LV_ALIGN_IN_TOP_MID, &jetbrains_mono_76, 0, 55);
+  createLabel("bpm", bpmValue, LV_ALIGN_OUT_BOTTOM_MID, &jetbrains_mono_bold_20, 0, 0);
 
   bpmTap = lv_btn_create(lv_scr_act(), nullptr);
   bpmTap->user_data = this;
@@ -69,20 +49,23 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl
   lv_obj_set_event_cb(bpbDropdown, eventHandler);
   lv_obj_set_style_local_pad_left(bpbDropdown, LV_DROPDOWN_PART_MAIN, LV_STATE_DEFAULT, 20);
   lv_obj_set_style_local_pad_left(bpbDropdown, LV_DROPDOWN_PART_LIST, LV_STATE_DEFAULT, 20);
-  lv_obj_align(bpbDropdown, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 15, -4);
+  lv_obj_set_size(bpbDropdown, 115, 50);
+  lv_obj_align(bpbDropdown, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
   lv_dropdown_set_options(bpbDropdown, "1\n2\n3\n4\n5\n6\n7\n8\n9");
   lv_dropdown_set_selected(bpbDropdown, bpb - 1);
-  bpbLegend = lv_label_create(bpbDropdown, nullptr);
-  lv_label_set_text(bpbLegend, "bpb");
-  lv_obj_align(bpbLegend, bpbDropdown, LV_ALIGN_IN_RIGHT_MID, -15, 0);
+  lv_dropdown_set_show_selected(bpbDropdown, false);
+  lv_dropdown_set_text(bpbDropdown, "");
+
+  currentBpbText = lv_label_create(bpbDropdown, nullptr);
+  lv_label_set_text_fmt(currentBpbText, "%d bpb", bpb);
+  lv_obj_align(currentBpbText, bpbDropdown, LV_ALIGN_CENTER, 0, 0);
 
   playPause = lv_btn_create(lv_scr_act(), nullptr);
   playPause->user_data = this;
   lv_obj_set_event_cb(playPause, eventHandler);
-  lv_obj_align(playPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -15, -10);
-  lv_obj_set_height(playPause, 39);
-  playPauseLabel = lv_label_create(playPause, nullptr);
-  lv_label_set_text(playPauseLabel, Symbols::play);
+  lv_obj_set_size(playPause, 115, 50);
+  lv_obj_align(playPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
+  lv_obj_set_style_local_value_str(playPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Symbols::play);
 
   app->SetTouchMode(DisplayApp::TouchModes::Polling);
 }
@@ -93,28 +76,17 @@ Metronome::~Metronome() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Metronome::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  return true;
-}
-
 bool Metronome::Refresh() {
-  switch (currentState) {
-    case States::Stopped: {
-      break;
-    }
-    case States::Running: {
-      if (calculateDelta(startTime, xTaskGetTickCount()) >= (60.0 / bpm)) {
-        counter--;
-        startTime -= 60.0 / bpm;
-        startTime = xTaskGetTickCount();
-        if (counter == 0) {
-          counter = bpb;
-          motorController.SetDuration(90);
-        } else {
-          motorController.SetDuration(30);
-        }
+  if (metronomeStarted) {
+    if (xTaskGetTickCount() - startTime > 60 * configTICK_RATE_HZ / bpm) {
+      startTime += 60 * configTICK_RATE_HZ / bpm;
+      counter--;
+      if (counter == 0) {
+        counter = bpb;
+        motorController.SetDuration(90);
+      } else {
+        motorController.SetDuration(30);
       }
-      break;
     }
   }
   return running;
@@ -128,42 +100,39 @@ void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) {
         lv_label_set_text_fmt(bpmValue, "%03d", bpm);
       } else if (obj == bpbDropdown) {
         bpb = lv_dropdown_get_selected(obj) + 1;
+        lv_label_set_text_fmt(currentBpbText, "%d bpb", bpb);
+        lv_obj_realign(currentBpbText);
       }
       break;
     }
     case LV_EVENT_PRESSED: {
       if (obj == bpmTap) {
-        float timeDelta = calculateDelta(tappedTime, xTaskGetTickCount());
-        if (tappedTime == 0 || timeDelta > 3) {
-          tappedTime = xTaskGetTickCount();
-        } else {
-          bpm = ceil(60.0 / timeDelta);
+        TickType_t delta = xTaskGetTickCount() - tappedTime;
+        if (tappedTime != 0 && delta < configTICK_RATE_HZ * 3) {
+          bpm = configTICK_RATE_HZ * 60 / delta;
           lv_arc_set_value(bpmArc, bpm);
           lv_label_set_text_fmt(bpmValue, "%03d", bpm);
-          tappedTime = xTaskGetTickCount();
         }
+        tappedTime = xTaskGetTickCount();
       }
       break;
     }
     case LV_EVENT_CLICKED: {
       if (obj == playPause) {
-        currentState = (currentState == States::Stopped ? States::Running : States::Stopped);
-        switch (currentState) {
-          case States::Stopped: {
-            lv_label_set_text(playPauseLabel, Symbols::play);
-            systemTask.PushMessage(System::Messages::EnableSleeping);
-            break;
-          }
-          case States::Running: {
-            lv_label_set_text(playPauseLabel, Symbols::pause);
-            systemTask.PushMessage(System::Messages::DisableSleeping);
-            startTime = xTaskGetTickCount();
-            counter = 1;
-            break;
-          }
+        metronomeStarted = !metronomeStarted;
+        if (metronomeStarted) {
+          lv_obj_set_style_local_value_str(playPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Symbols::pause);
+          systemTask.PushMessage(System::Messages::DisableSleeping);
+          startTime = xTaskGetTickCount();
+          counter = 1;
+        } else {
+          lv_obj_set_style_local_value_str(playPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Symbols::play);
+          systemTask.PushMessage(System::Messages::EnableSleeping);
         }
       }
       break;
     }
+    default:
+      break;
   }
 }
diff --git a/src/displayapp/screens/Metronome.h b/src/displayapp/screens/Metronome.h
index 3a1f108..a4baa09 100644
--- a/src/displayapp/screens/Metronome.h
+++ b/src/displayapp/screens/Metronome.h
@@ -3,32 +3,32 @@
 #include "systemtask/SystemTask.h"
 #include "components/motor/MotorController.h"
 
-#include <array>
+namespace Pinetime {
+  namespace Applications {
+    namespace Screens {
 
-namespace Pinetime::Applications::Screens {
+      class Metronome : public Screen {
+      public:
+        Metronome(DisplayApp* app, Controllers::MotorController& motorController, System::SystemTask& systemTask);
+        ~Metronome() override;
+        bool Refresh() override;
+        void OnEvent(lv_obj_t* obj, lv_event_t event);
 
-  class Metronome : public Screen {
-  public:
-    Metronome(DisplayApp* app, Controllers::MotorController& motorController, System::SystemTask& systemTask);
-    ~Metronome() override;
-    bool Refresh() override;
-    bool OnTouchEvent(TouchEvents event) override;
-    void OnEvent(lv_obj_t* obj, lv_event_t event);
-    enum class States { Running, Stopped };
+      private:
+        TickType_t startTime = 0;
+        TickType_t tappedTime = 0;
+        Controllers::MotorController& motorController;
+        System::SystemTask& systemTask;
+        int16_t bpm = 120;
+        uint8_t bpb = 4;
+        uint8_t counter = 1;
 
-  private:
-    bool running;
-    States currentState;
-    TickType_t startTime;
-    TickType_t tappedTime = 0;
-    Controllers::MotorController& motorController;
-    System::SystemTask& systemTask;
-    uint16_t bpm = 120;
-    uint8_t bpb = 4;
-    uint8_t counter = 1;
+        bool metronomeStarted = false;
 
-    lv_obj_t *bpmArc, *bpmTap, *bpmValue, *bpmLegend;
-    lv_obj_t *bpbDropdown, *bpbLegend;
-    lv_obj_t *playPause, *playPauseLabel;
-  };
+        lv_obj_t *bpmArc, *bpmTap, *bpmValue;
+        lv_obj_t *bpbDropdown, *currentBpbText;
+        lv_obj_t *playPause;
+      };
+    }
+  }
 }
-- 
cgit v0.10.2


From dec4bab33496527e43850742a4b3dafd753eab83 Mon Sep 17 00:00:00 2001
From: Martin Hub <hubmartin@users.noreply.github.com>
Date: Sat, 14 Aug 2021 21:24:26 +0200
Subject: Add VSCode ST-link debug config (#567)


diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7cf3acd..3d9aa78 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -40,7 +40,25 @@
                 "break main",
                 "continue"
             ]
+        },
+        {
+            "cwd": "${workspaceRoot}",
+            // TODO: find better way to get latest build filename
+            "executable": "./build/src/pinetime-app-1.3.0.out",
+            "name": "Debug OpenOCD ST-LINK pinetime-app-1.3.0.out",
+            "request": "launch",
+            "type": "cortex-debug",
+            "showDevDebugOutput": false,
+            "servertype": "openocd",
+            "runToMain": true,
+            // Only use armToolchainPath if your arm-none-eabi-gdb is not in your path (some GCC packages does not contain arm-none-eabi-gdb)
+            "armToolchainPath": "${workspaceRoot}/../gcc-arm-none-eabi-9-2020-q2-update/bin",
+            "svdFile": "${workspaceRoot}/nrf52.svd",
+            "configFiles": [
+                "interface/stlink.cfg",
+                "target/nrf52.cfg"
+            ],
         }
 
     ]
-}
\ No newline at end of file
+}
-- 
cgit v0.10.2


From 477ff32edc3bc0997f45d943f90f68f8f0608468 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 10:41:00 +0200
Subject: Add randomise button to color picker


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index ae66546..a32ce34 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -203,6 +203,14 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_bg_opa(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rst");
   lv_obj_set_event_cb(btnReset, event_handler);
+
+  btnRandom = lv_btn_create(lv_scr_act(), nullptr);
+  btnRandom->user_data = this;
+  lv_obj_set_size(btnRandom, 60, 60);
+  lv_obj_align(btnRandom, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_style_local_bg_opa(btnRandom, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnRandom, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rnd");
+  lv_obj_set_event_cb(btnRandom, event_handler);
 }
 
 SettingPineTimeStyle::~SettingPineTimeStyle() {
@@ -303,4 +311,17 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       settingsController.SetPTSColorBG(3);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[3]);
   }
+  if((object == btnRandom) && (event == LV_EVENT_PRESSED)) {
+    uint8_t randTime = rand() % 17;
+    uint8_t randBar = rand() % 17;
+    uint8_t randBG = rand() % 17;
+    settingsController.SetPTSColorTime(randTime);
+    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+    settingsController.SetPTSColorBar(randBar);
+    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBar]);
+    settingsController.SetPTSColorBG(randBG);
+    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBG]);
+  }
 }
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index fe449b2..1a01ebb 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -28,6 +28,7 @@ namespace Pinetime {
           lv_obj_t * btnNextBG;
           lv_obj_t * btnPrevBG;
           lv_obj_t * btnReset;
+          lv_obj_t * btnRandom;
           lv_obj_t * timeColor;
           lv_obj_t * barColor;
           lv_obj_t * bgColor;
-- 
cgit v0.10.2


From e0d01411d7124abc5ad099360057ba683287c428 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 13 Jun 2021 12:47:12 +0300
Subject: Ui update


diff --git a/doc/ui_guidelines.md b/doc/ui_guidelines.md
new file mode 100644
index 0000000..9b05ce6
--- /dev/null
+++ b/doc/ui_guidelines.md
@@ -0,0 +1,14 @@
+# UI design guidelines
+
+- Align objects all the way to the edge or corner
+- Buttons should generally be at least 50px high
+- Buttons should generally be on the bottom edge
+- Make interactable objects **big**
+- Recommendations for inner padding, aka distance between buttons:
+	- When aligning 4 objects: 4px, e.g. Settings
+	- When aligning 3 objects: 6px, e.g. App list
+	- When aligning 2 objects: 10px, e.g. Quick settings
+- When using a page indicator, leave 8px for it on the right side
+	- It is acceptable to leave 8px on the left side as well to center the content
+- Top bar takes at least 20px + padding
+	- Top bar right icons move 8px to the left when using a page indicator
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 1d05be8..da9d04f 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -38,8 +38,9 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
     lv_label_set_text(labelIsValidated, "Please #00ff00 Validate# this version or\n#ff0000 Reset# to rollback to the previous version.");
 
     buttonValidate = lv_btn_create(lv_scr_act(), nullptr);
-    lv_obj_align(buttonValidate, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
     buttonValidate->user_data = this;
+    lv_obj_set_height(buttonValidate, 50);
+    lv_obj_align(buttonValidate, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
     lv_obj_set_event_cb(buttonValidate, ButtonEventHandler);
     lv_obj_set_style_local_bg_color(buttonValidate, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x009900));
 
@@ -48,6 +49,7 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
 
     buttonReset = lv_btn_create(lv_scr_act(), nullptr);
     buttonReset->user_data = this;
+    lv_obj_set_height(buttonReset, 50);
     lv_obj_align(buttonReset, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
     lv_obj_set_style_local_bg_color(buttonReset, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x990000));
     lv_obj_set_event_cb(buttonReset, ButtonEventHandler);
diff --git a/src/displayapp/screens/List.cpp b/src/displayapp/screens/List.cpp
index b4f4d2c..eb53820 100644
--- a/src/displayapp/screens/List.cpp
+++ b/src/displayapp/screens/List.cpp
@@ -25,42 +25,38 @@ List::List(uint8_t screenID,
   settingsController.SetSettingsMenu(screenID);
 
   if (numScreens > 1) {
-    pageIndicatorBasePoints[0].x = 240 - 1;
-    pageIndicatorBasePoints[0].y = 6;
-    pageIndicatorBasePoints[1].x = 240 - 1;
-    pageIndicatorBasePoints[1].y = 240 - 6;
+    pageIndicatorBasePoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[0].y = 0;
+    pageIndicatorBasePoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[1].y = LV_VER_RES;
 
     pageIndicatorBase = lv_line_create(lv_scr_act(), NULL);
     lv_obj_set_style_local_line_width(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
     lv_obj_set_style_local_line_color(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-    lv_obj_set_style_local_line_rounded(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true);
     lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints, 2);
 
-    uint16_t indicatorSize = 228 / numScreens;
-    uint16_t indicatorPos = indicatorSize * screenID;
+    const uint16_t indicatorSize = LV_VER_RES / numScreens;
+    const uint16_t indicatorPos = indicatorSize * screenID;
 
-    pageIndicatorPoints[0].x = 240 - 1;
-    pageIndicatorPoints[0].y = 6 + indicatorPos;
-    pageIndicatorPoints[1].x = 240 - 1;
-    pageIndicatorPoints[1].y = 6 + indicatorPos + indicatorSize;
+    pageIndicatorPoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[0].y = indicatorPos;
+    pageIndicatorPoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[1].y = indicatorPos + indicatorSize;
 
     pageIndicator = lv_line_create(lv_scr_act(), NULL);
     lv_obj_set_style_local_line_width(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
     lv_obj_set_style_local_line_color(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
-    lv_obj_set_style_local_line_rounded(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true);
     lv_line_set_points(pageIndicator, pageIndicatorPoints, 2);
   }
 
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
 
-  // lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
   lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
-  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
-  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
 
   lv_obj_set_pos(container1, 0, 0);
-  lv_obj_set_width(container1, LV_HOR_RES - 15);
+  lv_obj_set_width(container1, LV_HOR_RES - 8);
   lv_obj_set_height(container1, LV_VER_RES);
   lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
 
@@ -73,11 +69,11 @@ List::List(uint8_t screenID,
 
       itemApps[i] = lv_btn_create(container1, nullptr);
       lv_obj_set_style_local_bg_opa(itemApps[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
-      lv_obj_set_style_local_radius(itemApps[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
+      lv_obj_set_style_local_radius(itemApps[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 57);
       lv_obj_set_style_local_bg_color(itemApps[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
 
-      lv_obj_set_width(itemApps[i], LV_HOR_RES - 25);
-      lv_obj_set_height(itemApps[i], 52);
+      lv_obj_set_width(itemApps[i], LV_HOR_RES - 8);
+      lv_obj_set_height(itemApps[i], 57);
       lv_obj_set_event_cb(itemApps[i], ButtonEventHandler);
       lv_btn_set_layout(itemApps[i], LV_LAYOUT_ROW_MID);
       itemApps[i]->user_data = this;
diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index c8d5e4b..99a1518 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -50,60 +50,55 @@ inline void lv_img_set_src_arr(lv_obj_t* img, const lv_img_dsc_t* src_img) {
 Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::MusicService& music) : Screen(app), musicService(music) {
   lv_obj_t* label;
 
+  lv_style_init(&btn_style);
+  lv_style_set_radius(&btn_style, LV_STATE_DEFAULT, 20);
+  lv_style_set_bg_color(&btn_style, LV_STATE_DEFAULT, LV_COLOR_AQUA);
+  lv_style_set_bg_opa(&btn_style, LV_STATE_DEFAULT, LV_OPA_20);
+
   btnVolDown = lv_btn_create(lv_scr_act(), nullptr);
   btnVolDown->user_data = this;
   lv_obj_set_event_cb(btnVolDown, event_handler);
-  lv_obj_set_size(btnVolDown, 65, 75);
-  lv_obj_align(btnVolDown, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 15, -10);
-  lv_obj_set_style_local_radius(btnVolDown, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btnVolDown, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
-  lv_obj_set_style_local_bg_opa(btnVolDown, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
+  lv_obj_set_size(btnVolDown, 76, 76);
+  lv_obj_align(btnVolDown, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+  lv_obj_add_style(btnVolDown, LV_STATE_DEFAULT, &btn_style);
   label = lv_label_create(btnVolDown, nullptr);
   lv_label_set_text(label, Symbols::volumDown);
-  lv_obj_set_hidden(btnVolDown, !displayVolumeButtons);
+  lv_obj_set_hidden(btnVolDown, true);
 
   btnVolUp = lv_btn_create(lv_scr_act(), nullptr);
   btnVolUp->user_data = this;
   lv_obj_set_event_cb(btnVolUp, event_handler);
-  lv_obj_set_size(btnVolUp, 65, 75);
-  lv_obj_align(btnVolUp, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, -15, -10);
-  lv_obj_set_style_local_radius(btnVolUp, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btnVolUp, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
-  lv_obj_set_style_local_bg_opa(btnVolUp, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
+  lv_obj_set_size(btnVolUp, 76, 76);
+  lv_obj_align(btnVolUp, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
+  lv_obj_add_style(btnVolUp, LV_STATE_DEFAULT, &btn_style);
   label = lv_label_create(btnVolUp, nullptr);
   lv_label_set_text(label, Symbols::volumUp);
-  lv_obj_set_hidden(btnVolUp, !displayVolumeButtons);
+  lv_obj_set_hidden(btnVolUp, true);
 
   btnPrev = lv_btn_create(lv_scr_act(), nullptr);
   btnPrev->user_data = this;
   lv_obj_set_event_cb(btnPrev, event_handler);
-  lv_obj_set_size(btnPrev, 65, 75);
-  lv_obj_align(btnPrev, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 15, -10);
-  lv_obj_set_style_local_radius(btnPrev, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btnPrev, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
-  lv_obj_set_style_local_bg_opa(btnPrev, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
+  lv_obj_set_size(btnPrev, 76, 76);
+  lv_obj_align(btnPrev, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+  lv_obj_add_style(btnPrev, LV_STATE_DEFAULT, &btn_style);
   label = lv_label_create(btnPrev, nullptr);
   lv_label_set_text(label, Symbols::stepBackward);
 
   btnNext = lv_btn_create(lv_scr_act(), nullptr);
   btnNext->user_data = this;
   lv_obj_set_event_cb(btnNext, event_handler);
-  lv_obj_set_size(btnNext, 65, 75);
-  lv_obj_align(btnNext, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, -15, -10);
-  lv_obj_set_style_local_radius(btnNext, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btnNext, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
-  lv_obj_set_style_local_bg_opa(btnNext, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
+  lv_obj_set_size(btnNext, 76, 76);
+  lv_obj_align(btnNext, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
+  lv_obj_add_style(btnNext, LV_STATE_DEFAULT, &btn_style);
   label = lv_label_create(btnNext, nullptr);
   lv_label_set_text(label, Symbols::stepForward);
 
   btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
   btnPlayPause->user_data = this;
   lv_obj_set_event_cb(btnPlayPause, event_handler);
-  lv_obj_set_size(btnPlayPause, 65, 75);
-  lv_obj_align(btnPlayPause, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
-  lv_obj_set_style_local_radius(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
-  lv_obj_set_style_local_bg_opa(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
+  lv_obj_set_size(btnPlayPause, 76, 76);
+  lv_obj_align(btnPlayPause, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_obj_add_style(btnPlayPause, LV_STATE_DEFAULT, &btn_style);
   txtPlayPause = lv_label_create(btnPlayPause, nullptr);
   lv_label_set_text(txtPlayPause, Symbols::play);
 
@@ -147,6 +142,7 @@ Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Mus
 }
 
 Music::~Music() {
+  lv_style_reset(&btn_style);
   lv_obj_clean(lv_scr_act());
 }
 
@@ -272,21 +268,19 @@ void Music::OnObjectEvent(lv_obj_t* obj, lv_event_t event) {
 bool Music::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   switch (event) {
     case TouchEvents::SwipeUp: {
-      displayVolumeButtons = true;
-      lv_obj_set_hidden(btnVolDown, !displayVolumeButtons);
-      lv_obj_set_hidden(btnVolUp, !displayVolumeButtons);
+      lv_obj_set_hidden(btnVolDown, false);
+      lv_obj_set_hidden(btnVolUp, false);
 
-      lv_obj_set_hidden(btnNext, displayVolumeButtons);
-      lv_obj_set_hidden(btnPrev, displayVolumeButtons);
+      lv_obj_set_hidden(btnNext, true);
+      lv_obj_set_hidden(btnPrev, true);
       return true;
     }
     case TouchEvents::SwipeDown: {
-      displayVolumeButtons = false;
-      lv_obj_set_hidden(btnNext, displayVolumeButtons);
-      lv_obj_set_hidden(btnPrev, displayVolumeButtons);
+      lv_obj_set_hidden(btnNext, false);
+      lv_obj_set_hidden(btnPrev, false);
 
-      lv_obj_set_hidden(btnVolDown, !displayVolumeButtons);
-      lv_obj_set_hidden(btnVolUp, !displayVolumeButtons);
+      lv_obj_set_hidden(btnVolDown, true);
+      lv_obj_set_hidden(btnVolUp, true);
       return true;
     }
     case TouchEvents::SwipeLeft: {
diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h
index ef8f1fe..00d3ad9 100644
--- a/src/displayapp/screens/Music.h
+++ b/src/displayapp/screens/Music.h
@@ -57,10 +57,11 @@ namespace Pinetime {
         lv_obj_t* imgDiscAnim;
         lv_obj_t* txtTrackDuration;
 
+        lv_style_t btn_style;
+
         /** For the spinning disc animation */
         bool frameB;
 
-        bool displayVolumeButtons = false;
         Pinetime::Controllers::MusicService& musicService;
 
         std::string artist;
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index d5d6cb8..a64320e 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -35,37 +35,35 @@ Tile::Tile(uint8_t screenID,
   label_time = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_fmt(label_time, "%02i:%02i", dateTimeController.Hours(), dateTimeController.Minutes());
   lv_label_set_align(label_time, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(label_time, nullptr, LV_ALIGN_IN_TOP_LEFT, 15, 6);
+  lv_obj_align(label_time, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
 
   // Battery
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining()));
-  lv_obj_align(batteryIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, -15, 6);
+  lv_obj_align(batteryIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, -8, 0);
 
   if (numScreens > 1) {
-    pageIndicatorBasePoints[0].x = 240 - 1;
-    pageIndicatorBasePoints[0].y = 6;
-    pageIndicatorBasePoints[1].x = 240 - 1;
-    pageIndicatorBasePoints[1].y = 240 - 6;
+    pageIndicatorBasePoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[0].y = 0;
+    pageIndicatorBasePoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[1].y = LV_VER_RES;
 
     pageIndicatorBase = lv_line_create(lv_scr_act(), nullptr);
     lv_obj_set_style_local_line_width(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
     lv_obj_set_style_local_line_color(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-    lv_obj_set_style_local_line_rounded(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true);
     lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints, 2);
 
-    uint16_t indicatorSize = 228 / numScreens;
-    uint16_t indicatorPos = indicatorSize * screenID;
+    const uint16_t indicatorSize = LV_VER_RES / numScreens;
+    const uint16_t indicatorPos = indicatorSize * screenID;
 
-    pageIndicatorPoints[0].x = 240 - 1;
-    pageIndicatorPoints[0].y = 6 + indicatorPos;
-    pageIndicatorPoints[1].x = 240 - 1;
-    pageIndicatorPoints[1].y = 6 + indicatorPos + indicatorSize;
+    pageIndicatorPoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[0].y = indicatorPos;
+    pageIndicatorPoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[1].y = indicatorPos + indicatorSize;
 
     pageIndicator = lv_line_create(lv_scr_act(), nullptr);
     lv_obj_set_style_local_line_width(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
     lv_obj_set_style_local_line_color(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
-    lv_obj_set_style_local_line_rounded(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true);
     lv_line_set_points(pageIndicator, pageIndicatorPoints, 2);
   }
 
@@ -85,7 +83,7 @@ Tile::Tile(uint8_t screenID,
 
   btnm1 = lv_btnmatrix_create(lv_scr_act(), nullptr);
   lv_btnmatrix_set_map(btnm1, btnmMap);
-  lv_obj_set_size(btnm1, LV_HOR_RES - 10, LV_VER_RES - 60);
+  lv_obj_set_size(btnm1, LV_HOR_RES - 16, LV_VER_RES - 60);
   lv_obj_align(btnm1, NULL, LV_ALIGN_CENTER, 0, 10);
 
   lv_obj_set_style_local_radius(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DEFAULT, 20);
@@ -93,6 +91,8 @@ Tile::Tile(uint8_t screenID,
   lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
   lv_obj_set_style_local_bg_opa(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, LV_OPA_20);
   lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, lv_color_hex(0x111111));
+  lv_obj_set_style_local_pad_all(btnm1, LV_BTNMATRIX_PART_BG, LV_STATE_DEFAULT, 0);
+  lv_obj_set_style_local_pad_inner(btnm1, LV_BTNMATRIX_PART_BG, LV_STATE_DEFAULT, 6);
 
   for (uint8_t i = 0; i < 6; i++) {
     if (applications[i].application == Apps::None) {
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 621929b..1410fc2 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -67,12 +67,12 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
 
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text(batteryIcon, Symbols::batteryHalf);
-  lv_obj_align(batteryIcon, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -8, -4);
+  lv_obj_align(batteryIcon, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
   notificationIcon = lv_label_create(lv_scr_act(), NULL);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
   lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
-  lv_obj_align(notificationIcon, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 8, -4);
+  lv_obj_align(notificationIcon, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
 
   // Date - Day / Week day
 
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index 7a240f1..2b902b3 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -35,7 +35,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
 
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text(batteryIcon, Symbols::batteryFull);
-  lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -5, 2);
+  lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
   batteryPlug = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFF0000));
@@ -50,7 +50,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   notificationIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
   lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
-  lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 10, 0);
+  lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
 
   label_date = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_CENTER, 0, 60);
@@ -75,7 +75,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text(heartbeatIcon, Symbols::heartBeat);
   lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xCE1B1B));
-  lv_obj_align(heartbeatIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 5, -2);
+  lv_obj_align(heartbeatIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
 
   heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xCE1B1B));
@@ -85,7 +85,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   stepValue = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7));
   lv_label_set_text(stepValue, "0");
-  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -5, -2);
+  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
 
   stepIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7));
@@ -110,7 +110,7 @@ bool WatchFaceDigital::Refresh() {
   if (bleState.IsUpdated()) {
     lv_label_set_text(bleIcon, BleIcon::GetIcon(bleState.Get()));
   }
-  lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -5, 5);
+  lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
   lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0);
   lv_obj_align(bleIcon, batteryPlug, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
@@ -208,7 +208,7 @@ bool WatchFaceDigital::Refresh() {
       lv_label_set_text_static(heartbeatValue, "");
     }
 
-    lv_obj_align(heartbeatIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 5, -2);
+    lv_obj_align(heartbeatIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
     lv_obj_align(heartbeatValue, heartbeatIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0);
   }
 
@@ -216,7 +216,7 @@ bool WatchFaceDigital::Refresh() {
   motionSensorOk = motionController.IsSensorOk();
   if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
     lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());
-    lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -5, -2);
+    lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
     lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
   }
 
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 0421d10..2d76d2d 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -30,27 +30,29 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
     motorController {motorController},
     settingsController {settingsController} {
 
+  // This is the distance (padding) between all objects on this screen.
+  const int innerDistance = 10;
+
   // Time
   label_time = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_fmt(label_time, "%02i:%02i", dateTimeController.Hours(), dateTimeController.Minutes());
   lv_label_set_align(label_time, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 15, 4);
+  lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 0);
 
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining()));
-  lv_obj_align(batteryIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, -15, 4);
+  lv_obj_align(batteryIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  lv_obj_t* lbl_btn;
+  lv_style_init(&btn_style);
+  lv_style_set_radius(&btn_style, LV_STATE_DEFAULT, (LV_VER_RES - 20 - 2 * innerDistance) / 8);
+  lv_style_set_bg_color(&btn_style, LV_STATE_DEFAULT, lv_color_hex(0x111111));
 
   btn1 = lv_btn_create(lv_scr_act(), nullptr);
   btn1->user_data = this;
   lv_obj_set_event_cb(btn1, ButtonEventHandler);
-  lv_obj_align(btn1, nullptr, LV_ALIGN_CENTER, -50, -30);
-  lv_obj_set_style_local_radius(btn1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btn1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_obj_set_style_local_bg_grad_dir(btn1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_GRAD_DIR_NONE);
-
-  lv_btn_set_fit2(btn1, LV_FIT_TIGHT, LV_FIT_TIGHT);
+  lv_obj_add_style(btn1, LV_BTN_PART_MAIN, &btn_style);
+  lv_obj_set_size(btn1, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
+  lv_obj_align(btn1, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 20 + innerDistance);
 
   btn1_lvl = lv_label_create(btn1, nullptr);
   lv_obj_set_style_local_text_font(btn1_lvl, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
@@ -59,12 +61,11 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   btn2 = lv_btn_create(lv_scr_act(), nullptr);
   btn2->user_data = this;
   lv_obj_set_event_cb(btn2, ButtonEventHandler);
-  lv_obj_align(btn2, nullptr, LV_ALIGN_CENTER, 50, -30);
-  lv_obj_set_style_local_radius(btn2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btn2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_obj_set_style_local_bg_grad_dir(btn2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_GRAD_DIR_NONE);
-  lv_btn_set_fit2(btn2, LV_FIT_TIGHT, LV_FIT_TIGHT);
+  lv_obj_add_style(btn2, LV_BTN_PART_MAIN, &btn_style);
+  lv_obj_set_size(btn2, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
+  lv_obj_align(btn2, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 20 + innerDistance);
 
+  lv_obj_t* lbl_btn;
   lbl_btn = lv_label_create(btn2, nullptr);
   lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
   lv_label_set_text_static(lbl_btn, Symbols::highlight);
@@ -72,14 +73,11 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   btn3 = lv_btn_create(lv_scr_act(), nullptr);
   btn3->user_data = this;
   lv_obj_set_event_cb(btn3, ButtonEventHandler);
-  lv_obj_align(btn3, nullptr, LV_ALIGN_CENTER, -50, 60);
   lv_btn_set_checkable(btn3, true);
-  lv_obj_set_style_local_radius(btn3, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btn3, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_obj_set_style_local_bg_grad_dir(btn3, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_GRAD_DIR_NONE);
+  lv_obj_add_style(btn3, LV_BTN_PART_MAIN, &btn_style);
   lv_obj_set_style_local_bg_color(btn3, LV_BTN_PART_MAIN, LV_STATE_CHECKED, LV_COLOR_GREEN);
-  lv_obj_set_style_local_bg_grad_dir(btn1, LV_BTN_PART_MAIN, LV_STATE_CHECKED, LV_GRAD_DIR_NONE);
-  lv_btn_set_fit2(btn3, LV_FIT_TIGHT, LV_FIT_TIGHT);
+  lv_obj_set_size(btn3, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
+  lv_obj_align(btn3, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
 
   btn3_lvl = lv_label_create(btn3, nullptr);
   lv_obj_set_style_local_text_font(btn3_lvl, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
@@ -94,11 +92,9 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   btn4 = lv_btn_create(lv_scr_act(), nullptr);
   btn4->user_data = this;
   lv_obj_set_event_cb(btn4, ButtonEventHandler);
-  lv_obj_align(btn4, nullptr, LV_ALIGN_CENTER, 50, 60);
-  lv_obj_set_style_local_radius(btn4, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_color(btn4, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_obj_set_style_local_bg_grad_dir(btn4, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_GRAD_DIR_NONE);
-  lv_btn_set_fit2(btn4, LV_FIT_TIGHT, LV_FIT_TIGHT);
+  lv_obj_add_style(btn4, LV_BTN_PART_MAIN, &btn_style);
+  lv_obj_set_size(btn4, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
+  lv_obj_align(btn4, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
 
   lbl_btn = lv_label_create(btn4, nullptr);
   lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
@@ -114,6 +110,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
 }
 
 QuickSettings::~QuickSettings() {
+  lv_style_reset(&btn_style);
   lv_task_del(taskUpdate);
   lv_obj_clean(lv_scr_act());
   settingsController.SaveSettings();
diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
index e0fc0a8..2eefe1a 100644
--- a/src/displayapp/screens/settings/QuickSettings.h
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -44,6 +44,8 @@ namespace Pinetime {
         lv_obj_t* batteryIcon;
         lv_obj_t* label_time;
 
+        lv_style_t btn_style;
+
         lv_obj_t* btn1;
         lv_obj_t* btn1_lvl;
         lv_obj_t* btn2;
-- 
cgit v0.10.2


From fc6458a35c2260fe152fe84bcd06174cec6d3b92 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 13 Jun 2021 17:21:03 +0300
Subject: Add image with example layouts


diff --git a/doc/ui/example.png b/doc/ui/example.png
new file mode 100644
index 0000000..2f6cb78
Binary files /dev/null and b/doc/ui/example.png differ
diff --git a/doc/ui_guidelines.md b/doc/ui_guidelines.md
index 9b05ce6..c267b79 100644
--- a/doc/ui_guidelines.md
+++ b/doc/ui_guidelines.md
@@ -12,3 +12,5 @@
 	- It is acceptable to leave 8px on the left side as well to center the content
 - Top bar takes at least 20px + padding
 	- Top bar right icons move 8px to the left when using a page indicator
+
+![example layouts](./ui/example.png)
-- 
cgit v0.10.2


From 637ed8033b0ab01b0e5313f8dc39ee0e0954cd5e Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sat, 24 Jul 2021 21:46:55 +0300
Subject: Adjust previously missed scrollbar and firmware validation buttons


diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index da9d04f..233ebd5 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -39,7 +39,7 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
 
     buttonValidate = lv_btn_create(lv_scr_act(), nullptr);
     buttonValidate->user_data = this;
-    lv_obj_set_height(buttonValidate, 50);
+    lv_obj_set_size(buttonValidate, 115, 50);
     lv_obj_align(buttonValidate, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
     lv_obj_set_event_cb(buttonValidate, ButtonEventHandler);
     lv_obj_set_style_local_bg_color(buttonValidate, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x009900));
@@ -49,7 +49,7 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
 
     buttonReset = lv_btn_create(lv_scr_act(), nullptr);
     buttonReset->user_data = this;
-    lv_obj_set_height(buttonReset, 50);
+    lv_obj_set_size(buttonReset, 115, 50);
     lv_obj_align(buttonReset, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
     lv_obj_set_style_local_bg_color(buttonReset, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x990000));
     lv_obj_set_event_cb(buttonReset, ButtonEventHandler);
diff --git a/src/displayapp/screens/Label.cpp b/src/displayapp/screens/Label.cpp
index 0132dbd..f724fd4 100644
--- a/src/displayapp/screens/Label.cpp
+++ b/src/displayapp/screens/Label.cpp
@@ -6,10 +6,10 @@ Label::Label(uint8_t screenID, uint8_t numScreens, Pinetime::Applications::Displ
   : Screen(app), labelText {labelText} {
 
   if (numScreens > 1) {
-    pageIndicatorBasePoints[0].x = 240 - 1;
-    pageIndicatorBasePoints[0].y = 6;
-    pageIndicatorBasePoints[1].x = 240 - 1;
-    pageIndicatorBasePoints[1].y = 240 - 6;
+    pageIndicatorBasePoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[0].y = 0;
+    pageIndicatorBasePoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[1].y = LV_VER_RES;
 
     pageIndicatorBase = lv_line_create(lv_scr_act(), NULL);
     lv_obj_set_style_local_line_width(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
@@ -17,13 +17,13 @@ Label::Label(uint8_t screenID, uint8_t numScreens, Pinetime::Applications::Displ
     lv_obj_set_style_local_line_rounded(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true);
     lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints, 2);
 
-    uint16_t indicatorSize = 228 / numScreens;
+    uint16_t indicatorSize = LV_VER_RES / numScreens;
     uint16_t indicatorPos = indicatorSize * screenID;
 
-    pageIndicatorPoints[0].x = 240 - 1;
-    pageIndicatorPoints[0].y = (6 + indicatorPos);
-    pageIndicatorPoints[1].x = 240 - 1;
-    pageIndicatorPoints[1].y = (6 + indicatorPos) + indicatorSize;
+    pageIndicatorPoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[0].y = indicatorPos;
+    pageIndicatorPoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[1].y = indicatorPos + indicatorSize;
 
     pageIndicator = lv_line_create(lv_scr_act(), NULL);
     lv_obj_set_style_local_line_width(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
-- 
cgit v0.10.2


From bc829053718f925662ca1dcdc9856426dabef573 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Thu, 29 Jul 2021 21:25:03 +0300
Subject: Clean up using variables


diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 2d76d2d..54e2f3e 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -31,7 +31,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
     settingsController {settingsController} {
 
   // This is the distance (padding) between all objects on this screen.
-  const int innerDistance = 10;
+  static constexpr uint8_t innerDistance = 10;
 
   // Time
   label_time = lv_label_create(lv_scr_act(), nullptr);
@@ -43,16 +43,22 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining()));
   lv_obj_align(batteryIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
+  static constexpr uint8_t barHeight = 20 + innerDistance;
+  static constexpr uint8_t buttonHeight = (LV_VER_RES_MAX - barHeight - innerDistance) / 2;
+  static constexpr uint8_t buttonWidth = (LV_HOR_RES_MAX - innerDistance) / 2; // wide buttons
+  //static constexpr uint8_t buttonWidth = buttonHeight; // square buttons
+  static constexpr uint8_t buttonXOffset = (LV_HOR_RES_MAX - buttonWidth * 2 - innerDistance) / 2;
+
   lv_style_init(&btn_style);
-  lv_style_set_radius(&btn_style, LV_STATE_DEFAULT, (LV_VER_RES - 20 - 2 * innerDistance) / 8);
+  lv_style_set_radius(&btn_style, LV_STATE_DEFAULT, buttonHeight / 4);
   lv_style_set_bg_color(&btn_style, LV_STATE_DEFAULT, lv_color_hex(0x111111));
 
   btn1 = lv_btn_create(lv_scr_act(), nullptr);
   btn1->user_data = this;
   lv_obj_set_event_cb(btn1, ButtonEventHandler);
   lv_obj_add_style(btn1, LV_BTN_PART_MAIN, &btn_style);
-  lv_obj_set_size(btn1, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
-  lv_obj_align(btn1, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 20 + innerDistance);
+  lv_obj_set_size(btn1, buttonWidth, buttonHeight);
+  lv_obj_align(btn1, nullptr, LV_ALIGN_IN_TOP_LEFT, buttonXOffset, barHeight);
 
   btn1_lvl = lv_label_create(btn1, nullptr);
   lv_obj_set_style_local_text_font(btn1_lvl, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
@@ -62,8 +68,8 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   btn2->user_data = this;
   lv_obj_set_event_cb(btn2, ButtonEventHandler);
   lv_obj_add_style(btn2, LV_BTN_PART_MAIN, &btn_style);
-  lv_obj_set_size(btn2, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
-  lv_obj_align(btn2, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 20 + innerDistance);
+  lv_obj_set_size(btn2, buttonWidth, buttonHeight);
+  lv_obj_align(btn2, nullptr, LV_ALIGN_IN_TOP_RIGHT, - buttonXOffset, barHeight);
 
   lv_obj_t* lbl_btn;
   lbl_btn = lv_label_create(btn2, nullptr);
@@ -76,8 +82,8 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   lv_btn_set_checkable(btn3, true);
   lv_obj_add_style(btn3, LV_BTN_PART_MAIN, &btn_style);
   lv_obj_set_style_local_bg_color(btn3, LV_BTN_PART_MAIN, LV_STATE_CHECKED, LV_COLOR_GREEN);
-  lv_obj_set_size(btn3, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
-  lv_obj_align(btn3, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+  lv_obj_set_size(btn3, buttonWidth, buttonHeight);
+  lv_obj_align(btn3, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, buttonXOffset, 0);
 
   btn3_lvl = lv_label_create(btn3, nullptr);
   lv_obj_set_style_local_text_font(btn3_lvl, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
@@ -93,8 +99,8 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   btn4->user_data = this;
   lv_obj_set_event_cb(btn4, ButtonEventHandler);
   lv_obj_add_style(btn4, LV_BTN_PART_MAIN, &btn_style);
-  lv_obj_set_size(btn4, (LV_HOR_RES - innerDistance) / 2, (LV_VER_RES - 20 - 2 * innerDistance) / 2);
-  lv_obj_align(btn4, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
+  lv_obj_set_size(btn4, buttonWidth, buttonHeight);
+  lv_obj_align(btn4, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, - buttonXOffset, 0);
 
   lbl_btn = lv_label_create(btn4, nullptr);
   lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
-- 
cgit v0.10.2


From ee44b6ff4998d6f4d0672c05c1f65c0a9692dc0d Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Thu, 29 Jul 2021 21:49:06 +0300
Subject: Adjust inner padding in applist


diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index a64320e..777b5bb 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -92,7 +92,7 @@ Tile::Tile(uint8_t screenID,
   lv_obj_set_style_local_bg_opa(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, LV_OPA_20);
   lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, lv_color_hex(0x111111));
   lv_obj_set_style_local_pad_all(btnm1, LV_BTNMATRIX_PART_BG, LV_STATE_DEFAULT, 0);
-  lv_obj_set_style_local_pad_inner(btnm1, LV_BTNMATRIX_PART_BG, LV_STATE_DEFAULT, 6);
+  lv_obj_set_style_local_pad_inner(btnm1, LV_BTNMATRIX_PART_BG, LV_STATE_DEFAULT, 10);
 
   for (uint8_t i = 0; i < 6; i++) {
     if (applications[i].application == Apps::None) {
-- 
cgit v0.10.2


From c0bb88799c2de0ab8de5d38b3eb511f4f80029d7 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 12:33:32 +0200
Subject: Add check for randomise button in case colors clash


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index a32ce34..007c1cf 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -315,6 +315,11 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     uint8_t randTime = rand() % 17;
     uint8_t randBar = rand() % 17;
     uint8_t randBG = rand() % 17;
+    // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
+    if ((randTime == randBG) || (randBar == 3)) {
+      randBG += 1;
+      randBar = randTime;
+    }
     settingsController.SetPTSColorTime(randTime);
     lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
     lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-- 
cgit v0.10.2


From 16ea069d55e4bcbba097cf499901eddf1a3828db Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 14:05:21 +0200
Subject: Remove duplicate code, minor fixes


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 007c1cf..dfa806a 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -230,76 +230,60 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
     if ( valueTime < 16 ) {
       valueTime += 1;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     } else {
       valueTime = 0;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
+    settingsController.SetPTSColorTime(valueTime);
+    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
   }
   if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
     if ( valueTime > 0 ) {
       valueTime -= 1;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }  else {
       valueTime = 16;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
+    settingsController.SetPTSColorTime(valueTime);
+    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
   }
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar < 16 ) {
       valueBar += 1;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     } else {
       valueBar = 0;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
+    settingsController.SetPTSColorBar(valueBar);
+    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
   }
   if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar > 0 ) {
       valueBar -= 1;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     } else {
       valueBar = 16;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
+    settingsController.SetPTSColorBar(valueBar);
+    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
     if ( valueBG < 16 ) {
       valueBG += 1;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     } else {
       valueBG = 0;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
+    settingsController.SetPTSColorBG(valueBG);
+    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
   }
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
     if ( valueBG > 0 ) {
       valueBG -= 1;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     } else {
       valueBG = 16;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
+    settingsController.SetPTSColorBG(valueBG);
+    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
   }
   if((object == btnReset) && (event == LV_EVENT_PRESSED)) {
       settingsController.SetPTSColorTime(11);
@@ -316,8 +300,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     uint8_t randBar = rand() % 17;
     uint8_t randBG = rand() % 17;
     // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
-    if ((randTime == randBG) || (randBar == 3)) {
+    if (randTime == randBG) {
       randBG += 1;
+    }
+    if (randBar == 3) {
       randBar = randTime;
     }
     settingsController.SetPTSColorTime(randTime);
-- 
cgit v0.10.2


From 5789f1527c5c8d1c31e78a6a88c6a2b6158eb671 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 14:42:30 +0200
Subject: Avoid setting the sidebar black


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index dfa806a..96b8780 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -252,6 +252,8 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar < 16 ) {
       valueBar += 1;
+      // Avoid setting the sidebar black
+      if ( valueBar == 3 ) { valueBar += 1; }
     } else {
       valueBar = 0;
     }
@@ -261,6 +263,8 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar > 0 ) {
       valueBar -= 1;
+      // Avoid setting the sidebar black
+      if ( valueBar == 3 ) { valueBar -= 1; }
     } else {
       valueBar = 16;
     }
-- 
cgit v0.10.2


From 639fd3a9bd9f4a1ada36a4b812b7199543d47457 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 15:00:54 +0200
Subject: More tidying following review


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 96b8780..979e4b6 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -6,17 +6,14 @@
 using namespace Pinetime::Applications::Screens;
 
 namespace {
-  static void event_handler(lv_obj_t * obj, lv_event_t event) {
-    SettingPineTimeStyle* screen = static_cast<SettingPineTimeStyle *>(obj->user_data);
+  static void event_handler(lv_obj_t* obj, lv_event_t event) {
+    SettingPineTimeStyle* screen = static_cast<SettingPineTimeStyle*>(obj->user_data);
     screen->UpdateSelected(obj, event);
   }
 }
 
-SettingPineTimeStyle::SettingPineTimeStyle(
-  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
-  Screen(app),
-  settingsController{settingsController}
-{
+SettingPineTimeStyle::SettingPineTimeStyle(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+  : Screen(app), settingsController {settingsController} {
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -140,7 +137,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
-  
+
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_click(backgroundLabel, true);
   lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
@@ -222,74 +219,79 @@ bool SettingPineTimeStyle::Refresh() {
   return running;
 }
 
-void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+void SettingPineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   uint8_t valueTime = settingsController.GetPTSColorTime();
   uint8_t valueBar = settingsController.GetPTSColorBar();
   uint8_t valueBG = settingsController.GetPTSColorBG();
-    
-  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
-    if ( valueTime < 16 ) {
-      valueTime += 1;
-    } else {
-      valueTime = 0;
+
+  if (event == LV_EVENT_CLICKED) {
+    if (object == btnNextTime) {
+      if (valueTime < 16) {
+        valueTime += 1;
+      } else {
+        valueTime = 0;
+      }
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
-    settingsController.SetPTSColorTime(valueTime);
-    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-  }
-  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
-    if ( valueTime > 0 ) {
-      valueTime -= 1;
-    }  else {
-      valueTime = 16;
+    if (object == btnPrevTime) {
+      if (valueTime > 0) {
+        valueTime -= 1;
+      } else {
+        valueTime = 16;
+      }
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
-    settingsController.SetPTSColorTime(valueTime);
-    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-  }
-  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBar < 16 ) {
-      valueBar += 1;
-      // Avoid setting the sidebar black
-      if ( valueBar == 3 ) { valueBar += 1; }
-    } else {
-      valueBar = 0;
+    if (object == btnNextBar) {
+      if (valueBar < 16) {
+        valueBar += 1;
+        // Avoid setting the sidebar black
+        if (valueBar == 3) {
+          valueBar += 1;
+        }
+      } else {
+        valueBar = 0;
+      }
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
-    settingsController.SetPTSColorBar(valueBar);
-    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
-  }
-  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBar > 0 ) {
-      valueBar -= 1;
-      // Avoid setting the sidebar black
-      if ( valueBar == 3 ) { valueBar -= 1; }
-    } else {
-      valueBar = 16;
+    if (object == btnPrevBar) {
+      if (valueBar > 0) {
+        valueBar -= 1;
+        // Avoid setting the sidebar black
+        if (valueBar == 3) {
+          valueBar -= 1;
+        }
+      } else {
+        valueBar = 16;
+      }
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
-    settingsController.SetPTSColorBar(valueBar);
-    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
-  }
-  if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBG < 16 ) {
-      valueBG += 1;
-    } else {
-      valueBG = 0;
+    if (object == btnNextBG) {
+      if (valueBG < 16) {
+        valueBG += 1;
+      } else {
+        valueBG = 0;
+      }
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
-    settingsController.SetPTSColorBG(valueBG);
-    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
-  }
-  if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBG > 0 ) {
-      valueBG -= 1;
-    } else {
-      valueBG = 16;
+    if (object == btnPrevBG) {
+      if (valueBG > 0) {
+        valueBG -= 1;
+      } else {
+        valueBG = 16;
+      }
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
-    settingsController.SetPTSColorBG(valueBG);
-    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
-  }
-  if((object == btnReset) && (event == LV_EVENT_PRESSED)) {
+    if (object == btnReset) {
       settingsController.SetPTSColorTime(11);
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
       lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
@@ -298,25 +300,26 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
       settingsController.SetPTSColorBG(3);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[3]);
-  }
-  if((object == btnRandom) && (event == LV_EVENT_PRESSED)) {
-    uint8_t randTime = rand() % 17;
-    uint8_t randBar = rand() % 17;
-    uint8_t randBG = rand() % 17;
-    // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
-    if (randTime == randBG) {
-      randBG += 1;
     }
-    if (randBar == 3) {
-      randBar = randTime;
+    if (object == btnRandom) {
+      uint8_t randTime = rand() % 17;
+      uint8_t randBar = rand() % 17;
+      uint8_t randBG = rand() % 17;
+      // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
+      if (randTime == randBG) {
+        randBG += 1;
+      }
+      if (randBar == 3) {
+        randBar = randTime;
+      }
+      settingsController.SetPTSColorTime(randTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+      settingsController.SetPTSColorBar(randBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBar]);
+      settingsController.SetPTSColorBG(randBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBG]);
     }
-    settingsController.SetPTSColorTime(randTime);
-    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-    settingsController.SetPTSColorBar(randBar);
-    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBar]);
-    settingsController.SetPTSColorBG(randBG);
-    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBG]);
   }
 }
\ No newline at end of file
-- 
cgit v0.10.2


From 9851ed33d84aa242dfb98c2c3714a20ddbc53f45 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 15:28:40 +0200
Subject: Fix potential edge case of sidebar being set black


diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 979e4b6..e125c8a 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -310,7 +310,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
         randBG += 1;
       }
       if (randBar == 3) {
-        randBar = randTime;
+        randBar -= 1;
       }
       settingsController.SetPTSColorTime(randTime);
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-- 
cgit v0.10.2


From 81a36dc31ed22237e3cc06c8f4ba2a5cbcf07f8e Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 16 Aug 2021 18:26:10 +0300
Subject: Simplify parameters and cleanup


diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index 429a6eb..f17d716 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -8,19 +8,20 @@ using namespace Pinetime::Drivers;
 // TODO use shortcut to automatically send STOP when receive LastTX, for example
 // TODO use DMA/IRQ
 
-TwiMaster::TwiMaster(const Modules module, const Parameters& params) : module {module}, params {params} {
+TwiMaster::TwiMaster(NRF_TWIM_Type* module, uint32_t frequency, uint8_t pinSda, uint8_t pinScl)
+  : module {module}, frequency {frequency}, pinSda {pinSda}, pinScl {pinScl} {
   mutex = xSemaphoreCreateBinary();
 }
 
 void TwiMaster::ConfigurePins() const {
-  NRF_GPIO->PIN_CNF[params.pinScl] =
+  NRF_GPIO->PIN_CNF[pinScl] =
     (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
     (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
     (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) |
     (GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
     (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
 
-  NRF_GPIO->PIN_CNF[params.pinSda] =
+  NRF_GPIO->PIN_CNF[pinSda] =
     (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
     (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
     (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) |
@@ -31,28 +32,12 @@ void TwiMaster::ConfigurePins() const {
 void TwiMaster::Init() {
   ConfigurePins();
 
-  switch (module) {
-    case Modules::TWIM1:
-      twiBaseAddress = NRF_TWIM1;
-      break;
-    default:
-      return;
-  }
+  twiBaseAddress = module;
 
-  switch (static_cast<Frequencies>(params.frequency)) {
-    case Frequencies::Khz100:
-      twiBaseAddress->FREQUENCY = TWIM_FREQUENCY_FREQUENCY_K100;
-      break;
-    case Frequencies::Khz250:
-      twiBaseAddress->FREQUENCY = TWIM_FREQUENCY_FREQUENCY_K250;
-      break;
-    case Frequencies::Khz400:
-      twiBaseAddress->FREQUENCY = TWIM_FREQUENCY_FREQUENCY_K400;
-      break;
-  }
+  twiBaseAddress->FREQUENCY = frequency;
 
-  twiBaseAddress->PSEL.SCL = params.pinScl;
-  twiBaseAddress->PSEL.SDA = params.pinSda;
+  twiBaseAddress->PSEL.SCL = pinScl;
+  twiBaseAddress->PSEL.SDA = pinSda;
   twiBaseAddress->EVENTS_LASTRX = 0;
   twiBaseAddress->EVENTS_STOPPED = 0;
   twiBaseAddress->EVENTS_LASTTX = 0;
@@ -63,12 +48,6 @@ void TwiMaster::Init() {
 
   twiBaseAddress->ENABLE = (TWIM_ENABLE_ENABLE_Enabled << TWIM_ENABLE_ENABLE_Pos);
 
-  /* // IRQ
-     NVIC_ClearPendingIRQ(_IRQn);
-     NVIC_SetPriority(_IRQn, 2);
-     NVIC_EnableIRQ(_IRQn);
-   */
-
   xSemaphoreGive(mutex);
 }
 
@@ -194,12 +173,10 @@ void TwiMaster::Wakeup() {
  * */
 void TwiMaster::FixHwFreezed() {
   NRF_LOG_INFO("I2C device frozen, reinitializing it!");
-  // Disable I²C
+
   uint32_t twi_state = NRF_TWI1->ENABLE;
-  twiBaseAddress->ENABLE = TWIM_ENABLE_ENABLE_Disabled << TWI_ENABLE_ENABLE_Pos;
 
-  ConfigurePins();
+  Sleep();
 
-  // Re-enable I²C
   twiBaseAddress->ENABLE = twi_state;
 }
diff --git a/src/drivers/TwiMaster.h b/src/drivers/TwiMaster.h
index b8d36d5..30ac6c5 100644
--- a/src/drivers/TwiMaster.h
+++ b/src/drivers/TwiMaster.h
@@ -8,16 +8,9 @@ namespace Pinetime {
   namespace Drivers {
     class TwiMaster {
     public:
-      enum class Modules { TWIM1 };
-      enum class Frequencies { Khz100, Khz250, Khz400 };
       enum class ErrorCodes { NoError, TransactionFailed };
-      struct Parameters {
-        uint32_t frequency;
-        uint8_t pinSda;
-        uint8_t pinScl;
-      };
 
-      TwiMaster(const Modules module, const Parameters& params);
+      TwiMaster(NRF_TWIM_Type* module, uint32_t frequency, uint8_t pinSda, uint8_t pinScl);
 
       void Init();
       ErrorCodes Read(uint8_t deviceAddress, uint8_t registerAddress, uint8_t* buffer, size_t size);
@@ -26,16 +19,18 @@ namespace Pinetime {
       void Sleep();
       void Wakeup();
 
-      void ConfigurePins() const;
-
     private:
       ErrorCodes Read(uint8_t deviceAddress, uint8_t* buffer, size_t size, bool stop);
       ErrorCodes Write(uint8_t deviceAddress, const uint8_t* data, size_t size, bool stop);
       void FixHwFreezed();
+      void ConfigurePins() const;
+
       NRF_TWIM_Type* twiBaseAddress;
       SemaphoreHandle_t mutex = nullptr;
-      const Modules module;
-      const Parameters params;
+      NRF_TWIM_Type* module;
+      uint32_t frequency;
+      uint8_t pinSda;
+      uint8_t pinScl;
       static constexpr uint8_t maxDataSize {16};
       static constexpr uint8_t registerSize {1};
       uint8_t internalBuffer[maxDataSize + registerSize];
diff --git a/src/main.cpp b/src/main.cpp
index ffbba5e..4e94ab1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -81,9 +81,8 @@ Pinetime::Drivers::SpiNorFlash spiNorFlash {flashSpi};
 // The TWI device should work @ up to 400Khz but there is a HW bug which prevent it from
 // respecting correct timings. According to erratas heet, this magic value makes it run
 // at ~390Khz with correct timings.
-static constexpr uint32_t MaxTwiFrequencyWithoutHardwareBug {0x06200000};
-Pinetime::Drivers::TwiMaster twiMaster {Pinetime::Drivers::TwiMaster::Modules::TWIM1,
-                                        Pinetime::Drivers::TwiMaster::Parameters {MaxTwiFrequencyWithoutHardwareBug, pinTwiSda, pinTwiScl}};
+//static constexpr uint32_t MaxTwiFrequencyWithoutHardwareBug {0x06200000};
+Pinetime::Drivers::TwiMaster twiMaster {NRF_TWIM1, TWI_FREQUENCY_FREQUENCY_K250, pinTwiSda, pinTwiScl};
 Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress};
 #ifdef PINETIME_IS_RECOVERY
 static constexpr bool isFactory = true;
-- 
cgit v0.10.2


From b91100573e474d6bf4aa324b982d190d035dd232 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Wed, 18 Aug 2021 19:20:25 +0300
Subject: Fix music app buttons


diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 99a1518..257e9ae 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -292,7 +292,7 @@ bool Music::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
       return true;
     }
     default: {
-      return true;
+      return false;
     }
   }
 }
-- 
cgit v0.10.2


From df8ea7fe523bb9ec0ac3e24f0b1bebe5743d90cc Mon Sep 17 00:00:00 2001
From: hubmartin <hub.martin@gmail.com>
Date: Mon, 16 Aug 2021 16:42:42 +0200
Subject: Add memory print usage


diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40e1f2a..f72f50c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -839,7 +839,7 @@ target_compile_options(${EXECUTABLE_NAME} PUBLIC
 
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES
         SUFFIX ".out"
-        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_FILE_NAME}.map"
+        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_FILE_NAME}.map"
         )
 
 add_custom_command(TARGET ${EXECUTABLE_NAME}
@@ -869,7 +869,7 @@ target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
 
 set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES
         SUFFIX ".out"
-        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_MCUBOOT_FILE_NAME}.map"
+        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_MCUBOOT_FILE_NAME}.map"
         )
 
 add_custom_command(TARGET ${EXECUTABLE_MCUBOOT_NAME}
@@ -906,7 +906,7 @@ target_compile_options(${EXECUTABLE_RECOVERY_NAME} PUBLIC
 
 set_target_properties(${EXECUTABLE_RECOVERY_NAME} PROPERTIES
         SUFFIX ".out"
-        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_RECOVERY_FILE_NAME}.map"
+        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_RECOVERY_FILE_NAME}.map"
         )
 
 add_custom_command(TARGET ${EXECUTABLE_RECOVERY_NAME}
@@ -936,7 +936,7 @@ target_compile_options(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} PUBLIC
 
 set_target_properties(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} PROPERTIES
         SUFFIX ".out"
-        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
+        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
         )
 
 add_custom_command(TARGET ${EXECUTABLE_RECOVERY_MCUBOOT_NAME}
@@ -977,7 +977,7 @@ add_dependencies(${EXECUTABLE_RECOVERYLOADER_NAME} ${EXECUTABLE_RECOVERY_MCUBOOT
 
 set_target_properties(${EXECUTABLE_RECOVERYLOADER_NAME} PROPERTIES
         SUFFIX ".out"
-        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_RECOVERYLOADER_FILE_NAME}.map"
+        LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_RECOVERYLOADER_FILE_NAME}.map"
         )
 
 add_custom_command(TARGET ${EXECUTABLE_RECOVERYLOADER_NAME}
@@ -1010,7 +1010,7 @@ add_dependencies(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} ${EXECUTABLE_RECOVERY
 
 set_target_properties(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} PROPERTIES
         SUFFIX ".out"
-        LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_MCUBOOT_RECOVERYLOADER_FILE_NAME}.map"
+        LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_MCUBOOT_RECOVERYLOADER_FILE_NAME}.map"
         )
 
 add_custom_command(TARGET ${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME}
-- 
cgit v0.10.2


From 40392d7b9199c87de9784cacb1dee5476e5a5b6f Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Wed, 18 Aug 2021 21:40:27 +0300
Subject: Use highest frequency and move mutex creation to Init


diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index f17d716..7600927 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -10,7 +10,6 @@ using namespace Pinetime::Drivers;
 
 TwiMaster::TwiMaster(NRF_TWIM_Type* module, uint32_t frequency, uint8_t pinSda, uint8_t pinScl)
   : module {module}, frequency {frequency}, pinSda {pinSda}, pinScl {pinScl} {
-  mutex = xSemaphoreCreateBinary();
 }
 
 void TwiMaster::ConfigurePins() const {
@@ -30,6 +29,10 @@ void TwiMaster::ConfigurePins() const {
 }
 
 void TwiMaster::Init() {
+  if (mutex == nullptr) {
+    mutex = xSemaphoreCreateBinary();
+  }
+
   ConfigurePins();
 
   twiBaseAddress = module;
diff --git a/src/main.cpp b/src/main.cpp
index 4e94ab1..524035f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -81,8 +81,8 @@ Pinetime::Drivers::SpiNorFlash spiNorFlash {flashSpi};
 // The TWI device should work @ up to 400Khz but there is a HW bug which prevent it from
 // respecting correct timings. According to erratas heet, this magic value makes it run
 // at ~390Khz with correct timings.
-//static constexpr uint32_t MaxTwiFrequencyWithoutHardwareBug {0x06200000};
-Pinetime::Drivers::TwiMaster twiMaster {NRF_TWIM1, TWI_FREQUENCY_FREQUENCY_K250, pinTwiSda, pinTwiScl};
+static constexpr uint32_t MaxTwiFrequencyWithoutHardwareBug {0x06200000};
+Pinetime::Drivers::TwiMaster twiMaster {NRF_TWIM1, MaxTwiFrequencyWithoutHardwareBug, pinTwiSda, pinTwiScl};
 Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress};
 #ifdef PINETIME_IS_RECOVERY
 static constexpr bool isFactory = true;
-- 
cgit v0.10.2


From 0313277ae604bb46987cdfbef123b7edfeb8ab9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 28 Aug 2021 15:10:14 +0200
Subject: Fix touchinfo typo in SystemTask.


diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 08e2199..03bf670 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -241,7 +241,7 @@ void SystemTask::Work() {
           break;
         case Messages::TouchWakeUp: {
           auto touchInfo = touchPanel.GetTouchInfo();
-          if (touchInfo.isTouch and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
+          if (touchInfo.touching and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
                                       settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
                                      (touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
                                       settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
-- 
cgit v0.10.2


From fab49f8557ef8ff38fe4f607e33b18fb5a1aeb9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 28 Aug 2021 15:23:13 +0200
Subject: Fix recovery firmware since last changes in DisplayApp.


diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index fd517b1..17612ef 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -3,6 +3,7 @@
 #include <task.h>
 #include <libraries/log/nrf_log.h>
 #include <components/rle/RleDecoder.h>
+#include <touchhandler/TouchHandler.h>
 #include "displayapp/icons/infinitime/infinitime-nb.c"
 
 using namespace Pinetime::Applications;
@@ -19,7 +20,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        Controllers::Settings& settingsController,
                        Pinetime::Controllers::MotorController& motorController,
                        Pinetime::Controllers::MotionController& motionController,
-                       Pinetime::Controllers::TimerController& timerController)
+                       Pinetime::Controllers::TimerController& timerController,
+                       Pinetime::Controllers::TouchHandler& touchHandler)
   : lcd {lcd}, bleController {bleController} {
 
 }
diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
index 638c007..8b2bc7f 100644
--- a/src/displayapp/DisplayAppRecovery.h
+++ b/src/displayapp/DisplayAppRecovery.h
@@ -29,6 +29,9 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   };
+  namespace Controllers {
+    class TouchHandler;
+  }
   namespace Applications {
     class DisplayApp {
     public:
@@ -44,7 +47,8 @@ namespace Pinetime {
                  Controllers::Settings& settingsController,
                  Pinetime::Controllers::MotorController& motorController,
                  Pinetime::Controllers::MotionController& motionController,
-                 Pinetime::Controllers::TimerController& timerController);
+                 Pinetime::Controllers::TimerController& timerController,
+                 Pinetime::Controllers::TouchHandler& touchHandler);
       void Start();
       void PushMessage(Pinetime::Applications::Display::Messages msg);
       void Register(Pinetime::System::SystemTask* systemTask);
diff --git a/src/displayapp/DummyLittleVgl.h b/src/displayapp/DummyLittleVgl.h
index 016165b..1db5134 100644
--- a/src/displayapp/DummyLittleVgl.h
+++ b/src/displayapp/DummyLittleVgl.h
@@ -32,6 +32,9 @@ namespace Pinetime {
       }
       void SetNewTapEvent(uint16_t x, uint16_t y) {
       }
+      void SetNewTouchPoint(uint16_t x, uint16_t y, bool contact) {
+
+      }
     };
   }
 }
-- 
cgit v0.10.2


From 31bc47d1cb397f5de0275d0d95aac7ca29cc7392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 28 Aug 2021 21:02:11 +0200
Subject: Settings : use enums instead of ints to store colors. Group all PTS
 settings into a struct. PTS/SettingsPTS : Convert to/from LVGL color and
 Settings::Color, add functions to reduce code duplication. Adapt
 SettingPineTimeStyle with the last Screen Interface


diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69c1936..a724290 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -418,6 +418,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/BatteryInfo.cpp
         displayapp/screens/Steps.cpp
         displayapp/screens/Timer.cpp
+        displayapp/Colors.cpp
 
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp
@@ -611,6 +612,7 @@ set(INCLUDE_FILES
         displayapp/screens/Metronome.h
         displayapp/screens/Motion.h
         displayapp/screens/Timer.h
+        displayapp/Colors.h
         drivers/St7789.h
         drivers/SpiNorFlash.h
         drivers/SpiMaster.h
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 40cafe9..a294ab7 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -17,6 +17,14 @@ namespace Pinetime {
         DoubleTap = 1,
         RaiseWrist = 2,
       };
+      enum class Colors : uint8_t {
+        White, Silver, Gray, Black, Red, Maroon, Yellow, Olive, Lime, Green, Cyan, Teal, Blue, Navy, Magenta, Purple, Orange
+      };
+      struct PineTimeStyle {
+        Colors ColorTime = Colors::Teal;
+        Colors ColorBar = Colors::Teal;
+        Colors ColorBG = Colors::Black;
+      };
 
       Settings(Pinetime::Controllers::FS& fs);
 
@@ -33,37 +41,38 @@ namespace Pinetime {
         return settings.clockFace;
       };
 
-      void SetPTSColorTime(uint8_t colorTime) {
-        if (colorTime != settings.PTSColorTime)
+      void SetPTSColorTime(Colors colorTime) {
+        if (colorTime != settings.PTS.ColorTime)
           settingsChanged = true;
-        settings.PTSColorTime = colorTime;
+        settings.PTS.ColorTime = colorTime;
       };
-      uint8_t GetPTSColorTime() const {
-        return settings.PTSColorTime;
+      Colors GetPTSColorTime() const {
+        return settings.PTS.ColorTime;
       };
 
-      void SetPTSColorBar(uint8_t colorBar) {
-        if (colorBar != settings.PTSColorBar)
+      void SetPTSColorBar(Colors colorBar) {
+        if (colorBar != settings.PTS.ColorBar)
           settingsChanged = true;
-        settings.PTSColorBar = colorBar;
+        settings.PTS.ColorBar = colorBar;
       };
-      uint8_t GetPTSColorBar() const {
-        return settings.PTSColorBar;
+      Colors GetPTSColorBar() const {
+        return settings.PTS.ColorBar;
       };
 
-      void SetPTSColorBG(uint8_t colorBG) {
-        if (colorBG != settings.PTSColorBG)
+      void SetPTSColorBG(Colors colorBG) {
+        if (colorBG != settings.PTS.ColorBG)
           settingsChanged = true;
-        settings.PTSColorBG = colorBG;
+        settings.PTS.ColorBG = colorBG;
       };
-      uint8_t GetPTSColorBG() const {
-        return settings.PTSColorBG;
+      Colors GetPTSColorBG() const {
+        return settings.PTS.ColorBG;
       };
 
       void SetAppMenu(uint8_t menu) {
         appMenu = menu;
       };
-      uint8_t GetAppMenu() {
+
+      uint8_t GetAppMenu() const {
         return appMenu;
       };
 
@@ -156,7 +165,6 @@ namespace Pinetime {
 
       static constexpr uint32_t settingsVersion = 0x0002;
       struct SettingsData {
-
         uint32_t version = settingsVersion;
         uint32_t stepsGoal = 10000;
         uint32_t screenTimeOut = 15000;
@@ -166,9 +174,7 @@ namespace Pinetime {
 
         uint8_t clockFace = 0;
 
-        uint8_t PTSColorTime = 11;
-        uint8_t PTSColorBar = 11;
-        uint8_t PTSColorBG = 3;
+        PineTimeStyle PTS;
 
         std::bitset<3> wakeUpMode {0};
 
diff --git a/src/displayapp/Colors.cpp b/src/displayapp/Colors.cpp
new file mode 100644
index 0000000..f45f072
--- /dev/null
+++ b/src/displayapp/Colors.cpp
@@ -0,0 +1,27 @@
+#include "Colors.h"
+
+using namespace Pinetime::Applications;
+using namespace Pinetime::Controllers;
+
+lv_color_t Pinetime::Applications::Convert(Pinetime::Controllers::Settings::Colors color) {
+  switch (color) {
+    case Pinetime::Controllers::Settings::Colors::White: return LV_COLOR_WHITE;
+    case Pinetime::Controllers::Settings::Colors::Silver: return LV_COLOR_SILVER;
+    case Pinetime::Controllers::Settings::Colors::Gray: return LV_COLOR_GRAY;
+    case Pinetime::Controllers::Settings::Colors::Black: return LV_COLOR_BLACK;
+    case Pinetime::Controllers::Settings::Colors::Red: return LV_COLOR_RED;
+    case Pinetime::Controllers::Settings::Colors::Maroon: return LV_COLOR_MAROON;
+    case Pinetime::Controllers::Settings::Colors::Yellow: return LV_COLOR_YELLOW;
+    case Pinetime::Controllers::Settings::Colors::Olive: return LV_COLOR_OLIVE;
+    case Pinetime::Controllers::Settings::Colors::Lime: return LV_COLOR_LIME;
+    case Pinetime::Controllers::Settings::Colors::Green: return LV_COLOR_GREEN;
+    case Pinetime::Controllers::Settings::Colors::Cyan: return LV_COLOR_CYAN;
+    case Pinetime::Controllers::Settings::Colors::Teal: return LV_COLOR_TEAL;
+    case Pinetime::Controllers::Settings::Colors::Blue: return LV_COLOR_BLUE;
+    case Pinetime::Controllers::Settings::Colors::Navy: return LV_COLOR_NAVY;
+    case Pinetime::Controllers::Settings::Colors::Magenta: return LV_COLOR_MAGENTA;
+    case Pinetime::Controllers::Settings::Colors::Purple: return LV_COLOR_PURPLE;
+    case Pinetime::Controllers::Settings::Colors::Orange: return LV_COLOR_ORANGE;
+    default: return LV_COLOR_WHITE;
+  }
+}
diff --git a/src/displayapp/Colors.h b/src/displayapp/Colors.h
new file mode 100644
index 0000000..9db7dd2
--- /dev/null
+++ b/src/displayapp/Colors.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <lvgl/src/lv_misc/lv_color.h>
+#include <components/settings/Settings.h>
+
+namespace Pinetime {
+  namespace Applications {
+    lv_color_t Convert(Controllers::Settings::Colors color);
+  }
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 772e461..7a712f4 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -23,6 +23,7 @@
 #include <date/date.h>
 #include <lvgl/lvgl.h>
 #include <cstdio>
+#include <displayapp/Colors.h>
 #include "BatteryIcon.h"
 #include "BleIcon.h"
 #include "NotificationIcon.h"
@@ -63,7 +64,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   //Create a 200px wide background rectangle
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBG()));
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -71,25 +72,25 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   // Display the time
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
 
   // Create a 40px wide bar down the right side of the screen
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBar()));
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 16b6de1..cb74ead 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -68,11 +68,6 @@ namespace Pinetime {
         lv_obj_t* notificationIcon;
         lv_obj_t* stepGauge;
         lv_color_t needle_colors[1];
-        lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
-                                     LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
-                                     LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
-                                     LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
-                                     LV_COLOR_ORANGE};
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index e125c8a..c9af19b 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -1,5 +1,6 @@
 #include "SettingPineTimeStyle.h"
 #include <lvgl/lvgl.h>
+#include <displayapp/Colors.h>
 #include "displayapp/DisplayApp.h"
 #include "displayapp/screens/Symbols.h"
 
@@ -15,7 +16,7 @@ namespace {
 SettingPineTimeStyle::SettingPineTimeStyle(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
   : Screen(app), settingsController {settingsController} {
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBG()));
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -24,18 +25,18 @@ SettingPineTimeStyle::SettingPineTimeStyle(Pinetime::Applications::DisplayApp* a
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "A\nM");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -43,7 +44,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(Pinetime::Applications::DisplayApp* a
   // Create a 40px wide bar down the right side of the screen
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBar()));
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
@@ -215,91 +216,60 @@ SettingPineTimeStyle::~SettingPineTimeStyle() {
   settingsController.SaveSettings();
 }
 
-bool SettingPineTimeStyle::Refresh() {
-  return running;
-}
-
 void SettingPineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
-  uint8_t valueTime = settingsController.GetPTSColorTime();
-  uint8_t valueBar = settingsController.GetPTSColorBar();
-  uint8_t valueBG = settingsController.GetPTSColorBG();
+  auto valueTime = settingsController.GetPTSColorTime();
+  auto valueBar = settingsController.GetPTSColorBar();
+  auto valueBG = settingsController.GetPTSColorBG();
 
   if (event == LV_EVENT_CLICKED) {
     if (object == btnNextTime) {
-      if (valueTime < 16) {
-        valueTime += 1;
-      } else {
-        valueTime = 0;
-      }
+      valueTime = GetNext(valueTime);
+
       settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
     }
     if (object == btnPrevTime) {
-      if (valueTime > 0) {
-        valueTime -= 1;
-      } else {
-        valueTime = 16;
-      }
+      valueTime = GetPrevious(valueTime);
       settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
     }
     if (object == btnNextBar) {
-      if (valueBar < 16) {
-        valueBar += 1;
-        // Avoid setting the sidebar black
-        if (valueBar == 3) {
-          valueBar += 1;
-        }
-      } else {
-        valueBar = 0;
-      }
+      valueBar = GetNext(valueBar);
+      if(valueBar == Controllers::Settings::Colors::Black)
+        valueBar = GetNext(valueBar);
       settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBar));
     }
     if (object == btnPrevBar) {
-      if (valueBar > 0) {
-        valueBar -= 1;
-        // Avoid setting the sidebar black
-        if (valueBar == 3) {
-          valueBar -= 1;
-        }
-      } else {
-        valueBar = 16;
-      }
+      valueBar = GetPrevious(valueBar);
+      if(valueBar == Controllers::Settings::Colors::Black)
+        valueBar = GetPrevious(valueBar);
       settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBar));
     }
     if (object == btnNextBG) {
-      if (valueBG < 16) {
-        valueBG += 1;
-      } else {
-        valueBG = 0;
-      }
+      valueBG = GetNext(valueBG);
       settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG));
     }
     if (object == btnPrevBG) {
-      if (valueBG > 0) {
-        valueBG -= 1;
-      } else {
-        valueBG = 16;
-      }
+      valueBG = GetPrevious(valueBG);
       settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG));
     }
     if (object == btnReset) {
-      settingsController.SetPTSColorTime(11);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
-      settingsController.SetPTSColorBar(11);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
-      settingsController.SetPTSColorBG(3);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[3]);
+      settingsController.SetPTSColorTime(Controllers::Settings::Colors::Teal);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      settingsController.SetPTSColorBar(Controllers::Settings::Colors::Teal);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      settingsController.SetPTSColorBG(Controllers::Settings::Colors::Black);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Black));
     }
     if (object == btnRandom) {
       uint8_t randTime = rand() % 17;
@@ -312,14 +282,37 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       if (randBar == 3) {
         randBar -= 1;
       }
-      settingsController.SetPTSColorTime(randTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-      settingsController.SetPTSColorBar(randBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBar]);
-      settingsController.SetPTSColorBG(randBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBG]);
+      settingsController.SetPTSColorTime(static_cast<Controllers::Settings::Colors>(randTime));
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(static_cast<Controllers::Settings::Colors>(randTime)));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randTime)));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randTime)));
+      settingsController.SetPTSColorBar(static_cast<Controllers::Settings::Colors>(randBar));
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randBar)));
+      settingsController.SetPTSColorBG(static_cast<Controllers::Settings::Colors>(randBG));
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randBG)));
     }
   }
-}
\ No newline at end of file
+}
+
+Pinetime::Controllers::Settings::Colors SettingPineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) {
+  auto colorAsInt = static_cast<uint8_t>(color);
+  Pinetime::Controllers::Settings::Colors nextColor;
+  if (colorAsInt < 16) {
+    nextColor = static_cast<Controllers::Settings::Colors>(colorAsInt + 1);
+  } else {
+    nextColor = static_cast<Controllers::Settings::Colors>(0);
+  }
+  return nextColor;
+}
+
+Pinetime::Controllers::Settings::Colors SettingPineTimeStyle::GetPrevious(Pinetime::Controllers::Settings::Colors color) {
+  auto colorAsInt = static_cast<uint8_t>(color);
+  Pinetime::Controllers::Settings::Colors prevColor;
+
+  if (colorAsInt > 0) {
+    prevColor = static_cast<Controllers::Settings::Colors>(colorAsInt - 1);
+  } else {
+    prevColor = static_cast<Controllers::Settings::Colors>(16);
+  }
+  return prevColor;
+}
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index 1a01ebb..397bd86 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -15,12 +15,14 @@ namespace Pinetime {
           SettingPineTimeStyle(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
           ~SettingPineTimeStyle() override;
 
-          bool Refresh() override;
           void UpdateSelected(lv_obj_t *object, lv_event_t event);
          
         private:          
           Controllers::Settings& settingsController;
 
+          Pinetime::Controllers::Settings::Colors GetNext(Controllers::Settings::Colors color);
+          Pinetime::Controllers::Settings::Colors GetPrevious(Controllers::Settings::Colors color);
+
           lv_obj_t * btnNextTime;
           lv_obj_t * btnPrevTime;
           lv_obj_t * btnNextBar;
@@ -29,9 +31,6 @@ namespace Pinetime {
           lv_obj_t * btnPrevBG;
           lv_obj_t * btnReset;
           lv_obj_t * btnRandom;
-          lv_obj_t * timeColor;
-          lv_obj_t * barColor;
-          lv_obj_t * bgColor;
           lv_obj_t * timebar;
           lv_obj_t * sidebar;
           lv_obj_t * timeDD1;
@@ -51,11 +50,6 @@ namespace Pinetime {
           lv_obj_t * calendarCrossBar2;
           lv_obj_t * stepGauge;
           lv_color_t needle_colors[1];
-          lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
-                                       LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
-                                       LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
-                                       LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
-                                       LV_COLOR_ORANGE};
       };
     }
   }
-- 
cgit v0.10.2


From 6c023785e53c507f7cb20703f5f3a221ea095068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 28 Aug 2021 21:30:31 +0200
Subject: Fix wake on tap/double tap.


diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 03bf670..0617b0c 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -240,12 +240,14 @@ void SystemTask::Work() {
           isDimmed = false;
           break;
         case Messages::TouchWakeUp: {
-          auto touchInfo = touchPanel.GetTouchInfo();
-          if (touchInfo.touching and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
-                                      settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
-                                     (touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
-                                      settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
-            GoToRunning();
+          if(touchHandler.GetNewTouchInfo()) {
+            auto gesture = touchHandler.GestureGet();
+            if (gesture != Pinetime::Drivers::Cst816S::Gestures::None and ((gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
+                                settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
+                                (gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
+                                settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
+              GoToRunning();
+            }
           }
         } break;
         case Messages::GoToSleep:
-- 
cgit v0.10.2


From 1635bfafb3fe9dce1ab05102d1bfeac1eca81c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Tue, 31 Aug 2021 21:56:21 +0200
Subject: Fix notifications that wouldn't auto close when the timeout elapsed
 (in preview mode).


diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index fd0b86d..22eb290 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -73,7 +73,6 @@ void Notifications::Refresh() {
     timeoutLinePoints[1].x = pos;
     lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
   }
-  running = currentItem->IsRunning();
 }
 
 bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-- 
cgit v0.10.2


From 6f9f0e8b0e42a5526d47ca664534fb6b0ccb6ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Thu, 2 Sep 2021 20:32:50 +0200
Subject: Set version to 1.4.0.


diff --git a/CMakeLists.txt b/CMakeLists.txt
index b442fc1..cc41a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(pinetime VERSION 1.3.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.4.0 LANGUAGES C CXX ASM)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 14)
-- 
cgit v0.10.2