Merge branch 'develop' into disable_notif_only

2021-09-14 23:38:42 +03:00
parent 40765f1173 3eb73774a3
commit 93d240a23b
8 changed files with 121 additions and 69 deletions
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -128,7 +128,6 @@ void SystemTask::Work() {
  fs.Init();

  nimbleController.Init();
-  nimbleController.StartAdvertising();
  lcd.Init();

  twiMaster.Init();
@@ -229,7 +228,6 @@ void SystemTask::Work() {
            touchPanel.Wakeup();
          }

-          nimbleController.StartAdvertising();
          xTimerStart(dimTimer, 0);
          spiNorFlash.Wakeup();
          lcd.Wakeup();
@@ -237,6 +235,9 @@ void SystemTask::Work() {
          displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToRunning);
          heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::WakeUp);

+          if (!bleController.IsConnected())
+            nimbleController.RestartFastAdv();
+
          isSleeping = false;
          isWakingUp = false;
          isDimmed = false;