Adjust BLE/LL stacks, style, comments, refactoring

Increase BLE task stack +200 and decrease LL task stack -200
more braces!

1 files changed, 6 insertions, 7 deletions

diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 944e8ca..7569ce2 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -14,11 +14,11 @@
 #include "components/ble/CurrentTimeService.h"
 #include "components/ble/DeviceInformationService.h"
 #include "components/ble/DfuService.h"
+#include "components/ble/HeartRateService.h"
 #include "components/ble/ImmediateAlertService.h"
 #include "components/ble/MusicService.h"
 #include "components/ble/NavigationService.h"
 #include "components/ble/ServiceDiscovery.h"
-#include "components/ble/HeartRateService.h"
 #include "components/ble/MotionService.h"
 #include "components/fs/FS.h"
 
@@ -80,16 +80,17 @@ namespace Pinetime {
         fastAdvCount = 0;
       }
 
-      void PersistBond(struct ble_gap_conn_desc &desc);
+    private:
+      void PersistBond(struct ble_gap_conn_desc& desc);
       void RestoreBond();
 
-    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::FS& fs;
       Pinetime::Controllers::DfuService dfuService;
 
       DeviceInformationService deviceInformationService;
@@ -103,9 +104,9 @@ namespace Pinetime {
       ImmediateAlertService immediateAlertService;
       HeartRateService heartRateService;
       MotionService motionService;
-      Pinetime::Controllers::FS& fs;
+      ServiceDiscovery serviceDiscovery;
 
-      uint8_t addrType; // 1 = Random, 0 = PUBLIC
+      uint8_t addrType;
       uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
       uint8_t fastAdvCount = 0;
       uint8_t bondId[16] = {0};
@@ -113,8 +114,6 @@ namespace Pinetime {
       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;
     };
 
     static NimbleController* nptr;