BLE: Only send notify events if requested by client

Author: amandel

src/bluetooth/DistanceService.cpp

@@ -26,6 +26,7 @@
 void DistanceService::setup(BLEServer *pServer) {
   mService = pServer->createService(SERVICE_DISTANCE_UUID);
   mCharacteristic = mService->createCharacteristic(SERVICE_DISTANCE_CHAR_50MS_UUID, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY);
+// SimRa does not like BLE2902
 }
 
 bool DistanceService::shouldAdvertise() {

src/bluetooth/HeartRateService.cpp

@@ -30,7 +30,7 @@ const BLEUUID HeartRateService::SERVICE_UUID = BLEUUID((uint16_t)ESP_GATT_UUID_H
 void HeartRateService::setup(BLEServer *pServer) {
   mService = pServer->createService(SERVICE_UUID); // Keep the defaults!!, 5);
   mService->addCharacteristic(&mHeartRateMeasurementCharacteristics);
-  mHeartRateMeasurementCharacteristics.addDescriptor(new BLE2902());
+  mHeartRateMeasurementCharacteristics.addDescriptor(&mHeartRateMeasurementConfiguration);
   mValue[0] = mValue[1] = mValue[2] = 0;
   mHeartRateMeasurementCharacteristics.setValue(mValue, 2);
 
@@ -54,12 +54,13 @@ void HeartRateService::newSensorValues(
     return;
   }
 
-  mValue[0] = mMinimumDistance <= UINT8_MAX ? 0 : 1; // 8/16 bit data no other flags set;
-  mValue[1] = mMinimumDistance & 0xFFu;
-  mValue[2] = mMinimumDistance >> 8u;
-
-  mHeartRateMeasurementCharacteristics.setValue(mValue, mMinimumDistance <= UINT8_MAX ? 2 : 3);
-  mHeartRateMeasurementCharacteristics.notify();
+  if (mHeartRateMeasurementConfiguration.getNotifications()) {
+    mValue[0] = mMinimumDistance <= UINT8_MAX ? 0 : 1; // 8/16 bit data no other flags set;
+    mValue[1] = mMinimumDistance & 0xFFu;
+    mValue[2] = mMinimumDistance >> 8u;
+    mHeartRateMeasurementCharacteristics.setValue(mValue, mMinimumDistance <= UINT8_MAX ? 2 : 3);
+    mHeartRateMeasurementCharacteristics.notify();
+  }
 
   // Reset values
   mMinimumDistance = MAX_SENSOR_VALUE;

src/bluetooth/HeartRateService.h

@@ -37,6 +37,7 @@ class HeartRateService : public IBluetoothService {
     BLEService *mService = nullptr;
     BLECharacteristic mHeartRateMeasurementCharacteristics
       = BLECharacteristic(BLEUUID((uint16_t)ESP_GATT_HEART_RATE_MEAS), BLECharacteristic::PROPERTY_NOTIFY);
+    BLE2902 mHeartRateMeasurementConfiguration;
     unsigned long mCollectionStartTime = 0;
     uint16_t mMinimumDistance = MAX_SENSOR_VALUE;
     uint8_t mValue[4];

src/bluetooth/ObsService.cpp

@@ -46,7 +46,7 @@ void ObsService::setup(BLEServer *pServer) {
   mTimeCharacteristic.setCallbacks(&mTimeCharacteristicsCallback);
 
   mService->addCharacteristic(&mDistanceCharacteristic);
-  mDistanceCharacteristic.addDescriptor(new BLE2902);
+  mDistanceCharacteristic.addDescriptor(&mDistanceConfiguration);
 
   mService->addCharacteristic(&mButtonCharacteristic);
   mButtonCharacteristic.addDescriptor(new BLE2902);
@@ -65,7 +65,9 @@ BLEService* ObsService::getService() {
 }
 
 void ObsService::newSensorValues(uint32_t millis, uint16_t leftValue, uint16_t rightValue) {
-  sendEventData(&mDistanceCharacteristic, millis, leftValue, rightValue);
+  if (mDistanceConfiguration.getNotifications()) {
+    sendEventData(&mDistanceCharacteristic, millis, leftValue, rightValue);
+  }
 }
 
 void ObsService::newPassEvent(uint32_t millis, uint16_t leftValue, uint16_t rightValue) {

src/bluetooth/ObsService.h

@@ -51,6 +51,7 @@ class ObsService : public IBluetoothService {
 
     BLECharacteristic mDistanceCharacteristic
       = BLECharacteristic(OBS_DISTANCE_CHARACTERISTIC_UUID, BLECharacteristic::PROPERTY_NOTIFY);
+    BLE2902 mDistanceConfiguration;
 
     BLECharacteristic mButtonCharacteristic
       = BLECharacteristic(OBS_BUTTON_CHARACTERISTIC_UUID, BLECharacteristic::PROPERTY_NOTIFY);