Skip to content

Remove 3 copies of ble services #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NeroBurner merged 3 commits into from
Sep 28, 2024
Merged

Remove 3 copies of ble services #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
847b200
Remove sim MotionService.h copy and use InfiniTime verison instead
NeroBurner Sep 26, 2024
16b7505
Remove sim copy of AlertNotificationService and use InfiniTime files
NeroBurner Sep 26, 2024
f57ea5e
Remove sim copy of MotionController.h
NeroBurner Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,12 @@ add_library(sim-base STATIC
# nrf/components/libraries/timer
sim/libraries/gpiote/app_gpiote.h # includes hal/nrf_gpio.h
# nibmle
sim/host/ble_att.h
sim/host/ble_gap.h
sim/host/ble_gatt.h
sim/host/ble_gatt.cpp
sim/host/ble_hs_mbuf.h
sim/host/ble_hs_mbuf.cpp
sim/host/ble_uuid.h
sim/host/ble_uuid.cpp
sim/host/os_mbuf.h
Expand Down Expand Up @@ -126,10 +129,6 @@ target_sources(infinisim PUBLIC
sim/displayapp/LittleVgl.cpp
sim/components/battery/BatteryController.h
sim/components/battery/BatteryController.cpp
sim/components/ble/AlertNotificationService.h
sim/components/ble/AlertNotificationService.cpp
sim/components/ble/MotionService.h
sim/components/ble/MotionService.cpp
sim/components/ble/MusicService.h
sim/components/ble/MusicService.cpp
sim/components/ble/NimbleController.h
Expand All @@ -140,8 +139,6 @@ target_sources(infinisim PUBLIC
sim/components/firmwarevalidator/FirmwareValidator.cpp
sim/components/heartrate/HeartRateController.h
sim/components/heartrate/HeartRateController.cpp
sim/components/motion/MotionController.h
sim/components/motion/MotionController.cpp
sim/drivers/Bma421.h
sim/drivers/Bma421.cpp
sim/drivers/Cst816s.h
Expand Down Expand Up @@ -198,6 +195,10 @@ target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/components/datetime/DateTimeController.cpp
${InfiniTime_DIR}/src/components/settings/Settings.h
${InfiniTime_DIR}/src/components/settings/Settings.cpp
${InfiniTime_DIR}/src/components/ble/AlertNotificationService.h
${InfiniTime_DIR}/src/components/ble/AlertNotificationService.cpp
${InfiniTime_DIR}/src/components/ble/MotionService.h
${InfiniTime_DIR}/src/components/ble/MotionService.cpp
${InfiniTime_DIR}/src/components/ble/NavigationService.h
${InfiniTime_DIR}/src/components/ble/NavigationService.cpp
${InfiniTime_DIR}/src/components/ble/NotificationManager.h
Expand All @@ -206,6 +207,8 @@ target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/components/ble/SimpleWeatherService.cpp
${InfiniTime_DIR}/src/components/fs/FS.h
${InfiniTime_DIR}/src/components/fs/FS.cpp
${InfiniTime_DIR}/src/components/motion/MotionController.h
${InfiniTime_DIR}/src/components/motion/MotionController.cpp
${InfiniTime_DIR}/src/components/motor/MotorController.h
${InfiniTime_DIR}/src/components/motor/MotorController.cpp
${InfiniTime_DIR}/src/drivers/Hrs3300.h
Expand Down
125 changes: 0 additions & 125 deletions sim/components/ble/AlertNotificationService.cpp
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions sim/components/ble/AlertNotificationService.h
View file
Open in desktop

This file was deleted.

126 changes: 0 additions & 126 deletions sim/components/ble/MotionService.cpp
View file
Open in desktop

This file was deleted.

Loading