Merge pull request #81 from Avamander/patch-4
Fixed a typo in SystemTask
This commit is contained in:
commit
9d43eff43a
|
@ -9,7 +9,7 @@ namespace Pinetime {
|
|||
namespace Screens {
|
||||
class Screen {
|
||||
public:
|
||||
Screen(DisplayApp* app) : app{app} {}
|
||||
explicit Screen(DisplayApp* app) : app{app} {}
|
||||
virtual ~Screen() = default;
|
||||
|
||||
// Return false if the app can be closed, true if it must continue to run
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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?
|
||||
|
|
|
@ -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};
|
||||
|
|
Loading…
Reference in New Issue
Block a user