Jonathan Austin / nRF51822

Dependents:   microbit_rubber_ducky microbit_mouse_BLE microbit_mouse_BLE_daybreak_version microbit_presenter

Fork of nRF51822 by Nordic Semiconductor

Committer:
rgrover1
Date:
Tue Jul 21 13:23:43 2015 +0100
Revision:
386:3253b512fb24
Synchronized with git rev 928a5e63
Author: Rohit Grover
Release 0.4.1
=============

This is a minor release.

Enhancements
~~~~~~~~~~~~

* Hide duplicate symbol definitions in ble_types.h. These have already been
brought into ble/blecommon.h.

* Replace DiscoveredCharacteristic::setupOnDataRead() with
GattClient::onDataRead().

* Implement new API GattServer::areUpdatesEnabled() to determine notification
status for a characteristic.

Bugfixes
~~~~~~~~

* fix for #20: GattServer::addService() incorrectly initialized value
attribute-handles. These were getting confused with characteristicIndex.
Event handlers also return attribute handles correctly now; they were also
previously returning characteristic indices.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
rgrover1 386:3253b512fb24 1 /* mbed Microcontroller Library
rgrover1 386:3253b512fb24 2 * Copyright (c) 2006-2013 ARM Limited
rgrover1 386:3253b512fb24 3 *
rgrover1 386:3253b512fb24 4 * Licensed under the Apache License, Version 2.0 (the "License");
rgrover1 386:3253b512fb24 5 * you may not use this file except in compliance with the License.
rgrover1 386:3253b512fb24 6 * You may obtain a copy of the License at
rgrover1 386:3253b512fb24 7 *
rgrover1 386:3253b512fb24 8 * http://www.apache.org/licenses/LICENSE-2.0
rgrover1 386:3253b512fb24 9 *
rgrover1 386:3253b512fb24 10 * Unless required by applicable law or agreed to in writing, software
rgrover1 386:3253b512fb24 11 * distributed under the License is distributed on an "AS IS" BASIS,
rgrover1 386:3253b512fb24 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rgrover1 386:3253b512fb24 13 * See the License for the specific language governing permissions and
rgrover1 386:3253b512fb24 14 * limitations under the License.
rgrover1 386:3253b512fb24 15 */
rgrover1 386:3253b512fb24 16
rgrover1 386:3253b512fb24 17 #include "nRF51ServiceDiscovery.h"
rgrover1 386:3253b512fb24 18 #include "nRF51GattClient.h"
rgrover1 386:3253b512fb24 19
rgrover1 386:3253b512fb24 20 void bleGattcEventHandler(const ble_evt_t *p_ble_evt)
rgrover1 386:3253b512fb24 21 {
rgrover1 386:3253b512fb24 22 nRF51ServiceDiscovery &sdSingleton = nRF51GattClient::getInstance().discovery;
rgrover1 386:3253b512fb24 23
rgrover1 386:3253b512fb24 24 switch (p_ble_evt->header.evt_id) {
rgrover1 386:3253b512fb24 25 case BLE_GATTC_EVT_PRIM_SRVC_DISC_RSP:
rgrover1 386:3253b512fb24 26 switch (p_ble_evt->evt.gattc_evt.gatt_status) {
rgrover1 386:3253b512fb24 27 case BLE_GATT_STATUS_SUCCESS:
rgrover1 386:3253b512fb24 28 sdSingleton.setupDiscoveredServices(&p_ble_evt->evt.gattc_evt.params.prim_srvc_disc_rsp);
rgrover1 386:3253b512fb24 29 break;
rgrover1 386:3253b512fb24 30
rgrover1 386:3253b512fb24 31 case BLE_GATT_STATUS_ATTERR_ATTRIBUTE_NOT_FOUND:
rgrover1 386:3253b512fb24 32 default:
rgrover1 386:3253b512fb24 33 sdSingleton.terminate();
rgrover1 386:3253b512fb24 34 break;
rgrover1 386:3253b512fb24 35 }
rgrover1 386:3253b512fb24 36 break;
rgrover1 386:3253b512fb24 37
rgrover1 386:3253b512fb24 38 case BLE_GATTC_EVT_CHAR_DISC_RSP:
rgrover1 386:3253b512fb24 39 switch (p_ble_evt->evt.gattc_evt.gatt_status) {
rgrover1 386:3253b512fb24 40 case BLE_GATT_STATUS_SUCCESS:
rgrover1 386:3253b512fb24 41 sdSingleton.setupDiscoveredCharacteristics(&p_ble_evt->evt.gattc_evt.params.char_disc_rsp);
rgrover1 386:3253b512fb24 42 break;
rgrover1 386:3253b512fb24 43
rgrover1 386:3253b512fb24 44 case BLE_GATT_STATUS_ATTERR_ATTRIBUTE_NOT_FOUND:
rgrover1 386:3253b512fb24 45 default:
rgrover1 386:3253b512fb24 46 sdSingleton.terminateCharacteristicDiscovery();
rgrover1 386:3253b512fb24 47 break;
rgrover1 386:3253b512fb24 48 }
rgrover1 386:3253b512fb24 49 break;
rgrover1 386:3253b512fb24 50
rgrover1 386:3253b512fb24 51 case BLE_GATTC_EVT_CHAR_VAL_BY_UUID_READ_RSP:
rgrover1 386:3253b512fb24 52 if (sdSingleton.isActive()) {
rgrover1 386:3253b512fb24 53 sdSingleton.processDiscoverUUIDResponse(&p_ble_evt->evt.gattc_evt.params.char_val_by_uuid_read_rsp);
rgrover1 386:3253b512fb24 54 }
rgrover1 386:3253b512fb24 55 break;
rgrover1 386:3253b512fb24 56
rgrover1 386:3253b512fb24 57 case BLE_GATTC_EVT_READ_RSP: {
rgrover1 386:3253b512fb24 58 GattReadCallbackParams response = {
rgrover1 386:3253b512fb24 59 .handle = p_ble_evt->evt.gattc_evt.params.read_rsp.handle,
rgrover1 386:3253b512fb24 60 .offset = p_ble_evt->evt.gattc_evt.params.read_rsp.offset,
rgrover1 386:3253b512fb24 61 .len = p_ble_evt->evt.gattc_evt.params.read_rsp.len,
rgrover1 386:3253b512fb24 62 .data = p_ble_evt->evt.gattc_evt.params.read_rsp.data,
rgrover1 386:3253b512fb24 63 };
rgrover1 386:3253b512fb24 64 nRF51GattClient::getInstance().processReadResponse(&response);
rgrover1 386:3253b512fb24 65 }
rgrover1 386:3253b512fb24 66 break;
rgrover1 386:3253b512fb24 67
rgrover1 386:3253b512fb24 68 case BLE_GATTC_EVT_WRITE_RSP: {
rgrover1 386:3253b512fb24 69 GattWriteCallbackParams response = {
rgrover1 386:3253b512fb24 70 .handle = p_ble_evt->evt.gattc_evt.params.write_rsp.handle,
rgrover1 386:3253b512fb24 71 .writeOp = (GattWriteCallbackParams::WriteOp_t)(p_ble_evt->evt.gattc_evt.params.write_rsp.write_op),
rgrover1 386:3253b512fb24 72 .offset = p_ble_evt->evt.gattc_evt.params.write_rsp.offset,
rgrover1 386:3253b512fb24 73 .len = p_ble_evt->evt.gattc_evt.params.write_rsp.len,
rgrover1 386:3253b512fb24 74 .data = p_ble_evt->evt.gattc_evt.params.write_rsp.data,
rgrover1 386:3253b512fb24 75 };
rgrover1 386:3253b512fb24 76 nRF51GattClient::getInstance().processWriteResponse(&response);
rgrover1 386:3253b512fb24 77 }
rgrover1 386:3253b512fb24 78 break;
rgrover1 386:3253b512fb24 79 }
rgrover1 386:3253b512fb24 80
rgrover1 386:3253b512fb24 81 sdSingleton.progressCharacteristicDiscovery();
rgrover1 386:3253b512fb24 82 sdSingleton.progressServiceDiscovery();
rgrover1 386:3253b512fb24 83 }