diff options
| author | Jean-François Milants <jf@codingfield.com> | 2023-12-23 21:24:33 +0100 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2023-12-23 21:29:13 +0100 |
| commit | fc5424cb72e477c5f1bbfaeddb5c50b851a965ae (patch) | |
| tree | e8eb7fc4cf513c17c4583c9feb89b46515a27338 /src | |
| parent | 2ee2b8523affe827d2ec1921f8a1793a473f6444 (diff) | |
User applications selection using CMake
Fix include path since last rebase.
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/settings/Settings.h | 2 | ||||
| -rw-r--r-- | src/displayapp/apps/Apps.h.in | 17 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceCasioStyleG7710.h | 2 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceDigital.h | 2 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceInfineat.h | 2 |
5 files changed, 4 insertions, 21 deletions
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index c9a0b799..89c2ba97 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -3,7 +3,7 @@ #include <bitset> #include "components/brightness/BrightnessController.h" #include "components/fs/FS.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in index 23ad12a3..b4f11720 100644 --- a/src/displayapp/apps/Apps.h.in +++ b/src/displayapp/apps/Apps.h.in @@ -70,23 +70,6 @@ namespace Pinetime { static constexpr size_t Count = sizeof...(Ws); }; - using UserAppTypes = TypeList<Apps::StopWatch, - Apps::Alarm, - Apps::Timer, - Apps::Steps, - Apps::HeartRate, - Apps::Music, - Apps::Paint, - Apps::Paddle, - Apps::Twos, - Apps::Metronome, - Apps::Navigation - /* - Apps::Weather, - Apps::Motion - */ - >; - using UserWatchFaceTypes = WatchFaceTypeList<WatchFace::Digital, WatchFace::Analog, WatchFace::PineTimeStyle, diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h index 7f71a21f..f10e931c 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h @@ -10,7 +10,7 @@ #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" #include "utility/DirtyValue.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h index a124a1c5..a4664792 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/screens/WatchFaceDigital.h @@ -9,7 +9,7 @@ #include "components/ble/BleController.h" #include "displayapp/widgets/StatusIcons.h" #include "utility/DirtyValue.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h index bd8862d5..32c08f18 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/screens/WatchFaceInfineat.h @@ -8,7 +8,7 @@ #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" #include "utility/DirtyValue.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" namespace Pinetime { namespace Controllers { |