CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/systemtask/SystemTask.cpp
This commit is contained in:
Avamander
2020-10-04 16:23:13 +03:00
parent 77f4d5448b 1d96758acd
commit aba3d65e3a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/systemtask/SystemTask.cpp
View File

@@ -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: