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

Merge branch 'develop' into timer_battery_reading

Browse Source
This commit is contained in:
Riku Isokoski
2021-08-14 23:02:23 +03:00
parent 23bde0d18e df8d396472
commit 044036e884
13 changed files with 227 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/systemtask/SystemTask.cpp
View File

@@ -266,14 +266,13 @@ void SystemTask::Work() {
if (isSleeping && !isWakingUp) {
GoToRunning();
}
motorController.SetDuration(35);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
break;
case Messages::OnTimerDone:
if (isSleeping && !isWakingUp) {
GoToRunning();
}
motorController.SetDuration(35);
motorController.RunForDuration(35);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
break;
case Messages::BleConnected:
@@ -327,7 +326,7 @@ void SystemTask::Work() {
break;
case Messages::OnChargingEvent:
batteryController.Update();
motorController.SetDuration(15);
motorController.RunForDuration(15);
break;
case Messages::MeasureBatteryTimerExpired:
sendBatteryNotification = true;