Skip to content

Commit b586806

Browse files
committed
Remove sim copy of MusicService.h and use InfiniTime version
Needs fix for missing includes PR from InfiniTime: InfiniTimeOrg/InfiniTime#2130
1 parent eedcaf4 commit b586806

File tree

4 files changed

+3
-290
lines changed

4 files changed

+3
-290
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ target_sources(infinisim PUBLIC
129129
sim/displayapp/LittleVgl.cpp
130130
sim/components/battery/BatteryController.h
131131
sim/components/battery/BatteryController.cpp
132-
sim/components/ble/MusicService.h
133-
sim/components/ble/MusicService.cpp
134132
sim/components/ble/NimbleController.h
135133
sim/components/ble/NimbleController.cpp
136134
sim/components/brightness/BrightnessController.h
@@ -199,6 +197,8 @@ target_sources(infinisim PUBLIC
199197
${InfiniTime_DIR}/src/components/ble/AlertNotificationService.cpp
200198
${InfiniTime_DIR}/src/components/ble/MotionService.h
201199
${InfiniTime_DIR}/src/components/ble/MotionService.cpp
200+
${InfiniTime_DIR}/src/components/ble/MusicService.h
201+
${InfiniTime_DIR}/src/components/ble/MusicService.cpp
202202
${InfiniTime_DIR}/src/components/ble/NavigationService.h
203203
${InfiniTime_DIR}/src/components/ble/NavigationService.cpp
204204
${InfiniTime_DIR}/src/components/ble/NotificationManager.h

sim/components/ble/MusicService.cpp

-198
This file was deleted.

sim/components/ble/MusicService.h

-89
This file was deleted.

sim/components/ble/NimbleController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
4343
anService {systemTask, notificationManager},
4444
// alertNotificationClient {systemTask, notificationManager},
4545
// currentTimeService {dateTimeController},
46-
musicService {systemTask},
46+
musicService {*this},
4747
weatherService {dateTimeController},
4848
// batteryInformationService {batteryController},
4949
// immediateAlertService {systemTask, notificationManager},

0 commit comments

Comments
 (0)