Merge branch 'develop' into new_touch_handler

This commit is contained in:
Riku Isokoski
2021-08-18 22:07:02 +03:00
40 changed files with 835 additions and 399 deletions

View File

@@ -269,14 +269,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:
@@ -332,7 +331,7 @@ void SystemTask::Work() {
stepCounterMustBeReset = true;
break;
case Messages::OnChargingEvent:
motorController.SetDuration(15);
motorController.RunForDuration(15);
// Battery level is updated on every message - there's no need to do anything
break;