Remove sim copy of MusicService.h and use InfiniTime version

Needs fix for missing includes PR from InfiniTime: InfiniTimeOrg/InfiniTime#2130
InfiniTimeOrg · Sep 28, 2024 · fe4f5c6 · fe4f5c6
1 parent 4fb12d1
commit fe4f5c6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 291 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,8 +129,6 @@ target_sources(infinisim PUBLIC
   sim/displayapp/LittleVgl.cpp
   sim/components/battery/BatteryController.h
   sim/components/battery/BatteryController.cpp
-  sim/components/ble/MusicService.h
-  sim/components/ble/MusicService.cpp
   sim/components/ble/NimbleController.h
   sim/components/ble/NimbleController.cpp
   sim/components/brightness/BrightnessController.h
@@ -199,6 +197,8 @@ target_sources(infinisim PUBLIC
   ${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/MusicService.h
+  ${InfiniTime_DIR}/src/components/ble/MusicService.cpp
   ${InfiniTime_DIR}/src/components/ble/NavigationService.h
   ${InfiniTime_DIR}/src/components/ble/NavigationService.cpp
   ${InfiniTime_DIR}/src/components/ble/NotificationManager.h

diff --git a/InfiniTime b/InfiniTime
diff --git a/sim/components/ble/MusicService.cpp b/sim/components/ble/MusicService.cpp
diff --git a/sim/components/ble/MusicService.h b/sim/components/ble/MusicService.h
diff --git a/sim/components/ble/NimbleController.cpp b/sim/components/ble/NimbleController.cpp
@@ -43,7 +43,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
     anService {systemTask, notificationManager},
 //    alertNotificationClient {systemTask, notificationManager},
 //    currentTimeService {dateTimeController},
-    musicService {systemTask},
+    musicService {*this},
     weatherService {dateTimeController},
 //    batteryInformationService {batteryController},
 //    immediateAlertService {systemTask, notificationManager},
+3 −0		src/CMakeLists.txt
+88 −13		src/components/alarm/AlarmController.cpp
+32 −14		src/components/alarm/AlarmController.h
+5 −3		src/components/ble/DfuService.cpp
+1 −0		src/components/ble/MusicService.cpp
+1 −0		src/components/ble/MusicService.h
+8 −2		src/components/ble/NimbleController.cpp
+1 −1		src/components/heartrate/Ppg.cpp
+1 −1		src/components/heartrate/Ppg.h
+20 −3		src/displayapp/DisplayApp.cpp
+14 −18		src/displayapp/screens/Alarm.cpp
+2 −1		src/displayapp/screens/Alarm.h
+2 −3		src/displayapp/screens/FlashLight.cpp
+2 −1		src/displayapp/screens/FlashLight.h
+4 −5		src/displayapp/screens/HeartRate.cpp
+2 −1		src/displayapp/screens/HeartRate.h
+3 −4		src/displayapp/screens/Metronome.cpp
+2 −1		src/displayapp/screens/Metronome.h
+8 −8		src/displayapp/screens/Notifications.cpp
+2 −1		src/displayapp/screens/Notifications.h
+3 −4		src/displayapp/screens/StopWatch.cpp
+2 −1		src/displayapp/screens/StopWatch.h
+31 −33		src/drivers/Hrs3300.cpp
+6 −4		src/drivers/Hrs3300.h
+2 −1		src/heartratetask/HeartRateTask.cpp
+1 −1		src/main.cpp
+73 −93		src/systemtask/SystemTask.cpp
+5 −7		src/systemtask/SystemTask.h
+27 −0		src/systemtask/WakeLock.cpp
+19 −0		src/systemtask/WakeLock.h