Merge upstream

2021-09-16 16:01:25 -04:00
parent f857a757a7
commit 1d43adcdfa
33 changed files with 300 additions and 232 deletions
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -22,7 +22,9 @@ namespace Pinetime {
        OnNewDay,
        OnChargingEvent,
        SetOffAlarm,
-        StopRinging
+        StopRinging,
+        MeasureBatteryTimerExpired,
+        BatteryMeasurementDone,
      };
    }
 }