diff options
author | Jean-François Milants <jf@codingfield.com> | 2022-02-20 15:25:24 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2022-02-20 15:25:24 +0100 |
commit | 40cdb547727d99ff140a029ae30980001e4a68f6 (patch) | |
tree | 6cb5444d40f1d22c1ae14b7eca30cec59c0fa467 /src/systemtask/SystemTask.cpp | |
parent | 69e4ab6be101e7993035b56db75f5c32eda713ac (diff) | |
parent | 319030d9e16e833cf8bff569a9ecfa452165ea27 (diff) |
Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/Messages.h
# src/displayapp/screens/settings/Settings.cpp
Diffstat (limited to 'src/systemtask/SystemTask.cpp')
-rw-r--r-- | src/systemtask/SystemTask.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 8d9cb1d1..75a71ecc 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -254,7 +254,7 @@ void SystemTask::Work() { displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToRunning); heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::WakeUp); - if (!bleController.IsConnected()) { + if (bleController.GetConnectState() == Controllers::Ble::ConnectStates::Disconnected) { nimbleController.RestartFastAdv(); } @@ -440,7 +440,9 @@ void SystemTask::Work() { motorController.RunForDuration(35); displayApp.PushMessage(Pinetime::Applications::Display::Messages::ShowPairingKey); break; - + case Messages::AirplaneModeToggle: + nimbleController.SwitchAirplaneMode(settingsController.GetAirplaneMode()); + break; default: break; } |