diff options
author | JF002 <JF002@users.noreply.github.com> | 2021-02-14 14:25:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-14 14:25:38 +0100 |
commit | 97a1c4b3d7be04ddb24fea096add41b44629a5f9 (patch) | |
tree | 5dfaff12620b0664dc75bc734cbff70d17e03e01 /src/components | |
parent | 07a0d7cf2de8244e481df697ebd9c85eb413163f (diff) | |
parent | 169b861af1fd8b1f7834ad78a8880882b236dc96 (diff) |
Merge pull request #182 from petterhs/warnings
Fix build warnings coming from HR implementation
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/ble/HeartRateService.cpp | 4 | ||||
-rw-r--r-- | src/components/ble/NimbleController.cpp | 4 | ||||
-rw-r--r-- | src/components/heartrate/Ppg.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/components/ble/HeartRateService.cpp b/src/components/ble/HeartRateService.cpp index ecd6235d..ee115ed0 100644 --- a/src/components/ble/HeartRateService.cpp +++ b/src/components/ble/HeartRateService.cpp @@ -57,9 +57,7 @@ void HeartRateService::Init() { int HeartRateService::OnHeartRateRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt *context) { if(attributeHandle == heartRateMeasurementHandle) { - NRF_LOG_INFO("BATTERY : handle = %d", heartRateMeasurementHandle); - static uint8_t batteryValue = heartRateController.HeartRate(); - + NRF_LOG_INFO("HEARTRATE : handle = %d", heartRateMeasurementHandle); uint8_t buffer[2] = {0, heartRateController.HeartRate()}; // [0] = flags, [1] = hr value int res = os_mbuf_append(context->om, buffer, 2); diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp index f2786ea1..eb83c709 100644 --- a/src/components/ble/NimbleController.cpp +++ b/src/components/ble/NimbleController.cpp @@ -38,8 +38,8 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask, navService{systemTask}, batteryInformationService{batteryController}, immediateAlertService{systemTask, notificationManager}, - serviceDiscovery({¤tTimeClient, &alertNotificationClient}), - heartRateService{systemTask, heartRateController} { + heartRateService{systemTask, heartRateController}, + serviceDiscovery({¤tTimeClient, &alertNotificationClient}) { } int GAPEventCallback(struct ble_gap_event *event, void *arg) { diff --git a/src/components/heartrate/Ppg.cpp b/src/components/heartrate/Ppg.cpp index 233c3003..e84cbdf3 100644 --- a/src/components/heartrate/Ppg.cpp +++ b/src/components/heartrate/Ppg.cpp @@ -13,7 +13,7 @@ using namespace Pinetime::Controllers; namespace { int Compare(int* d1, int* d2, size_t count) { int e = 0; - for(int i = 0; i < count; i++) { + for(size_t i = 0; i < count; i++) { auto d = d1[i] - d2[i]; e += d * d; } |