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: [PATCH 01/19] Fix touchevent tap

---
 src/displayapp/DisplayApp.cpp                     | 11 +++++------
 src/displayapp/DisplayApp.h                       |  2 +-
 src/displayapp/screens/settings/QuickSettings.cpp |  9 +--------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 7b03d569..c8e5d2e8 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 0c7bd216..14cd7ad5 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 3994794d..20d2cd22 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() {

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: [PATCH 02/19] Fix regression

---
 src/displayapp/DisplayApp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index c8e5d2e8..b45822de 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;

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: [PATCH 03/19] Fix another regression

---
 src/displayapp/screens/FlashLight.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/displayapp/screens/FlashLight.cpp b/src/displayapp/screens/FlashLight.cpp
index 4568db40..8d647a36 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;
 }

From d6cccc2dcd95a7d332ee657d1357ae060389f6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Fri, 23 Jul 2021 11:46:37 +0200
Subject: [PATCH 04/19] Set version to 1.3.0

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2e467e9..9d02c101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(pinetime VERSION 1.2.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.3.0 LANGUAGES C CXX ASM)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 14)

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: [PATCH 05/19] minor changes regarding building (#356)

* don't enforce any flashing through debug ports
---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d02c101..b442fc11 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>")

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

---
 hooks/README.md  |  5 +++++
 hooks/pre-commit | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 hooks/README.md
 create mode 100755 hooks/pre-commit

diff --git a/hooks/README.md b/hooks/README.md
new file mode 100644
index 00000000..de8fc67b
--- /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 00000000..2e918a17
--- /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

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

---
 hooks/pre-commit | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 2e918a17..15961f19 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

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

---
 hooks/pre-commit | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 15961f19..5e10aa19 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

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: [PATCH 09/19] Add PineTimeStyle in the list of watchface in README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd23c867..4ff21286 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)

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: [PATCH 10/19] Dim screen before sleep (#464)

* Implement dimming
---
 src/displayapp/DisplayApp.cpp | 13 +++++++++-
 src/displayapp/Messages.h     |  6 +++--
 src/systemtask/SystemTask.cpp | 45 ++++++++++++++++++++++++++---------
 src/systemtask/SystemTask.h   |  7 +++---
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index b0948393..b5ad26f0 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 ce65f846..322505e6 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 7efd1d6b..8915ce74 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 f8cf6370..ba434298 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;
 

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: [PATCH 11/19] Code cleanup (#466)

* Code cleanup
* Remove override again
---
 src/displayapp/DisplayApp.cpp                 | 12 +++----
 src/displayapp/screens/Label.h                |  4 +--
 src/displayapp/screens/Motion.cpp             | 14 ++++----
 src/displayapp/screens/Motion.h               |  6 +---
 src/displayapp/screens/PineTimeStyle.cpp      | 36 +++++++++----------
 src/displayapp/screens/Steps.cpp              | 19 +++++-----
 src/displayapp/screens/SystemInfo.cpp         |  5 ---
 src/displayapp/screens/SystemInfo.h           |  5 +--
 .../screens/settings/QuickSettings.cpp        |  6 +---
 .../screens/settings/QuickSettings.h          |  1 -
 10 files changed, 42 insertions(+), 66 deletions(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index b5ad26f0..d4a73f5e 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 62b80bec..834f8c88 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 a8bb3c18..43a5575e 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 132b20ec..7e65197b 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 591f3a49..0efb4dc3 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 6aabd30e..d72e8333 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 f5bf0cc9..853434db 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 9d471f61..a9ad652d 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 3fb9c70b..2cd24876 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 a14f46bf..e0fc0a87 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();

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: [PATCH 12/19] Update documentation (#467)

* Fix and update documentation
* Add newlines
---
 README.md                                | 44 +++++++++++++++---------
 doc/gettingStarted/gettingStarted-1.0.md | 31 ++++++++++-------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 4ff21286..d9de4002 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 2ac22b97..88ff2072 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).
-

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: [PATCH 13/19] Add task state info to SystemInfo

---
 src/displayapp/screens/SystemInfo.cpp | 42 ++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index 853434db..2bb84818 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);

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: [PATCH 14/19] Add new unique icons for some apps

---
 src/displayapp/fonts/README.md                |   2 +-
 src/displayapp/fonts/jetbrains_mono_bold_20.c | 111 +++++++++++-------
 src/displayapp/screens/ApplicationList.cpp    |   2 +-
 src/displayapp/screens/Symbols.h              |   3 +
 .../screens/settings/SettingWakeUp.cpp        |   2 +-
 .../screens/settings/SettingWatchFace.cpp     |   4 +-
 src/displayapp/screens/settings/Settings.cpp  |   4 +-
 7 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index ec4beb88..8a260846 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 98243bb4..d8705528 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 78c7cd9a..d6c3970b 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 c9d61541..e68a7af6 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 0e080353..cce9a60d 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 3e73489d..02b90816 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 e63a3584..0ab21377 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);

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: [PATCH 15/19] Fix cases where Get() isn't used

---
 src/displayapp/screens/Screen.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index 8e49c9de..6c9110c6 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;

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

* Correct spelling issue
---
 doc/PinetimeStubWithNrf52DK.md | 4 ++--
 doc/ble.md                     | 4 ++--
 doc/branches.md                | 2 +-
 doc/buildAndProgram.md         | 2 +-
 doc/buildWithDocker.md         | 2 +-
 doc/contribute.md              | 2 +-
 doc/filesInReleaseNotes.md     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/PinetimeStubWithNrf52DK.md b/doc/PinetimeStubWithNrf52DK.md
index 52131251..c4857921 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 fdf1a5b6..518b99c8 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 0fb8316d..ef280f40 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 5fe593ae..87b6dd9a 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 17fb53d9..2e4ecbb6 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 09d20774..9f4c2154 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 78c20b51..1a37fefb 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.
  

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: [PATCH 17/19] Fix slow scroll

---
 src/displayapp/screens/Music.cpp         | 4 +---
 src/displayapp/screens/Notifications.cpp | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 9f10f508..c8d5e4b0 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 38b12420..5c23ed1f 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);
 

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: [PATCH 18/19] Fix compile warnings

---
 src/displayapp/screens/SystemInfo.cpp | 2 ++
 src/libs/lv_conf.h                    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index 2bb84818..e7c5b65a 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 18fc3fa2..73109c5a 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*/
 

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: [PATCH 19/19] 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).

---
 src/displayapp/screens/Tile.cpp | 18 ++++++++++--------
 src/displayapp/screens/Tile.h   |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 3eb127cc..d5d6cb80 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 4ebd81cd..765a8def 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;