scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into evergreen22-refactor_adv

Browse source 
# Conflicts:
#	src/components/ble/NimbleController.cpp
This commit is contained in:
Jean-François Milants 2021-09-13 20:22:27 +02:00
commit 9afa412a2a
4 changed files with 97 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/systemtask/SystemTask.cpp
View file

@ -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;