summaryrefslogtreecommitdiff
path: root/src/systemtask
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2020-10-08 20:56:19 +0200
committerGitHub <noreply@github.com>2020-10-08 20:56:19 +0200
commit9d43eff43a5984dfb368445d3428560dae9269da (patch)
tree2101336e75db14023daba541c156841a7e46b640 /src/systemtask
parente4f0a95af8ce6cfb71602c5f5e437ab68dd582ec (diff)
parentaba3d65e3aaed2dc728d64e7e73983d35da3903b (diff)
Merge pull request #81 from Avamander/patch-4
Fixed a typo in SystemTask
Diffstat (limited to 'src/systemtask')
-rw-r--r--src/systemtask/SystemTask.cpp8
-rw-r--r--src/systemtask/SystemTask.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 68f8ab53..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;
@@ -36,7 +36,7 @@ SystemTask::SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd,
bleController{bleController}, dateTimeController{dateTimeController},
watchdog{}, watchdogView{watchdog}, notificationManager{notificationManager},
nimbleController(*this, bleController,dateTimeController, notificationManager, batteryController, spiNorFlash) {
- systemTaksMsgQueue = xQueueCreate(10, 1);
+ systemTasksMsgQueue = xQueueCreate(10, 1);
}
void SystemTask::Start() {
@@ -102,7 +102,7 @@ void SystemTask::Work() {
while(true) {
uint8_t msg;
- if (xQueueReceive(systemTaksMsgQueue, &msg, isSleeping?2500 : 1000)) {
+ if (xQueueReceive(systemTasksMsgQueue, &msg, isSleeping ? 2500 : 1000)) {
Messages message = static_cast<Messages >(msg);
switch(message) {
case Messages::GoToRunning:
@@ -228,7 +228,7 @@ void SystemTask::PushMessage(SystemTask::Messages msg) {
}
BaseType_t xHigherPriorityTaskWoken;
xHigherPriorityTaskWoken = pdFALSE;
- xQueueSendFromISR(systemTaksMsgQueue, &msg, &xHigherPriorityTaskWoken);
+ xQueueSendFromISR(systemTasksMsgQueue, &msg, &xHigherPriorityTaskWoken);
if (xHigherPriorityTaskWoken) {
/* Actual macro used here is port specific. */
// TODO : should I do something here?
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 1be28e3f..6ef0cfbf 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -54,7 +54,7 @@ namespace Pinetime {
std::unique_ptr<Pinetime::Applications::DisplayApp> displayApp;
Pinetime::Controllers::Ble& bleController;
Pinetime::Controllers::DateTime& dateTimeController;
- QueueHandle_t systemTaksMsgQueue;
+ QueueHandle_t systemTasksMsgQueue;
std::atomic<bool> isSleeping{false};
std::atomic<bool> isGoingToSleep{false};
std::atomic<bool> isWakingUp{false};