ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved the connection handle

pull/248/head
Kevin Townsend 2014-04-03 02:07:17 +02:00
parent 5e210d8ae7
commit fff7a0fe60
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/ble/nRF51822/btle/btle.cpp
View File

@ -94,13 +94,13 @@ static void btle_handler(ble_evt_t * p_ble_evt)
switch (p_ble_evt->header.evt_id)
{
case BLE_GAP_EVT_CONNECTED:
nRF51GattServer::getInstance().m_connectionHandle = p_ble_evt->evt.gap_evt.conn_handle;
nRF51Gap::getInstance().m_connectionHandle = p_ble_evt->evt.gap_evt.conn_handle;
nRF51Gap::getInstance().handleEvent(GapEvents::GAP_EVENT_CONNECTED);
break;
case BLE_GAP_EVT_DISCONNECTED:
// Since we are not in a connection and have not started advertising, store bonds
nRF51GattServer::getInstance().m_connectionHandle = BLE_CONN_HANDLE_INVALID;
nRF51Gap::getInstance().m_connectionHandle = BLE_CONN_HANDLE_INVALID;
ASSERT_STATUS_RET_VOID ( ble_bondmngr_bonded_centrals_store() );
nRF51Gap::getInstance().handleEvent(GapEvents::GAP_EVENT_DISCONNECTED);
break;
@ -117,7 +117,7 @@ static void btle_handler(ble_evt_t * p_ble_evt)
sec_params.min_key_size = CFG_BLE_SEC_PARAM_MIN_KEY_SIZE ;
sec_params.max_key_size = CFG_BLE_SEC_PARAM_MAX_KEY_SIZE ;
ASSERT_STATUS_RET_VOID ( sd_ble_gap_sec_params_reply(nRF51GattServer::getInstance().m_connectionHandle, BLE_GAP_SEC_STATUS_SUCCESS, &sec_params) );
ASSERT_STATUS_RET_VOID ( sd_ble_gap_sec_params_reply(nRF51Gap::getInstance().m_connectionHandle, BLE_GAP_SEC_STATUS_SUCCESS, &sec_params) );
}
break;

8
libraries/ble/nRF51822/nRF51Gap.cpp
View File

@ -19,6 +19,7 @@
#include "common/common.h"
#include "ble_advdata.h"
#include "ble_hci.h"
/**************************************************************************/
/*!
@ -223,12 +224,13 @@ ble_error_t nRF51Gap::stopAdvertising(void)
/**************************************************************************/
ble_error_t nRF51Gap::disconnect(void)
{
/* Disconnect if we are connected to a central device */
// ASSERT( ERROR_NONE == sd_ble_gap_disconnect(), BLE_ERROR_PARAM_OUT_OF_RANGE);
state.advertising = 0;
state.connected = 0;
/* Disconnect if we are connected to a central device */
ASSERT_INT(ERROR_NONE, sd_ble_gap_disconnect(m_connectionHandle, BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION),
BLE_ERROR_PARAM_OUT_OF_RANGE);
return BLE_ERROR_NONE;
}

5
libraries/ble/nRF51822/nRF51Gap.h
View File

@ -19,6 +19,7 @@
#include "mbed.h"
#include "blecommon.h"
#include "ble.h"
#include "GapAdvertisingParams.h"
#include "GapAdvertisingData.h"
#include "hw/Gap.h"
@ -44,9 +45,11 @@ class nRF51Gap : public Gap
virtual ble_error_t startAdvertising(GapAdvertisingParams &);
virtual ble_error_t stopAdvertising(void);
virtual ble_error_t disconnect(void);
uint16_t m_connectionHandle; // TODO move to private
private:
nRF51Gap() { };
nRF51Gap() { m_connectionHandle = BLE_CONN_HANDLE_INVALID; };
nRF51Gap(nRF51Gap const&);
void operator=(nRF51Gap const&);
};

9
libraries/ble/nRF51822/nRF51GattServer.cpp
View File

@ -20,6 +20,8 @@
#include "common/common.h"
#include "btle/custom/custom_helper.h"
#include "hw/nRF51822n/nRF51Gap.h"
/**************************************************************************/
/*!
@brief Adds a new service to the GATT table on the peripheral
@ -138,13 +140,16 @@ ble_error_t nRF51GattServer::readValue(uint16_t charHandle, uint8_t buffer[], ui
/**************************************************************************/
ble_error_t nRF51GattServer::updateValue(uint16_t charHandle, uint8_t buffer[], uint16_t len, bool localOnly)
{
uint16_t gapConnectionHandle = nRF51Gap::getInstance().m_connectionHandle;
if (localOnly)
{
/* Only update locally regardless of notify/indicate */
ASSERT_INT( ERROR_NONE, sd_ble_gatts_value_set(nrfCharacteristicHandles[charHandle].value_handle, 0, &len, buffer), BLE_ERROR_PARAM_OUT_OF_RANGE );
}
if ((p_characteristics[charHandle]->properties & (GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_INDICATE | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY)) &&
(m_connectionHandle != BLE_CONN_HANDLE_INVALID) )
(gapConnectionHandle != BLE_CONN_HANDLE_INVALID) )
{
/* HVX update for the characteristic value */
ble_gatts_hvx_params_t hvx_params;
@ -155,7 +160,7 @@ ble_error_t nRF51GattServer::updateValue(uint16_t charHandle, uint8_t buffer[],
hvx_params.p_data = buffer;
hvx_params.p_len = &len;
error_t error = (error_t) sd_ble_gatts_hvx(m_connectionHandle, &hvx_params);
error_t error = (error_t) sd_ble_gatts_hvx(gapConnectionHandle, &hvx_params);
/* ERROR_INVALID_STATE, ERROR_BUSY, ERROR_GATTS_SYS_ATTR_MISSING and ERROR_NO_TX_BUFFERS the ATT table has been updated. */
if ( (error != ERROR_NONE ) && (error != ERROR_INVALID_STATE) &&

4
libraries/ble/nRF51822/nRF51GattServer.h
View File

@ -49,13 +49,11 @@ class nRF51GattServer : public GattServer
void eventCallback(void);
void hwCallback(ble_evt_t * p_ble_evt);
uint16_t m_connectionHandle; // TODO move to private
private:
GattCharacteristic* p_characteristics[BLE_TOTAL_CHARACTERISTICS];
ble_gatts_char_handles_t nrfCharacteristicHandles[BLE_TOTAL_CHARACTERISTICS];
nRF51GattServer() { serviceCount = 0; characteristicCount = 0; m_connectionHandle = BLE_CONN_HANDLE_INVALID; };
nRF51GattServer() { serviceCount = 0; characteristicCount = 0; };
nRF51GattServer(nRF51GattServer const&);
void operator=(nRF51GattServer const&);