mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-12-27 03:32:37 +03:00
Fix Failed rebase.
This commit is contained in:
parent
0a0d1f2703
commit
1470489e7b
@ -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}) {
|
||||
}
|
||||
|
||||
|
@ -111,7 +111,6 @@ namespace Pinetime {
|
||||
HeartRateService heartRateService;
|
||||
MotionService motionService;
|
||||
ServiceDiscovery serviceDiscovery;
|
||||
FS fs;
|
||||
FSService fsService;
|
||||
|
||||
uint8_t addrType;
|
||||
|
Loading…
Reference in New Issue
Block a user