will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Failed rebase.

Browse Source
This commit is contained in:
Tim Keller 2021-12-10 01:49:03 +00:00
parent 0a0d1f2703
commit 1470489e7b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/ble/NimbleController.cpp
View File

@ -49,9 +49,8 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
batteryInformationService {batteryController}, batteryInformationService {batteryController},
immediateAlertService {systemTask, notificationManager}, immediateAlertService {systemTask, notificationManager},
heartRateService {systemTask, heartRateController}, heartRateService {systemTask, heartRateController},
motionService{systemTask, motionController}, motionService {systemTask, motionController},
fs {fs}, fsService {systemTask, fs},
fsService {systemTask,fs},
serviceDiscovery({&currentTimeClient, &alertNotificationClient}) { serviceDiscovery({&currentTimeClient, &alertNotificationClient}) {
} }
@ -100,7 +99,7 @@ void NimbleController::Init() {
heartRateService.Init(); heartRateService.Init();
motionService.Init(); motionService.Init();
fsService.Init(); fsService.Init();
int rc; int rc;
rc = ble_hs_util_ensure_addr(0); rc = ble_hs_util_ensure_addr(0);
ASSERT(rc == 0); ASSERT(rc == 0);

1
src/components/ble/NimbleController.h
View File

@ -111,7 +111,6 @@ namespace Pinetime {
HeartRateService heartRateService; HeartRateService heartRateService;
MotionService motionService; MotionService motionService;
ServiceDiscovery serviceDiscovery; ServiceDiscovery serviceDiscovery;
FS fs;
FSService fsService; FSService fsService;
uint8_t addrType; uint8_t addrType;