diff options
author | Tim Keller <geekboy1011@gmail.com> | 2021-12-10 01:49:03 +0000 |
---|---|---|
committer | Tim Keller <geekboy1011@gmail.com> | 2021-12-10 01:49:03 +0000 |
commit | 1470489e7b14fdfe4871cdc714c4a3c98917c4bb (patch) | |
tree | 0c4699aa138f8b651b92a0eec54c2c40ea05d9cc /src/components | |
parent | 0a0d1f270328001e1e80a2ac6c26feb111bfa27a (diff) |
Fix Failed rebase.
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/ble/NimbleController.cpp | 7 | ||||
-rw-r--r-- | src/components/ble/NimbleController.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp index 01230661..3bf1ec80 100644 --- a/src/components/ble/NimbleController.cpp +++ b/src/components/ble/NimbleController.cpp @@ -49,9 +49,8 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask, batteryInformationService {batteryController}, immediateAlertService {systemTask, notificationManager}, heartRateService {systemTask, heartRateController}, - motionService{systemTask, motionController}, - fs {fs}, - fsService {systemTask,fs}, + motionService {systemTask, motionController}, + fsService {systemTask, fs}, serviceDiscovery({¤tTimeClient, &alertNotificationClient}) { } @@ -100,7 +99,7 @@ void NimbleController::Init() { heartRateService.Init(); motionService.Init(); fsService.Init(); - + int rc; rc = ble_hs_util_ensure_addr(0); ASSERT(rc == 0); diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h index 14749b8d..7a387037 100644 --- a/src/components/ble/NimbleController.h +++ b/src/components/ble/NimbleController.h @@ -111,7 +111,6 @@ namespace Pinetime { HeartRateService heartRateService; MotionService motionService; ServiceDiscovery serviceDiscovery; - FS fs; FSService fsService; uint8_t addrType; |