1 files changed, 63 insertions, 56 deletions
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 7bb135da..5dd01e42 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -36,62 +36,69 @@ namespace Pinetime {
 
     class NimbleController {
 
-      public:
-        NimbleController(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::Ble& bleController,
-                DateTime& dateTimeController, Pinetime::Controllers::NotificationManager& notificationManager,
-                Controllers::Battery& batteryController, Pinetime::Drivers::SpiNorFlash& spiNorFlash,
-                Controllers::HeartRateController& heartRateController);
-        void Init();
-        void StartAdvertising();
-        int OnGAPEvent(ble_gap_event *event);
-
-        int OnDiscoveryEvent(uint16_t i, const ble_gatt_error *pError, const ble_gatt_svc *pSvc);
-        int OnCTSCharacteristicDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error,
-                                              const ble_gatt_chr *characteristic);
-        int OnANSCharacteristicDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error,
-                                              const ble_gatt_chr *characteristic);
-        int OnCurrentTimeReadResult(uint16_t connectionHandle, const ble_gatt_error *error, ble_gatt_attr *attribute);
-        int OnANSDescriptorDiscoveryEventCallback(uint16_t connectionHandle, const ble_gatt_error *error,
-                                                  uint16_t characteristicValueHandle, const ble_gatt_dsc *descriptor);
-
-        void StartDiscovery();
-
-        Pinetime::Controllers::MusicService& music() {return musicService;};
-        Pinetime::Controllers::NavigationService& navigation() {return navService;};
-        Pinetime::Controllers::AlertNotificationService& alertService() {return anService;};
-
-        uint16_t connHandle();
-
-      private:
-        static constexpr const char* deviceName = "InfiniTime";
-        Pinetime::System::SystemTask& systemTask;
-        Pinetime::Controllers::Ble& bleController;
-        DateTime& dateTimeController;
-        Pinetime::Controllers::NotificationManager& notificationManager;
-        Pinetime::Drivers::SpiNorFlash& spiNorFlash;
-        Pinetime::Controllers::DfuService dfuService;
-
-        DeviceInformationService deviceInformationService;
-        CurrentTimeClient currentTimeClient;
-        AlertNotificationService anService;
-        AlertNotificationClient alertNotificationClient;
-        CurrentTimeService currentTimeService;
-        MusicService musicService;
-        NavigationService navService;
-        BatteryInformationService batteryInformationService;
-        ImmediateAlertService immediateAlertService;
-        HeartRateService heartRateService;
-
-        uint8_t addrType; // 1 = Random, 0 = PUBLIC
-        uint16_t connectionHandle = 0;
-
-        ble_uuid128_t dfuServiceUuid {
-                .u { .type = BLE_UUID_TYPE_128},
-                .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15,
-                          0xDE, 0xEF, 0x12, 0x12, 0x30, 0x15, 0x00, 0x00}
-        };
-
-        ServiceDiscovery serviceDiscovery;
+    public:
+      NimbleController(Pinetime::System::SystemTask& systemTask,
+                       Pinetime::Controllers::Ble& bleController,
+                       DateTime& dateTimeController,
+                       Pinetime::Controllers::NotificationManager& notificationManager,
+                       Controllers::Battery& batteryController,
+                       Pinetime::Drivers::SpiNorFlash& spiNorFlash,
+                       Controllers::HeartRateController& heartRateController);
+      void Init();
+      void StartAdvertising();
+      int OnGAPEvent(ble_gap_event* event);
+
+      int OnDiscoveryEvent(uint16_t i, const ble_gatt_error* pError, const ble_gatt_svc* pSvc);
+      int OnCTSCharacteristicDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error* error, const ble_gatt_chr* characteristic);
+      int OnANSCharacteristicDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error* error, const ble_gatt_chr* characteristic);
+      int OnCurrentTimeReadResult(uint16_t connectionHandle, const ble_gatt_error* error, ble_gatt_attr* attribute);
+      int OnANSDescriptorDiscoveryEventCallback(uint16_t connectionHandle,
+                                                const ble_gatt_error* error,
+                                                uint16_t characteristicValueHandle,
+                                                const ble_gatt_dsc* descriptor);
+
+      void StartDiscovery();
+
+      Pinetime::Controllers::MusicService& music() {
+        return musicService;
+      };
+      Pinetime::Controllers::NavigationService& navigation() {
+        return navService;
+      };
+      Pinetime::Controllers::AlertNotificationService& alertService() {
+        return anService;
+      };
+
+      uint16_t connHandle();
+
+    private:
+      static constexpr const char* deviceName = "InfiniTime";
+      Pinetime::System::SystemTask& systemTask;
+      Pinetime::Controllers::Ble& bleController;
+      DateTime& dateTimeController;
+      Pinetime::Controllers::NotificationManager& notificationManager;
+      Pinetime::Drivers::SpiNorFlash& spiNorFlash;
+      Pinetime::Controllers::DfuService dfuService;
+
+      DeviceInformationService deviceInformationService;
+      CurrentTimeClient currentTimeClient;
+      AlertNotificationService anService;
+      AlertNotificationClient alertNotificationClient;
+      CurrentTimeService currentTimeService;
+      MusicService musicService;
+      NavigationService navService;
+      BatteryInformationService batteryInformationService;
+      ImmediateAlertService immediateAlertService;
+      HeartRateService heartRateService;
+
+      uint8_t addrType; // 1 = Random, 0 = PUBLIC
+      uint16_t connectionHandle = 0;
+
+      ble_uuid128_t dfuServiceUuid {
+        .u {.type = BLE_UUID_TYPE_128},
+        .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15, 0xDE, 0xEF, 0x12, 0x12, 0x30, 0x15, 0x00, 0x00}};
+
+      ServiceDiscovery serviceDiscovery;
     };
   }
 }