diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-03-20 10:41:49 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-03-20 10:41:49 (GMT) |
| commit | 405c85c160b0d72407498a25555677d484b822f1 (patch) | |
| tree | 71b22af329f7b5ee7a6f37ddca4c738f0e379593 /src/CMakeLists.txt | |
| parent | e63596b291f973cdeb01cd0ac276861895bd4489 (diff) | |
| parent | 9e9bb2085e70a9c8b8c2e74f6027f5392e366158 (diff) | |
Merge branch 'develop' of github.com:JF002/Pinetime into develop
# Conflicts:
# src/main.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 47b3433..ac53354 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -499,6 +499,15 @@ list(APPEND SOURCE_FILES displayapp/screens/Notifications.cpp displayapp/screens/Twos.cpp displayapp/screens/HeartRate.cpp + + ## Watch faces + displayapp/icons/bg_clock.c + displayapp/screens/WatchFaceAnalog.cpp + + displayapp/screens/WatchFaceDigital.cpp + + ## + main.cpp drivers/St7789.cpp drivers/SpiNorFlash.cpp @@ -528,6 +537,7 @@ list(APPEND SOURCE_FILES components/ble/HeartRateService.cpp components/firmwarevalidator/FirmwareValidator.cpp components/motor/MotorController.cpp + components/settings/Settings.cpp drivers/Cst816s.cpp FreeRTOS/port.c FreeRTOS/port_cmsis_systick.c @@ -581,6 +591,7 @@ list(APPEND RECOVERY_SOURCE_FILES components/ble/NavigationService.cpp components/ble/HeartRateService.cpp components/firmwarevalidator/FirmwareValidator.cpp + components/settings/Settings.cpp drivers/Cst816s.cpp FreeRTOS/port.c FreeRTOS/port_cmsis_systick.c @@ -671,7 +682,8 @@ set(INCLUDE_FILES components/ble/ImmediateAlertService.h components/ble/ServiceDiscovery.h components/ble/BleClient.h - components/ble/HeartRateService.h.h + components/ble/HeartRateService.h + components/settings/Settings.h drivers/Cst816s.h FreeRTOS/portmacro.h FreeRTOS/portmacro_cmsis.h |