InfiniTime.git

commit aba3d65e3aaed2dc728d64e7e73983d35da3903b

Author: Avamander <avamander@gmail.com>

Merge remote-tracking branch 'origin-origin/patch-3'

# Conflicts:
#	src/systemtask/SystemTask.cpp

 src/displayapp/screens/Tab.cpp | 4 ++--
 src/systemtask/SystemTask.cpp | 4 ++--


diff --git a/src/displayapp/screens/Tab.cpp b/src/displayapp/screens/Tab.cpp
index adc32578a76f112230e420e37a6bc89e7d8635e8..44b806c0a6fd9acd460078d8f2e62966e096f73d 100644
--- a/src/displayapp/screens/Tab.cpp
+++ b/src/displayapp/screens/Tab.cpp
@@ -1,13 +1,13 @@
 #include <cstdio>
 #include <libs/date/includes/date/date.h>
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 #include <Version.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
 #include <libs/lvgl/src/lv_font/lv_font.h>
 #include <libs/lvgl/lvgl.h>
 #include <libraries/log/nrf_log.h>
 #include "Tab.h"
-#include <DisplayApp/DisplayApp.h>
+#include "displayapp/DisplayApp.h"
 
 
 using namespace Pinetime::Applications::Screens;




diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index bb3a7728cd13d2576259950e8c730a08f5899fd3..c0552d53d81203beb39a0d42ad719623a164d8ef 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -11,7 +11,7 @@ #include 
 #include <host/ble_gap.h>
 #include <host/util/util.h>
 #include <drivers/InternalFlash.h>
-#include "../main.h"
+#include "main.h"
 #include "components/ble/NimbleController.h"
 
 using namespace Pinetime::System;
@@ -102,7 +102,7 @@   xTimerStart(idleTimer, 0);
 
   while(true) {
     uint8_t msg;
-    if (xQueueReceive(systemTasksMsgQueue, &msg, isSleeping?2500 : 1000)) {
+    if (xQueueReceive(systemTasksMsgQueue, &msg, isSleeping ? 2500 : 1000)) {
       Messages message = static_cast<Messages >(msg);
       switch(message) {
         case Messages::GoToRunning: