diff options
| author | Max Friedrich <minacode@users.noreply.github.com> | 2022-04-19 00:40:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 00:40:29 +0200 |
| commit | f84a0a38972e6b6d9a537dc9de2e2c416312f882 (patch) | |
| tree | 3ce9dab83f8b6af8e9df1c8d3aa0219f5a67acbe /src/CMakeLists.txt | |
| parent | a1db9fca136493eef38e536abaa660dd6ce23e57 (diff) | |
| parent | ed91b5a9981898078ad8e4cf105b5d52c7b63dfe (diff) | |
Merge branch 'develop' into remove-nm-reference
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aec6ce04..b233f926 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -449,12 +449,14 @@ list(APPEND SOURCE_FILES displayapp/screens/settings/SettingSetTime.cpp displayapp/screens/settings/SettingChimes.cpp displayapp/screens/settings/SettingShakeThreshold.cpp + displayapp/screens/settings/SettingBluetooth.cpp ## Watch faces displayapp/icons/bg_clock.c displayapp/screens/WatchFaceAnalog.cpp displayapp/screens/WatchFaceDigital.cpp - displayapp/screens/PineTimeStyle.cpp + displayapp/screens/WatchFaceTerminal.cpp + displayapp/screens/WatchFacePineTimeStyle.cpp ## @@ -514,6 +516,7 @@ list(APPEND SOURCE_FILES displayapp/lv_pinetime_theme.c systemtask/SystemTask.cpp + systemtask/SystemMonitor.cpp drivers/TwiMaster.cpp heartratetask/HeartRateTask.cpp @@ -575,6 +578,7 @@ list(APPEND RECOVERY_SOURCE_FILES FreeRTOS/port_cmsis.c systemtask/SystemTask.cpp + systemtask/SystemMonitor.cpp drivers/TwiMaster.cpp components/gfx/Gfx.cpp components/rle/RleDecoder.cpp @@ -626,7 +630,6 @@ set(INCLUDE_FILES displayapp/screens/InfiniPaint.h displayapp/screens/StopWatch.h displayapp/screens/Paddle.h - displayapp/screens/DropDownDemo.h displayapp/screens/BatteryIcon.h displayapp/screens/BleIcon.h displayapp/screens/NotificationIcon.h |