diff options
| author | Avamander <avamander@gmail.com> | 2020-10-04 16:23:13 +0300 |
|---|---|---|
| committer | Avamander <avamander@gmail.com> | 2020-10-04 16:23:13 +0300 |
| commit | aba3d65e3aaed2dc728d64e7e73983d35da3903b (patch) | |
| tree | 2101336e75db14023daba541c156841a7e46b640 /src/systemtask/SystemTask.cpp | |
| parent | 77f4d5448bb05287a3802ce3511817fc27a825ab (diff) | |
| parent | 1d96758acd4e3bf03c3e733a3a95d0deb74f6042 (diff) | |
Merge remote-tracking branch 'origin-origin/patch-3'
# Conflicts:
# src/systemtask/SystemTask.cpp
Diffstat (limited to 'src/systemtask/SystemTask.cpp')
| -rw-r--r-- | src/systemtask/SystemTask.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index bb3a7728..c0552d53 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -11,7 +11,7 @@ #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 @@ void SystemTask::Work() { 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: |