Revision 442:a2693384abdb, committed 2015-09-25

Comitter:

rgrover1

Date:

Fri Sep 25 15:26:59 2015 +0100

Parent:

441:b52f5b70e62a

Child:

443:df9a63600641

Commit message:

Synchronized with git rev 167f304b
Author: Rohit Grover
minor cleanup to Fabien's pull request; remove the un-necessary gapConnectionHandle

Changed in this revision

--- a/source/nRF5xGattServer.cpp	Fri Sep 25 15:26:58 2015 +0100
+++ b/source/nRF5xGattServer.cpp	Fri Sep 25 15:26:59 2015 +0100
@@ -204,7 +204,6 @@
 
 ble_error_t nRF5xGattServer::write(Gap::Handle_t connectionHandle, GattAttribute::Handle_t attributeHandle, const uint8_t buffer[], uint16_t len, bool localOnly)
 {
-    uint16_t gapConnectionHandle = nRF5xGap::getInstance().getConnectionHandle();
     ble_error_t returnValue = BLE_ERROR_NONE;
 
     ble_gatts_value_t value = {
@@ -234,7 +233,10 @@
         hvx_params.p_data = const_cast<uint8_t *>(buffer);
         hvx_params.p_len  = &len;
 
-        error_t error = (error_t) sd_ble_gatts_hvx(gapConnectionHandle, &hvx_params);
+        if (connectionHandle == BLE_CONN_HANDLE_INVALID) { /* use the default connection handle if the caller hasn't specified a valid connectionHandle. */
+            connectionHandle = nRF5xGap::getInstance().getConnectionHandle();
+        }
+        error_t error = (error_t) sd_ble_gatts_hvx(connectionHandle, &hvx_params);
         if (error != ERROR_NONE) {
             switch (error) {
                 case ERROR_BLE_NO_TX_BUFFERS: /*  Notifications consume application buffers. The return value can be used for resending notifications. */