Diff: main.cpp

Revision:

39:6390604f904c

Parent:

37:d310a72115c7

Child:

40:e73130c6f2bb

diff -r b2efa4f73d3a -r 6390604f904c main.cpp
--- a/main.cpp	Fri Jul 25 17:23:34 2014 +0100
+++ b/main.cpp	Fri Aug 22 14:55:52 2014 +0000
@@ -16,7 +16,7 @@
 
 #include "mbed.h"
 #include "BLEDevice.h"
-#include "ble_hrs.h"
+#include "HeartRateService.h"
 
 BLEDevice  ble;
 DigitalOut led1(LED1);
@@ -31,28 +31,9 @@
 #define DEBUG(...) /* nothing */
 #endif /* #if NEED_CONSOLE_OUTPUT */
 
-const static char  DEVICE_NAME[] = "Nordic_HRM";
-
-/* Heart Rate Service */
-/* Service:  https://developer.bluetooth.org/gatt/services/Pages/ServiceViewer.aspx?u=org.bluetooth.service.heart_rate.xml */
-/* HRM Char: https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.heart_rate_measurement.xml */
-/* Location: https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.body_sensor_location.xml */
-static uint8_t hrmCounter = 100;
-static uint8_t bpm[2] = {0x00, hrmCounter};
-GattCharacteristic hrmRate(GattCharacteristic::UUID_HEART_RATE_MEASUREMENT_CHAR, bpm, sizeof(bpm), sizeof(bpm),
-                           GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY);
-static uint8_t location = BLE_HRS_BODY_SENSOR_LOCATION_FINGER;
-GattCharacteristic hrmLocation(GattCharacteristic::UUID_BODY_SENSOR_LOCATION_CHAR,
-                               (uint8_t *)&location, sizeof(location), sizeof(location),
-                               GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ);
-GattCharacteristic *hrmChars[] = {&hrmRate, &hrmLocation, };
-GattService        hrmService(GattService::UUID_HEART_RATE_SERVICE, hrmChars, sizeof(hrmChars) / sizeof(GattCharacteristic *));
-
-static const uint16_t uuid16_list[] = {GattService::UUID_HEART_RATE_SERVICE};
-
-static volatile bool triggerSensorPolling = false; /* set to high periodically to indicate to the main thread that
-                                                    * polling is necessary. */
-static Gap::ConnectionParams_t connectionParams;
+const static char     DEVICE_NAME[]        = "Nordic_HRM";
+static const uint16_t uuid16_list[]        = {GattService::UUID_HEART_RATE_SERVICE};
+static volatile bool  triggerSensorPolling = false;
 
 void disconnectionCallback(Gap::Handle_t handle)
 {
@@ -61,26 +42,13 @@
     ble.startAdvertising();
 }
 
-void onConnectionCallback(Gap::Handle_t handle)
-{
-    DEBUG("connected. Got handle %u\r\n", handle);
-
-    connectionParams.slaveLatency = 1;
-    if (ble.updateConnectionParams(handle, &connectionParams) != BLE_ERROR_NONE) {
-        DEBUG("failed to update connection paramter\r\n");
-    }
-}
-
-/**
- * Triggered periodically by the 'ticker' interrupt.
- */
 void periodicCallback(void)
 {
     led1 = !led1; /* Do blinky on LED1 while we're waiting for BLE events */
-    triggerSensorPolling = true; /* Note that the periodicCallback() executes in
-                                  * interrupt context, so it is safer to do
-                                  * heavy-weight sensor polling from the main
-                                  * thread.*/
+
+    /* Note that the periodicCallback() executes in interrupt context, so it is safer to do
+     * heavy-weight sensor polling from the main thread. */
+    triggerSensorPolling = true;
 }
 
 int main(void)
@@ -92,9 +60,6 @@
     DEBUG("Initialising the nRF51822\n\r");
     ble.init();
     ble.onDisconnection(disconnectionCallback);
-    ble.onConnection(onConnectionCallback);
-
-    ble.getPreferredConnectionParams(&connectionParams);
 
     /* setup advertising */
     ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
@@ -102,10 +67,11 @@
     ble.accumulateAdvertisingPayload(GapAdvertisingData::HEART_RATE_SENSOR_HEART_RATE_BELT);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)DEVICE_NAME, sizeof(DEVICE_NAME));
     ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
-    ble.setAdvertisingInterval(160); /* 100ms; in multiples of 0.625ms. */
+    ble.setAdvertisingInterval(1600); /* 100ms; in multiples of 0.625ms. */
     ble.startAdvertising();
 
-    ble.addService(hrmService);
+    uint8_t hrmCounter = 100 ;
+    HeartRateService hrService(ble, hrmCounter, HeartRateService::BLE_HRS_BODY_SENSOR_LOCATION_FINGER);
 
     while (true) {
         if (triggerSensorPolling) {
@@ -118,12 +84,7 @@
                 hrmCounter = 100;
             }
 
-            if (ble.getGapState().connected) {
-                /* First byte = 8-bit values, no extra info, Second byte = uint8_t HRM value */
-                /* See --> https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.heart_rate_measurement.xml */
-                bpm[1] = hrmCounter;
-                ble.updateCharacteristicValue(hrmRate.getHandle(), bpm, sizeof(bpm));
-            }
+            hrService.updateHeartRate(hrmCounter);
         } else {
             ble.waitForEvent();
         }