CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/Messages.h
#	src/displayapp/screens/settings/Settings.cpp
This commit is contained in:
Jean-François Milants
2022-02-20 15:25:24 +01:00
parent 69e4ab6be1 319030d9e1
commit 40cdb54772
22 changed files with 295 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/systemtask/SystemTask.cpp
View File

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