Merge branch 'develop' into motionservice_fix_typo_in_include

src/BootloaderVersion.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <cstddef>
+
 namespace Pinetime {
   class BootloaderVersion {
   public:

src/CMakeLists.txt

@@ -507,6 +507,7 @@ list(APPEND SOURCE_FILES
         components/heartrate/Ptagc.cpp
         components/heartrate/HeartRateController.cpp
 
+        buttonhandler/ButtonHandler.cpp
         touchhandler/TouchHandler.cpp
         )
 
@@ -567,6 +568,7 @@ list(APPEND RECOVERY_SOURCE_FILES
         components/heartrate/Ptagc.cpp
         components/motor/MotorController.cpp
         components/fs/FS.cpp
+        buttonhandler/ButtonHandler.cpp
         touchhandler/TouchHandler.cpp
         )
 
@@ -681,6 +683,7 @@ set(INCLUDE_FILES
         components/heartrate/Ptagc.h
         components/heartrate/HeartRateController.h
         components/motor/MotorController.h
+        buttonhandler/ButtonHandler.h
         touchhandler/TouchHandler.h
         )
 

src/Version.h.in

@@ -2,6 +2,8 @@
 
 @VERSION_EDIT_WARNING@
 
+#include <cstdint>
+
 namespace Pinetime {
   class Version {
     public:

src/buttonhandler/ButtonActions.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace Pinetime {
+  namespace Controllers {
+    enum class ButtonActions { None, Click, DoubleClick, LongPress, LongerPress };
+  }
+}

src/buttonhandler/ButtonHandler.cpp

@@ -0,0 +1,78 @@
+#include "ButtonHandler.h"
+
+using namespace Pinetime::Controllers;
+
+void ButtonTimerCallback(TimerHandle_t xTimer) {
+  auto* sysTask = static_cast<Pinetime::System::SystemTask*>(pvTimerGetTimerID(xTimer));
+  sysTask->PushMessage(Pinetime::System::Messages::HandleButtonTimerEvent);
+}
+
+void ButtonHandler::Init(Pinetime::System::SystemTask* systemTask) {
+  buttonTimer = xTimerCreate("buttonTimer", 0, pdFALSE, systemTask, ButtonTimerCallback);
+}
+
+ButtonActions ButtonHandler::HandleEvent(Events event) {
+  static constexpr TickType_t doubleClickTime = pdMS_TO_TICKS(200);
+  static constexpr TickType_t longPressTime = pdMS_TO_TICKS(400);
+  static constexpr TickType_t longerPressTime = pdMS_TO_TICKS(2000);
+
+  if (event == Events::Press) {
+    buttonPressed = true;
+  } else if (event == Events::Release) {
+    releaseTime = xTaskGetTickCount();
+    buttonPressed = false;
+  }
+
+  switch (state) {
+    case States::Idle:
+      if (event == Events::Press) {
+        xTimerChangePeriod(buttonTimer, doubleClickTime, 0);
+        xTimerStart(buttonTimer, 0);
+        state = States::Pressed;
+      }
+      break;
+    case States::Pressed:
+      if (event == Events::Press) {
+        if (xTaskGetTickCount() - releaseTime < doubleClickTime) {
+          xTimerStop(buttonTimer, 0);
+          state = States::Idle;
+          return ButtonActions::DoubleClick;
+        }
+      } else if (event == Events::Release) {
+        xTimerChangePeriod(buttonTimer, doubleClickTime, 0);
+        xTimerStart(buttonTimer, 0);
+      } else if (event == Events::Timer) {
+        if (buttonPressed) {
+          xTimerChangePeriod(buttonTimer, longPressTime - doubleClickTime, 0);
+          xTimerStart(buttonTimer, 0);
+          state = States::Holding;
+        } else {
+          state = States::Idle;
+          return ButtonActions::Click;
+        }
+      }
+      break;
+    case States::Holding:
+      if (event == Events::Release) {
+        xTimerStop(buttonTimer, 0);
+        state = States::Idle;
+        return ButtonActions::Click;
+      } else if (event == Events::Timer) {
+        xTimerChangePeriod(buttonTimer, longerPressTime - longPressTime - doubleClickTime, 0);
+        xTimerStart(buttonTimer, 0);
+        state = States::LongHeld;
+        return ButtonActions::LongPress;
+      }
+      break;
+    case States::LongHeld:
+      if (event == Events::Release) {
+        xTimerStop(buttonTimer, 0);
+        state = States::Idle;
+      } else if (event == Events::Timer) {
+        state = States::Idle;
+        return ButtonActions::LongerPress;
+      }
+      break;
+  }
+  return ButtonActions::None;
+}

src/buttonhandler/ButtonHandler.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "ButtonActions.h"
+#include "systemtask/SystemTask.h"
+#include <FreeRTOS.h>
+#include <timers.h>
+
+namespace Pinetime {
+  namespace Controllers {
+    class ButtonHandler {
+    public:
+      enum class Events : uint8_t { Press, Release, Timer };
+      void Init(Pinetime::System::SystemTask* systemTask);
+      ButtonActions HandleEvent(Events event);
+
+    private:
+      enum class States : uint8_t { Idle, Pressed, Holding, LongHeld };
+      TickType_t releaseTime = 0;
+      TimerHandle_t buttonTimer;
+      bool buttonPressed = false;
+      States state = States::Idle;
+    };
+  }
+}

src/components/alarm/AlarmController.cpp

@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "AlarmController.h"
+#include "components/alarm/AlarmController.h"
 #include "systemtask/SystemTask.h"
 #include "app_timer.h"
 #include "task.h"

src/components/battery/BatteryController.cpp

@@ -1,4 +1,4 @@
-#include "BatteryController.h"
+#include "components/battery/BatteryController.h"
 #include "drivers/PinMap.h"
 #include <hal/nrf_gpio.h>
 #include <nrfx_saadc.h>

src/components/ble/AlertNotificationClient.cpp

@@ -1,6 +1,6 @@
-#include "AlertNotificationClient.h"
+#include "components/ble/AlertNotificationClient.h"
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/AlertNotificationClient.h

@@ -7,7 +7,7 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 namespace Pinetime {
 

src/components/ble/AlertNotificationService.cpp

@@ -1,8 +1,8 @@
-#include "AlertNotificationService.h"
+#include "components/ble/AlertNotificationService.h"
 #include <hal/nrf_rtc.h>
 #include <cstring>
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/BatteryInformationService.cpp

@@ -1,5 +1,5 @@
+#include "components/ble/BatteryInformationService.h"
 #include <nrf_log.h>
-#include "BatteryInformationService.h"
 #include "components/battery/BatteryController.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/BleController.cpp

@@ -1,4 +1,4 @@
-#include "BleController.h"
+#include "components/ble/BleController.h"
 
 using namespace Pinetime::Controllers;
 

src/components/ble/CurrentTimeClient.cpp

@@ -1,4 +1,4 @@
-#include "CurrentTimeClient.h"
+#include "components/ble/CurrentTimeClient.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
 #include "components/datetime/DateTimeController.h"

src/components/ble/CurrentTimeClient.h

@@ -5,7 +5,7 @@
 #undef max
 #undef min
 #include <cstdint>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 namespace Pinetime {
   namespace Controllers {

src/components/ble/CurrentTimeService.cpp

@@ -1,4 +1,4 @@
-#include "CurrentTimeService.h"
+#include "components/ble/CurrentTimeService.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
 

src/components/ble/DeviceInformationService.cpp

@@ -1,4 +1,4 @@
-#include "DeviceInformationService.h"
+#include "components/ble/DeviceInformationService.h"
 
 using namespace Pinetime::Controllers;
 

src/components/ble/DeviceInformationService.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
 #include <host/ble_gap.h>

src/components/ble/DfuService.cpp

@@ -1,4 +1,4 @@
-#include "DfuService.h"
+#include "components/ble/DfuService.h"
 #include <cstring>
 #include "components/ble/BleController.h"
 #include "drivers/SpiNorFlash.h"

src/components/ble/HeartRateService.cpp

@@ -1,4 +1,4 @@
-#include "HeartRateService.h"
+#include "components/ble/HeartRateService.h"
 #include "components/heartrate/HeartRateController.h"
 #include "systemtask/SystemTask.h"
 

src/components/ble/ImmediateAlertService.cpp

@@ -1,6 +1,6 @@
-#include "ImmediateAlertService.h"
+#include "components/ble/ImmediateAlertService.h"
 #include <cstring>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/MotionService.cpp

@@ -1,11 +1,11 @@
-#include "MotionService.h"
+#include "components/ble/MotionService.h"
 #include "components/motion/MotionController.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
 
 namespace {
-  // 0002yyxx-78fc-48fe-8e23-433b3a1942d0
+  // 0003yyxx-78fc-48fe-8e23-433b3a1942d0
   constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
     return ble_uuid128_t{
       .u = {.type = BLE_UUID_TYPE_128},
@@ -13,7 +13,7 @@ namespace {
     };
   }
 
-  // 00020000-78fc-48fe-8e23-433b3a1942d0
+  // 00030000-78fc-48fe-8e23-433b3a1942d0
   constexpr ble_uuid128_t BaseUuid() {
     return CharUuid(0x00, 0x00);
   }

src/components/ble/MusicService.cpp

@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "MusicService.h"
+#include "components/ble/MusicService.h"
 #include "systemtask/SystemTask.h"
 
 namespace {

src/components/ble/NavigationService.cpp

@@ -16,7 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "NavigationService.h"
+#include "components/ble/NavigationService.h"
 
 #include "systemtask/SystemTask.h"
 

src/components/ble/NimbleController.cpp

@@ -1,4 +1,4 @@
-#include "NimbleController.h"
+#include "components/ble/NimbleController.h"
 #include <hal/nrf_rtc.h>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max

src/components/ble/NimbleController.h

@@ -7,19 +7,19 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "AlertNotificationClient.h"
-#include "AlertNotificationService.h"
-#include "BatteryInformationService.h"
-#include "CurrentTimeClient.h"
-#include "CurrentTimeService.h"
-#include "DeviceInformationService.h"
-#include "DfuService.h"
-#include "ImmediateAlertService.h"
-#include "MusicService.h"
-#include "NavigationService.h"
-#include "ServiceDiscovery.h"
-#include "HeartRateService.h"
-#include "MotionService.h"
+#include "components/ble/AlertNotificationClient.h"
+#include "components/ble/AlertNotificationService.h"
+#include "components/ble/BatteryInformationService.h"
+#include "components/ble/CurrentTimeClient.h"
+#include "components/ble/CurrentTimeService.h"
+#include "components/ble/DeviceInformationService.h"
+#include "components/ble/DfuService.h"
+#include "components/ble/ImmediateAlertService.h"
+#include "components/ble/MusicService.h"
+#include "components/ble/NavigationService.h"
+#include "components/ble/ServiceDiscovery.h"
+#include "components/ble/HeartRateService.h"
+#include "components/ble/MotionService.h"
 
 namespace Pinetime {
   namespace Drivers {

src/components/ble/NotificationManager.cpp

@@ -1,4 +1,4 @@
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include <cstring>
 #include <algorithm>
 

src/components/ble/ServiceDiscovery.cpp

@@ -1,6 +1,6 @@
-#include "ServiceDiscovery.h"
+#include "components/ble/ServiceDiscovery.h"
 #include <libraries/log/nrf_log.h>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 using namespace Pinetime::Controllers;
 

src/components/brightness/BrightnessController.cpp

@@ -1,4 +1,4 @@
-#include "BrightnessController.h"
+#include "components/brightness/BrightnessController.h"
 #include <hal/nrf_gpio.h>
 #include "displayapp/screens/Symbols.h"
 #include "drivers/PinMap.h"

src/components/datetime/DateTimeController.cpp

@@ -1,4 +1,4 @@
-#include "DateTimeController.h"
+#include "components/datetime/DateTimeController.h"
 #include <date/date.h>
 #include <libraries/log/nrf_log.h>
 #include <systemtask/SystemTask.h>

src/components/firmwarevalidator/FirmwareValidator.cpp

@@ -1,4 +1,4 @@
-#include "FirmwareValidator.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
 
 #include <hal/nrf_rtc.h>
 #include "drivers/InternalFlash.h"

src/components/fs/FS.cpp

@@ -1,4 +1,4 @@
-#include "FS.h"
+#include "components/fs/FS.h"
 #include <cstring>
 #include <littlefs/lfs.h>
 #include <lvgl/lvgl.h>

src/components/gfx/Gfx.cpp

@@ -1,4 +1,4 @@
-#include "Gfx.h"
+#include "components/gfx/Gfx.h"
 #include "drivers/St7789.h"
 using namespace Pinetime::Components;
 

src/components/heartrate/Biquad.cpp

@@ -4,7 +4,7 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
-#include "Biquad.h"
+#include "components/heartrate/Biquad.h"
 
 using namespace Pinetime::Controllers;
 

src/components/heartrate/HeartRateController.cpp

@@ -1,4 +1,4 @@
-#include "HeartRateController.h"
+#include "components/heartrate/HeartRateController.h"
 #include <heartratetask/HeartRateTask.h>
 #include <systemtask/SystemTask.h>
 

src/components/heartrate/Ppg.cpp

@@ -4,9 +4,9 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
+#include "components/heartrate/Ppg.h"
 #include <vector>
 #include <nrf_log.h>
-#include "Ppg.h"
 using namespace Pinetime::Controllers;
 
 /** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */

src/components/heartrate/Ppg.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <array>
-#include "Biquad.h"
-#include "Ptagc.h"
+#include "components/heartrate/Biquad.h"
+#include "components/heartrate/Ptagc.h"
 
 namespace Pinetime {
   namespace Controllers {

src/components/heartrate/Ptagc.cpp

@@ -4,8 +4,8 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
+#include "components/heartrate/Ptagc.h"
 #include <cmath>
-#include "Ptagc.h"
 
 using namespace Pinetime::Controllers;
 

src/components/motion/MotionController.cpp

@@ -1,4 +1,4 @@
-#include "MotionController.h"
+#include "components/motion/MotionController.h"
 
 using namespace Pinetime::Controllers;
 

src/components/motor/MotorController.cpp

@@ -1,4 +1,4 @@
-#include "MotorController.h"
+#include "components/motor/MotorController.h"
 #include <hal/nrf_gpio.h>
 #include "systemtask/SystemTask.h"
 #include "app_timer.h"

src/components/rle/RleDecoder.cpp

@@ -1,4 +1,4 @@
-#include "RleDecoder.h"
+#include "components/rle/RleDecoder.h"
 
 using namespace Pinetime::Tools;
 

src/components/settings/Settings.cpp

@@ -1,4 +1,4 @@
-#include "Settings.h"
+#include "components/settings/Settings.h"
 #include <cstdlib>
 #include <cstring>
 

src/components/timer/TimerController.cpp

@@ -2,7 +2,7 @@
 // Created by florian on 16.05.21.
 //
 
-#include "TimerController.h"
+#include "components/timer/TimerController.h"
 #include "systemtask/SystemTask.h"
 #include "app_timer.h"
 #include "task.h"

src/displayapp/Colors.cpp

@@ -1,4 +1,4 @@
-#include "Colors.h"
+#include "displayapp/Colors.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Controllers;

src/displayapp/Colors.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <lvgl/src/lv_misc/lv_color.h>
-#include <components/settings/Settings.h>
+#include "components/settings/Settings.h"
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/DisplayApp.cpp

@@ -1,9 +1,9 @@
-#include "DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 #include <libraries/log/nrf_log.h>
-#include <displayapp/screens/HeartRate.h>
-#include <displayapp/screens/Motion.h>
-#include <displayapp/screens/Timer.h>
-#include <displayapp/screens/Alarm.h>
+#include "displayapp/screens/HeartRate.h"
+#include "displayapp/screens/Motion.h"
+#include "displayapp/screens/Timer.h"
+#include "displayapp/screens/Alarm.h"
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
 #include "components/datetime/DateTimeController.h"
@@ -260,6 +260,26 @@ void DisplayApp::Refresh() {
           }
         }
         break;
+      case Messages::ButtonLongPressed:
+        if (currentApp != Apps::Clock) {
+          if (currentApp == Apps::Notifications) {
+            LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::Up);
+          } else if (currentApp == Apps::QuickSettings) {
+            LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::LeftAnim);
+          } else {
+            LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::Down);
+          }
+        }
+        break;
+      case Messages::ButtonLongerPressed:
+        // Create reboot app and open it instead
+        LoadApp(Apps::SysInfo, DisplayApp::FullRefreshDirections::Up);
+        break;
+      case Messages::ButtonDoubleClicked:
+        if (currentApp != Apps::Notifications && currentApp != Apps::NotificationsPreview) {
+          LoadApp(Apps::Notifications, DisplayApp::FullRefreshDirections::Down);
+        }
+        break;
 
       case Messages::BleFirmwareUpdateStarted:
         LoadApp(Apps::FirmwareUpdate, DisplayApp::FullRefreshDirections::Down);

src/displayapp/DisplayApp.h

@@ -5,9 +5,9 @@
 #include <task.h>
 #include <memory>
 #include <systemtask/Messages.h>
-#include "Apps.h"
-#include "LittleVgl.h"
-#include "TouchEvents.h"
+#include "displayapp/Apps.h"
+#include "displayapp/LittleVgl.h"
+#include "displayapp/TouchEvents.h"
 #include "components/brightness/BrightnessController.h"
 #include "components/motor/MotorController.h"
 #include "components/firmwarevalidator/FirmwareValidator.h"
@@ -17,7 +17,7 @@
 #include "components/alarm/AlarmController.h"
 #include "touchhandler/TouchHandler.h"
 
-#include "Messages.h"
+#include "displayapp/Messages.h"
 #include "BootErrors.h"
 
 namespace Pinetime {

src/displayapp/DisplayAppRecovery.cpp

@@ -1,9 +1,9 @@
-#include "DisplayAppRecovery.h"
+#include "displayapp/DisplayAppRecovery.h"
 #include <FreeRTOS.h>
 #include <task.h>
 #include <libraries/log/nrf_log.h>
-#include <components/rle/RleDecoder.h>
-#include <touchhandler/TouchHandler.h>
+#include "components/rle/RleDecoder.h"
+#include "touchhandler/TouchHandler.h"
 #include "displayapp/icons/infinitime/infinitime-nb.c"
 #include "components/ble/BleController.h"
 

src/displayapp/DisplayAppRecovery.h

@@ -10,11 +10,11 @@
 #include <date/date.h>
 #include <drivers/Watchdog.h>
 #include <components/motor/MotorController.h>
-#include <BootErrors.h>
-#include "TouchEvents.h"
-#include "Apps.h"
-#include "Messages.h"
-#include "DummyLittleVgl.h"
+#include "BootErrors.h"
+#include "displayapp/TouchEvents.h"
+#include "displayapp/Apps.h"
+#include "displayapp/Messages.h"
+#include "displayapp/DummyLittleVgl.h"
 
 namespace Pinetime {
   namespace Drivers {

src/displayapp/DummyLittleVgl.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_themes/lv_theme.h>
-#include <libs/lvgl/src/lv_hal/lv_hal.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_themes/lv_theme.h>
+#include <lvgl/src/lv_hal/lv_hal.h>
 #include <drivers/St7789.h>
 #include <drivers/Cst816s.h>
 

src/displayapp/LittleVgl.cpp

@@ -1,5 +1,5 @@
-#include "LittleVgl.h"
-#include "lv_pinetime_theme.h"
+#include "displayapp/LittleVgl.h"
+#include "displayapp/lv_pinetime_theme.h"
 
 #include <FreeRTOS.h>
 #include <task.h>

src/displayapp/Messages.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 namespace Pinetime {
   namespace Applications {
     namespace Display {
@@ -9,6 +10,9 @@ namespace Pinetime {
         UpdateBleConnection,
         TouchEvent,
         ButtonPushed,
+        ButtonLongPressed,
+        ButtonLongerPressed,
+        ButtonDoubleClicked,
         NewNotification,
         TimerDone,
         BleFirmwareUpdateStarted,

src/displayapp/lv_pinetime_theme.c

@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_pinetime_theme.h"
+#include "displayapp/lv_pinetime_theme.h"
 
 /*********************
  *      DEFINES

src/displayapp/screens/Alarm.cpp

@@ -15,9 +15,9 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "Alarm.h"
-#include "Screen.h"
-#include "Symbols.h"
+#include "displayapp/screens/Alarm.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
 using Pinetime::Controllers::AlarmController;

src/displayapp/screens/Alarm.h

@@ -17,9 +17,9 @@
 */
 #pragma once
 
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include "systemtask/SystemTask.h"
-#include "../LittleVgl.h"
+#include "displayapp/LittleVgl.h"
 #include "components/alarm/AlarmController.h"
 
 namespace Pinetime {
@@ -40,7 +40,9 @@ namespace Pinetime {
         Controllers::AlarmController& alarmController;
 
         lv_obj_t *time, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp, *txtMinDown,
-          *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnMessage, *txtMessage, *btnInfo, *txtInfo;
+          *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo;
+        lv_obj_t* txtMessage = nullptr;
+        lv_obj_t* btnMessage = nullptr;
 
         enum class EnableButtonState { On, Off, Alerting };
         void SetEnableButtonState();

src/displayapp/screens/ApplicationList.cpp

@@ -1,10 +1,10 @@
-#include "ApplicationList.h"
+#include "displayapp/screens/ApplicationList.h"
 #include <lvgl/lvgl.h>
 #include <array>
-#include "Symbols.h"
-#include "Tile.h"
+#include "displayapp/screens/Symbols.h"
+#include "displayapp/screens/Tile.h"
 #include "displayapp/Apps.h"
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/ApplicationList.h

@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include "Screen.h"
-#include "ScreenList.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/ScreenList.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/settings/Settings.h"
 #include "components/battery/BatteryController.h"

src/displayapp/screens/BatteryIcon.cpp

@@ -1,6 +1,6 @@
+#include "displayapp/screens/BatteryIcon.h"
 #include <cstdint>
-#include "BatteryIcon.h"
-#include "Symbols.h"
+#include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/BatteryIcon.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/BatteryInfo.cpp

@@ -1,5 +1,5 @@
-#include "BatteryInfo.h"
-#include "../DisplayApp.h"
+#include "displayapp/screens/BatteryInfo.h"
+#include "displayapp/DisplayApp.h"
 #include "components/battery/BatteryController.h"
 
 using namespace Pinetime::Applications::Screens;

src/displayapp/screens/BatteryInfo.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <FreeRTOS.h>
-#include <timers.h>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <lvgl/lvgl.h>
 
 namespace Pinetime {

src/displayapp/screens/BleIcon.cpp

@@ -1,5 +1,5 @@
-#include "BleIcon.h"
-#include "Symbols.h"
+#include "displayapp/screens/BleIcon.h"
+#include "displayapp/screens/Symbols.h"
 using namespace Pinetime::Applications::Screens;
 
 const char* BleIcon::GetIcon(bool isConnected) {

src/displayapp/screens/Brightness.cpp

@@ -1,4 +1,4 @@
-#include "Brightness.h"
+#include "displayapp/screens/Brightness.h"
 #include <lvgl/lvgl.h>
 
 using namespace Pinetime::Applications::Screens;

src/displayapp/screens/Brightness.h

@@ -2,7 +2,7 @@
 
 #include <lvgl/src/lv_core/lv_obj.h>
 #include <cstdint>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include "components/brightness/BrightnessController.h"
 
 namespace Pinetime {

src/displayapp/screens/Clock.cpp

@@ -1,4 +1,4 @@
-#include "Clock.h"
+#include "displayapp/screens/Clock.h"
 
 #include <date/date.h>
 #include <lvgl/lvgl.h>
@@ -6,10 +6,10 @@
 #include "components/motion/MotionController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
-#include "../DisplayApp.h"
-#include "WatchFaceDigital.h"
-#include "WatchFaceAnalog.h"
-#include "PineTimeStyle.h"
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/WatchFaceDigital.h"
+#include "displayapp/screens/WatchFaceAnalog.h"
+#include "displayapp/screens/PineTimeStyle.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/Clock.h

@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <memory>
 #include <components/heartrate/HeartRateController.h>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include "components/datetime/DateTimeController.h"
 
 namespace Pinetime {

src/displayapp/screens/DropDownDemo.cpp

@@ -1,7 +1,7 @@
-#include "DropDownDemo.h"
+#include "displayapp/screens/DropDownDemo.h"
 #include <lvgl/lvgl.h>
 #include <libraries/log/nrf_log.h>
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/DropDownDemo.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {

src/displayapp/screens/Error.cpp

@@ -1,4 +1,4 @@
-#include "Error.h"
+#include "displayapp/screens/Error.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/Error.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include "BootErrors.h"
 #include <lvgl/lvgl.h>
 

src/displayapp/screens/FirmwareUpdate.cpp

@@ -1,7 +1,7 @@
-#include "FirmwareUpdate.h"
+#include "displayapp/screens/FirmwareUpdate.h"
 #include <lvgl/lvgl.h>
 #include "components/ble/BleController.h"
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/FirmwareUpdate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <lvgl/src/lv_core/lv_obj.h>
 #include "FreeRTOS.h"
 

src/displayapp/screens/FirmwareValidation.cpp

@@ -1,8 +1,8 @@
-#include "FirmwareValidation.h"
+#include "displayapp/screens/FirmwareValidation.h"
 #include <lvgl/lvgl.h>
 #include "Version.h"
 #include "components/firmwarevalidator/FirmwareValidator.h"
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/FirmwareValidation.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {

src/displayapp/screens/FlashLight.cpp

@@ -1,6 +1,6 @@
-#include "FlashLight.h"
-#include "../DisplayApp.h"
-#include "Symbols.h"
+#include "displayapp/screens/FlashLight.h"
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/FlashLight.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include "components/brightness/BrightnessController.h"
 #include "systemtask/SystemTask.h"
 #include <cstdint>

src/displayapp/screens/HeartRate.cpp

@@ -1,8 +1,8 @@
-#include <libs/lvgl/lvgl.h>
-#include "HeartRate.h"
+#include "displayapp/screens/HeartRate.h"
+#include <lvgl/lvgl.h>
 #include <components/heartrate/HeartRateController.h>
 
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/HeartRate.h

@@ -2,11 +2,11 @@
 
 #include <cstdint>
 #include <chrono>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <bits/unique_ptr.h>
 #include "systemtask/SystemTask.h"
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
   namespace Controllers {

src/displayapp/screens/InfiniPaint.cpp

@@ -1,6 +1,6 @@
-#include "InfiniPaint.h"
-#include "../DisplayApp.h"
-#include "../LittleVgl.h"
+#include "displayapp/screens/InfiniPaint.h"
+#include "displayapp/DisplayApp.h"
+#include "displayapp/LittleVgl.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/InfiniPaint.h

@@ -2,7 +2,8 @@
 
 #include <lvgl/lvgl.h>
 #include <cstdint>
-#include "Screen.h"
+#include <algorithm> // std::fill
+#include "displayapp/screens/Screen.h"
 
 namespace Pinetime {
   namespace Components {

src/displayapp/screens/Label.cpp

@@ -1,4 +1,4 @@
-#include "Label.h"
+#include "displayapp/screens/Label.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/Label.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <lvgl/lvgl.h>
 
 namespace Pinetime {

src/displayapp/screens/List.cpp

@@ -1,6 +1,6 @@
-#include "List.h"
-#include "../DisplayApp.h"
-#include "Symbols.h"
+#include "displayapp/screens/List.h"
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/List.h

@@ -3,8 +3,8 @@
 #include <lvgl/lvgl.h>
 #include <cstdint>
 #include <memory>
-#include "Screen.h"
-#include "../Apps.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/Apps.h"
 #include "components/settings/Settings.h"
 
 #define MAXLISTITEMS 4

src/displayapp/screens/Meter.cpp

@@ -1,6 +1,6 @@
-#include "Meter.h"
+#include "displayapp/screens/Meter.h"
 #include <lvgl/lvgl.h>
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/Meter.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <lvgl/src/lv_core/lv_style.h>
 #include <lvgl/src/lv_core/lv_obj.h>
 

src/displayapp/screens/Metronome.cpp

@@ -1,5 +1,5 @@
-#include "Metronome.h"
-#include "Symbols.h"
+#include "displayapp/screens/Metronome.h"
+#include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/Motion.cpp

@@ -1,6 +1,6 @@
-#include <libs/lvgl/lvgl.h>
-#include "Motion.h"
-#include "../DisplayApp.h"
+#include "displayapp/screens/Motion.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/Motion.h

@@ -2,10 +2,10 @@
 
 #include <cstdint>
 #include <chrono>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 #include <components/motion/MotionController.h>
 
 namespace Pinetime {

src/displayapp/screens/Music.cpp

@@ -15,10 +15,10 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "Music.h"
-#include "Symbols.h"
+#include "displayapp/screens/Music.h"
+#include "displayapp/screens/Symbols.h"
 #include <cstdint>
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 #include "components/ble/MusicService.h"
 #include "displayapp/icons/music/disc.cpp"
 #include "displayapp/icons/music/disc_f_1.cpp"

src/displayapp/screens/Music.h

@@ -20,7 +20,7 @@
 #include <FreeRTOS.h>
 #include <lvgl/src/lv_core/lv_obj.h>
 #include <string>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 
 namespace Pinetime {
   namespace Controllers {

src/displayapp/screens/Navigation.cpp

@@ -15,9 +15,9 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "Navigation.h"
+#include "displayapp/screens/Navigation.h"
 #include <cstdint>
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 #include "components/ble/NavigationService.h"
 
 using namespace Pinetime::Applications::Screens;

src/displayapp/screens/Navigation.h

@@ -20,7 +20,7 @@
 #include <FreeRTOS.h>
 #include <lvgl/src/lv_core/lv_obj.h>
 #include <string>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include <array>
 
 namespace Pinetime {

src/displayapp/screens/NotificationIcon.cpp

@@ -1,5 +1,5 @@
-#include "NotificationIcon.h"
-#include "Symbols.h"
+#include "displayapp/screens/NotificationIcon.h"
+#include "displayapp/screens/Symbols.h"
 using namespace Pinetime::Applications::Screens;
 
 const char* NotificationIcon::GetIcon(bool newNotificationAvailable) {

src/displayapp/screens/Notifications.cpp

@@ -1,8 +1,8 @@
-#include "Notifications.h"
-#include <displayapp/DisplayApp.h>
+#include "displayapp/screens/Notifications.h"
+#include "displayapp/DisplayApp.h"
 #include "components/ble/MusicService.h"
 #include "components/ble/AlertNotificationService.h"
-#include "Symbols.h"
+#include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
 extern lv_font_t jetbrains_mono_extrabold_compressed;

src/displayapp/screens/Notifications.h

@@ -3,7 +3,7 @@
 #include <lvgl/lvgl.h>
 #include <cstdint>
 #include <memory>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include "components/ble/NotificationManager.h"
 #include "components/motor/MotorController.h"
 

src/displayapp/screens/Paddle.cpp

@@ -1,6 +1,6 @@
-#include "Paddle.h"
-#include "../DisplayApp.h"
-#include "../LittleVgl.h"
+#include "displayapp/screens/Paddle.h"
+#include "displayapp/DisplayApp.h"
+#include "displayapp/LittleVgl.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/Paddle.h

@@ -2,7 +2,7 @@
 
 #include <lvgl/lvgl.h>
 #include <cstdint>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 
 namespace Pinetime {
   namespace Components {

src/displayapp/screens/PineTimeStyle.cpp

@@ -19,21 +19,21 @@
  * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
  */
 
-#include "PineTimeStyle.h"
+#include "displayapp/screens/PineTimeStyle.h"
 #include <date/date.h>
 #include <lvgl/lvgl.h>
 #include <cstdio>
 #include <displayapp/Colors.h>
-#include "BatteryIcon.h"
-#include "BleIcon.h"
-#include "NotificationIcon.h"
-#include "Symbols.h"
+#include "displayapp/screens/BatteryIcon.h"
+#include "displayapp/screens/BleIcon.h"
+#include "displayapp/screens/NotificationIcon.h"
+#include "displayapp/screens/Symbols.h"
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
 #include "components/motion/MotionController.h"
 #include "components/settings/Settings.h"
-#include "../DisplayApp.h"
+#include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 

src/displayapp/screens/PineTimeStyle.h

@@ -4,8 +4,8 @@
 #include <chrono>
 #include <cstdint>
 #include <memory>
-#include "Screen.h"
-#include "ScreenList.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/ScreenList.h"
 #include "components/datetime/DateTimeController.h"
 
 namespace Pinetime {