1 files changed, 33 insertions, 49 deletions

diff --git a/src/components/ble/NavigationService.cpp b/src/components/ble/NavigationService.cpp
index 545c44da..e1c20bf1 100644
--- a/src/components/ble/NavigationService.cpp
+++ b/src/components/ble/NavigationService.cpp
@@ -20,12 +20,12 @@
 
 #include "systemtask/SystemTask.h"
 
-int NAVCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
-  auto navService = static_cast<Pinetime::Controllers::NavigationService *>(arg);
+int NAVCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt, void* arg) {
+  auto navService = static_cast<Pinetime::Controllers::NavigationService*>(arg);
   return navService->OnCommand(conn_handle, attr_handle, ctxt);
 }
 
-Pinetime::Controllers::NavigationService::NavigationService(Pinetime::System::SystemTask &system) : m_system(system) {
+Pinetime::Controllers::NavigationService::NavigationService(Pinetime::System::SystemTask& system) : m_system(system) {
   navUuid.value[14] = navId[0];
   navUuid.value[15] = navId[1];
 
@@ -49,35 +49,25 @@ Pinetime::Controllers::NavigationService::NavigationService(Pinetime::System::Sy
   navProgressCharUuid.value[14] = navId[0];
   navProgressCharUuid.value[15] = navId[1];
 
-  characteristicDefinition[0] = {.uuid = (ble_uuid_t *) (&navFlagCharUuid),
-      .access_cb = NAVCallback,
-      .arg = this,
-      .flags =  BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
-  };
-
-  characteristicDefinition[1] = {.uuid = (ble_uuid_t *) (&navNarrativeCharUuid),
-      .access_cb = NAVCallback,
-      .arg = this,
-      .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
-  };
-  characteristicDefinition[2] = {.uuid = (ble_uuid_t *) (&navManDistCharUuid),
-      .access_cb = NAVCallback,
-      .arg = this,
-      .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
-  };
-  characteristicDefinition[3] = {.uuid = (ble_uuid_t *) (&navProgressCharUuid),
-      .access_cb = NAVCallback,
-      .arg = this,
-      .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
-  };
+  characteristicDefinition[0] = {
+    .uuid = (ble_uuid_t*) (&navFlagCharUuid), .access_cb = NAVCallback, .arg = this, .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
+
+  characteristicDefinition[1] = {.uuid = (ble_uuid_t*) (&navNarrativeCharUuid),
+                                 .access_cb = NAVCallback,
+                                 .arg = this,
+                                 .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
+  characteristicDefinition[2] = {.uuid = (ble_uuid_t*) (&navManDistCharUuid),
+                                 .access_cb = NAVCallback,
+                                 .arg = this,
+                                 .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
+  characteristicDefinition[3] = {.uuid = (ble_uuid_t*) (&navProgressCharUuid),
+                                 .access_cb = NAVCallback,
+                                 .arg = this,
+                                 .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
 
   characteristicDefinition[4] = {0};
 
-  serviceDefinition[0] = {
-      .type = BLE_GATT_SVC_TYPE_PRIMARY,
-      .uuid = (ble_uuid_t *) &navUuid,
-      .characteristics = characteristicDefinition
-  };
+  serviceDefinition[0] = {.type = BLE_GATT_SVC_TYPE_PRIMARY, .uuid = (ble_uuid_t*) &navUuid, .characteristics = characteristicDefinition};
   serviceDefinition[1] = {0};
 
   m_progress = 0;
@@ -92,45 +82,39 @@ void Pinetime::Controllers::NavigationService::Init() {
   ASSERT(res == 0);
 }
 
-int Pinetime::Controllers::NavigationService::OnCommand(uint16_t conn_handle, uint16_t attr_handle,
-                                                   struct ble_gatt_access_ctxt *ctxt) {
+int Pinetime::Controllers::NavigationService::OnCommand(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt) {
 
   if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
     size_t notifSize = OS_MBUF_PKTLEN(ctxt->om);
     uint8_t data[notifSize + 1];
     data[notifSize] = '\0';
     os_mbuf_copydata(ctxt->om, 0, notifSize, data);
-    char *s = (char *) &data[0];
-    if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navFlagCharUuid) == 0) {
+    char* s = (char*) &data[0];
+    if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t*) &navFlagCharUuid) == 0) {
       m_flag = s;
-    } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navNarrativeCharUuid) == 0) {
+    } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t*) &navNarrativeCharUuid) == 0) {
       m_narrative = s;
-    } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navManDistCharUuid) == 0) {
+    } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t*) &navManDistCharUuid) == 0) {
       m_manDist = s;
-    } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navProgressCharUuid) == 0) {
+    } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t*) &navProgressCharUuid) == 0) {
       m_progress = data[0];
     }
   }
   return 0;
 }
 
-std::string Pinetime::Controllers::NavigationService::getFlag()
-{
-    return m_flag;
+std::string Pinetime::Controllers::NavigationService::getFlag() {
+  return m_flag;
 }
 
-std::string Pinetime::Controllers::NavigationService::getNarrative()
-{
-    return m_narrative;
+std::string Pinetime::Controllers::NavigationService::getNarrative() {
+  return m_narrative;
 }
 
-std::string Pinetime::Controllers::NavigationService::getManDist()
-{
-    return m_manDist;
+std::string Pinetime::Controllers::NavigationService::getManDist() {
+  return m_manDist;
 }
 
-int Pinetime::Controllers::NavigationService::getProgress()
-{
-    return m_progress;
+int Pinetime::Controllers::NavigationService::getProgress() {
+  return m_progress;
 }
-