Remove sim MotionService.h copy and use InfiniTime verison instead

Author: NeroBurner

CMakeLists.txt

@@ -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
@@ -128,8 +131,6 @@ target_sources(infinisim PUBLIC
   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
@@ -198,6 +199,8 @@ 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/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

sim/components/ble/MotionService.cpp

@@ -365,9 +365,9 @@ void NimbleController::StartDiscovery() {
 //  }
 }
 
-//uint16_t NimbleController::connHandle() {
-//  return connectionHandle;
-//}
+uint16_t NimbleController::connHandle() {
+  return connectionHandle;
+}
 
 void NimbleController::NotifyBatteryLevel(uint8_t level) {
 //  if (connectionHandle != BLE_HS_CONN_HANDLE_NONE) {

sim/components/ble/MotionService.h

@@ -2,11 +2,11 @@
 
 #include <cstdint>
 
-//#define min // workaround: nimble's min/max macros conflict with libstdc++
-//#define max
-//#include <host/ble_gap.h>
-//#undef max
-//#undef min
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
+#include <host/ble_gap.h>
+#undef max
+#undef min
 //#include "components/ble/AlertNotificationClient.h"
 #include "components/ble/AlertNotificationService.h"
 //#include "components/ble/BatteryInformationService.h"
@@ -121,7 +121,7 @@ namespace Pinetime {
 //      ServiceDiscovery serviceDiscovery;
 
       uint8_t addrType;
-//      uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
+      uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
       uint8_t fastAdvCount = 0;
       uint8_t bondId[16] = {0};