From 1b71c934c4c43695cc136a1a8a9793dbe1683a28 Mon Sep 17 00:00:00 2001 From: Lingkai Dong Date: Tue, 21 May 2019 12:02:18 +0100 Subject: [PATCH] BLE services: update to use the latest APIs Update BatterService and HealthThermometerService to use up-to-date BLE APIs. Note: HealthThermometerService::updateTemperature() will not check GAP connection which should be taken care of by the caller. --- features/FEATURE_BLE/ble/services/BatteryService.h | 2 +- .../FEATURE_BLE/ble/services/HealthThermometerService.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/features/FEATURE_BLE/ble/services/BatteryService.h b/features/FEATURE_BLE/ble/services/BatteryService.h index 0b2af8d576..1d60092d8a 100644 --- a/features/FEATURE_BLE/ble/services/BatteryService.h +++ b/features/FEATURE_BLE/ble/services/BatteryService.h @@ -84,7 +84,7 @@ public: sizeof(charTable) / sizeof(GattCharacteristic *) ); - ble.addService(batteryService); + ble.gattServer().addService(batteryService); } /** diff --git a/features/FEATURE_BLE/ble/services/HealthThermometerService.h b/features/FEATURE_BLE/ble/services/HealthThermometerService.h index bdb7e47e1d..6eb2dedd2e 100644 --- a/features/FEATURE_BLE/ble/services/HealthThermometerService.h +++ b/features/FEATURE_BLE/ble/services/HealthThermometerService.h @@ -61,7 +61,7 @@ public: GattCharacteristic *hrmChars[] = {&tempMeasurement, &tempLocation, }; GattService hrmService(GattService::UUID_HEALTH_THERMOMETER_SERVICE, hrmChars, sizeof(hrmChars) / sizeof(GattCharacteristic *)); - ble.addService(hrmService); + ble.gattServer().addService(hrmService); } /** @@ -72,10 +72,8 @@ public: * */ void updateTemperature(float temperature) { - if (ble.getGapState().connected) { - valueBytes.updateTemperature(temperature); - ble.gattServer().write(tempMeasurement.getValueHandle(), valueBytes.getPointer(), sizeof(TemperatureValueBytes)); - } + valueBytes.updateTemperature(temperature); + ble.gattServer().write(tempMeasurement.getValueHandle(), valueBytes.getPointer(), sizeof(TemperatureValueBytes)); } /**