haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 6e03b47eb3 into 8598142c27

Browse source
This commit is contained in:
JF 2024-10-21 12:20:53 -05:00 committed by GitHub
parent 8598142c27 6e03b47eb3
commit 27de7d8d19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/systemtask/SystemTask.cpp
View file

@ -186,7 +186,7 @@ void SystemTask::Work() {
UpdateMotion(); UpdateMotion();
Messages msg; Messages msg;
if (xQueueReceive(systemTasksMsgQueue, &msg, 100) == pdTRUE) { if (xQueueReceive(systemTasksMsgQueue, &msg, GetQueueTimeout()) == pdTRUE) {
switch (msg) { switch (msg) {
case Messages::EnableSleeping: case Messages::EnableSleeping:
wakeLocksHeld--; wakeLocksHeld--;
@ -499,3 +499,15 @@ void SystemTask::PushMessage(System::Messages msg) {
xQueueSend(systemTasksMsgQueue, &msg, portMAX_DELAY); xQueueSend(systemTasksMsgQueue, &msg, portMAX_DELAY);
} }
} }
TickType_t SystemTask::GetQueueTimeout() const {
// By default, the timeout on the queue is 100ms.
// It's extended to 4s in sleep mode, when no motion based wake up option is enabled.
TickType_t timeout = pdMS_TO_TICKS(100);
if (state == SystemTaskState::Sleeping && ((!settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) &&
!settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake)) ||
settingsController.GetNotificationStatus() == Controllers::Settings::Notification::Sleep)) {
timeout = pdMS_TO_TICKS(4000);
}
return timeout;
}

2
src/systemtask/SystemTask.h
View file

@ -136,6 +136,8 @@ namespace Pinetime {
bool stepCounterMustBeReset = false; bool stepCounterMustBeReset = false;
static constexpr TickType_t batteryMeasurementPeriod = pdMS_TO_TICKS(10 * 60 * 1000); static constexpr TickType_t batteryMeasurementPeriod = pdMS_TO_TICKS(10 * 60 * 1000);
TickType_t GetQueueTimeout() const;
SystemMonitor monitor; SystemMonitor monitor;
}; };
} }