Jean-François Milants ef44b763d9 Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode ...

Apply a few changes that were requested in the PR during the review.

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/Messages.h
#	src/displayapp/screens/settings/Settings.cpp

2022-02-20 15:40:49 +01:00

..

Messages.h

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

2022-02-20 15:40:49 +01:00

SystemMonitor.h

Changed access modified indentation

2021-04-24 12:00:45 +03:00

SystemTask.cpp

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

2022-02-20 15:40:49 +01:00

SystemTask.h

SystemTask: forward declare BatteryController to fix of cyclic dependency

2022-02-19 13:17:00 +01:00