User applications selection using CMake
Fix include path since last rebase.
This commit is contained in:
parent
2ee2b8523a
commit
fc5424cb72
5 changed files with 4 additions and 21 deletions
|
@ -3,7 +3,7 @@
|
||||||
#include <bitset>
|
#include <bitset>
|
||||||
#include "components/brightness/BrightnessController.h"
|
#include "components/brightness/BrightnessController.h"
|
||||||
#include "components/fs/FS.h"
|
#include "components/fs/FS.h"
|
||||||
#include "displayapp/Apps.h"
|
#include "displayapp/apps/Apps.h"
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace Controllers {
|
namespace Controllers {
|
||||||
|
|
|
@ -70,23 +70,6 @@ namespace Pinetime {
|
||||||
static constexpr size_t Count = sizeof...(Ws);
|
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,
|
using UserWatchFaceTypes = WatchFaceTypeList<WatchFace::Digital,
|
||||||
WatchFace::Analog,
|
WatchFace::Analog,
|
||||||
WatchFace::PineTimeStyle,
|
WatchFace::PineTimeStyle,
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "components/datetime/DateTimeController.h"
|
#include "components/datetime/DateTimeController.h"
|
||||||
#include "components/ble/BleController.h"
|
#include "components/ble/BleController.h"
|
||||||
#include "utility/DirtyValue.h"
|
#include "utility/DirtyValue.h"
|
||||||
#include "displayapp/Apps.h"
|
#include "displayapp/apps/Apps.h"
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace Controllers {
|
namespace Controllers {
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "components/ble/BleController.h"
|
#include "components/ble/BleController.h"
|
||||||
#include "displayapp/widgets/StatusIcons.h"
|
#include "displayapp/widgets/StatusIcons.h"
|
||||||
#include "utility/DirtyValue.h"
|
#include "utility/DirtyValue.h"
|
||||||
#include "displayapp/Apps.h"
|
#include "displayapp/apps/Apps.h"
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace Controllers {
|
namespace Controllers {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include "displayapp/screens/Screen.h"
|
#include "displayapp/screens/Screen.h"
|
||||||
#include "components/datetime/DateTimeController.h"
|
#include "components/datetime/DateTimeController.h"
|
||||||
#include "utility/DirtyValue.h"
|
#include "utility/DirtyValue.h"
|
||||||
#include "displayapp/Apps.h"
|
#include "displayapp/apps/Apps.h"
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace Controllers {
|
namespace Controllers {
|
||||||
|
|
Loading…
Reference in a new issue