Merge branch 'develop' into disable_notif_only
This commit is contained in:
commit
93d240a23b
8 changed files with 121 additions and 69 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue