add "LE Device Address" 0x1B to advertising data types

Fork of BLE_API by Bluetooth Low Energy

Committer:
rgrover1
Date:
Thu Nov 26 12:52:34 2015 +0000
Revision:
963:d111d9454aa9
Parent:
962:622ae38b3023
Child:
964:9d12fedb6d69
Synchronized with git rev 00cabcef
Author: Vincent Coubard
Verify ReadResponse identity

Who changed what in which revision?

UserRevisionLine numberNew contents of line
rgrover1 712:b04b5db36865 1 /* mbed Microcontroller Library
rgrover1 712:b04b5db36865 2 * Copyright (c) 2006-2013 ARM Limited
rgrover1 712:b04b5db36865 3 *
rgrover1 712:b04b5db36865 4 * Licensed under the Apache License, Version 2.0 (the "License");
rgrover1 712:b04b5db36865 5 * you may not use this file except in compliance with the License.
rgrover1 712:b04b5db36865 6 * You may obtain a copy of the License at
rgrover1 712:b04b5db36865 7 *
rgrover1 712:b04b5db36865 8 * http://www.apache.org/licenses/LICENSE-2.0
rgrover1 712:b04b5db36865 9 *
rgrover1 712:b04b5db36865 10 * Unless required by applicable law or agreed to in writing, software
rgrover1 712:b04b5db36865 11 * distributed under the License is distributed on an "AS IS" BASIS,
rgrover1 712:b04b5db36865 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rgrover1 712:b04b5db36865 13 * See the License for the specific language governing permissions and
rgrover1 712:b04b5db36865 14 * limitations under the License.
rgrover1 712:b04b5db36865 15 */
rgrover1 712:b04b5db36865 16
rgrover1 712:b04b5db36865 17 #include "ble/DiscoveredCharacteristic.h"
rgrover1 712:b04b5db36865 18 #include "ble/GattClient.h"
rgrover1 712:b04b5db36865 19
rgrover1 712:b04b5db36865 20 ble_error_t
rgrover1 712:b04b5db36865 21 DiscoveredCharacteristic::read(uint16_t offset) const
rgrover1 712:b04b5db36865 22 {
rgrover1 712:b04b5db36865 23 if (!props.read()) {
rgrover1 712:b04b5db36865 24 return BLE_ERROR_OPERATION_NOT_PERMITTED;
rgrover1 712:b04b5db36865 25 }
rgrover1 712:b04b5db36865 26
rgrover1 712:b04b5db36865 27 if (!gattc) {
rgrover1 712:b04b5db36865 28 return BLE_ERROR_INVALID_STATE;
rgrover1 712:b04b5db36865 29 }
rgrover1 712:b04b5db36865 30
rgrover1 712:b04b5db36865 31 return gattc->read(connHandle, valueHandle, offset);
rgrover1 712:b04b5db36865 32 }
rgrover1 712:b04b5db36865 33
rgrover1 962:622ae38b3023 34
rgrover1 962:622ae38b3023 35 struct OneShotReadCallback {
rgrover1 963:d111d9454aa9 36 static void launch(GattClient* client, Gap::Handle_t connHandle,
rgrover1 963:d111d9454aa9 37 GattAttribute::Handle_t handle,const GattClient::ReadCallback_t& cb) {
rgrover1 963:d111d9454aa9 38 OneShotReadCallback* oneShot = new OneShotReadCallback(client, connHandle, handle, cb);
rgrover1 962:622ae38b3023 39 oneShot->attach();
rgrover1 962:622ae38b3023 40 // delete will be made when this callback is called
rgrover1 962:622ae38b3023 41 }
rgrover1 962:622ae38b3023 42
rgrover1 962:622ae38b3023 43 private:
rgrover1 963:d111d9454aa9 44 OneShotReadCallback(GattClient* client, Gap::Handle_t connHandle,
rgrover1 963:d111d9454aa9 45 GattAttribute::Handle_t handle, const GattClient::ReadCallback_t& cb) :
rgrover1 962:622ae38b3023 46 _client(client),
rgrover1 963:d111d9454aa9 47 _connHandle(connHandle),
rgrover1 963:d111d9454aa9 48 _handle(handle),
rgrover1 962:622ae38b3023 49 _callback(cb) { }
rgrover1 962:622ae38b3023 50
rgrover1 962:622ae38b3023 51 void attach() {
rgrover1 962:622ae38b3023 52 _client->onDataRead(makeFunctionPointer(this, &OneShotReadCallback::call));
rgrover1 962:622ae38b3023 53 }
rgrover1 962:622ae38b3023 54
rgrover1 963:d111d9454aa9 55 void call(const GattReadCallbackParams* params) {
rgrover1 963:d111d9454aa9 56 // verifiy that it is the right characteristic on the right connection
rgrover1 963:d111d9454aa9 57 if(params->connHandle == _connHandle && params->handle == _handle) {
rgrover1 963:d111d9454aa9 58 _callback(params);
rgrover1 963:d111d9454aa9 59 _client->onDataRead().detach(makeFunctionPointer(this, &OneShotReadCallback::call));
rgrover1 963:d111d9454aa9 60 delete this;
rgrover1 963:d111d9454aa9 61 }
rgrover1 962:622ae38b3023 62 }
rgrover1 962:622ae38b3023 63
rgrover1 962:622ae38b3023 64 GattClient* _client;
rgrover1 963:d111d9454aa9 65 Gap::Handle_t _connHandle;
rgrover1 963:d111d9454aa9 66 GattAttribute::Handle_t _handle;
rgrover1 962:622ae38b3023 67 GattClient::ReadCallback_t _callback;
rgrover1 962:622ae38b3023 68 };
rgrover1 962:622ae38b3023 69
rgrover1 962:622ae38b3023 70 ble_error_t DiscoveredCharacteristic::read(uint16_t offset, const GattClient::ReadCallback_t& onRead) const {
rgrover1 962:622ae38b3023 71 ble_error_t error = read(offset);
rgrover1 962:622ae38b3023 72 if(error) {
rgrover1 962:622ae38b3023 73 return error;
rgrover1 962:622ae38b3023 74 }
rgrover1 962:622ae38b3023 75
rgrover1 963:d111d9454aa9 76 OneShotReadCallback::launch(gattc, connHandle, valueHandle, onRead);
rgrover1 962:622ae38b3023 77
rgrover1 962:622ae38b3023 78 return error;
rgrover1 962:622ae38b3023 79 }
rgrover1 962:622ae38b3023 80
rgrover1 962:622ae38b3023 81
rgrover1 962:622ae38b3023 82
rgrover1 962:622ae38b3023 83
rgrover1 712:b04b5db36865 84 ble_error_t
rgrover1 712:b04b5db36865 85 DiscoveredCharacteristic::write(uint16_t length, const uint8_t *value) const
rgrover1 712:b04b5db36865 86 {
rgrover1 712:b04b5db36865 87 if (!props.write()) {
rgrover1 712:b04b5db36865 88 return BLE_ERROR_OPERATION_NOT_PERMITTED;
rgrover1 712:b04b5db36865 89 }
rgrover1 712:b04b5db36865 90
rgrover1 712:b04b5db36865 91 if (!gattc) {
rgrover1 712:b04b5db36865 92 return BLE_ERROR_INVALID_STATE;
rgrover1 712:b04b5db36865 93 }
rgrover1 712:b04b5db36865 94
rgrover1 712:b04b5db36865 95 return gattc->write(GattClient::GATT_OP_WRITE_REQ, connHandle, valueHandle, length, value);
rgrover1 712:b04b5db36865 96 }
rgrover1 712:b04b5db36865 97
rgrover1 712:b04b5db36865 98 ble_error_t
rgrover1 712:b04b5db36865 99 DiscoveredCharacteristic::writeWoResponse(uint16_t length, const uint8_t *value) const
rgrover1 712:b04b5db36865 100 {
rgrover1 712:b04b5db36865 101 if (!props.writeWoResp()) {
rgrover1 712:b04b5db36865 102 return BLE_ERROR_OPERATION_NOT_PERMITTED;
rgrover1 712:b04b5db36865 103 }
rgrover1 712:b04b5db36865 104
rgrover1 712:b04b5db36865 105 if (!gattc) {
rgrover1 712:b04b5db36865 106 return BLE_ERROR_INVALID_STATE;
rgrover1 712:b04b5db36865 107 }
rgrover1 712:b04b5db36865 108
rgrover1 712:b04b5db36865 109 return gattc->write(GattClient::GATT_OP_WRITE_CMD, connHandle, valueHandle, length, value);
rgrover1 712:b04b5db36865 110 }
rgrover1 712:b04b5db36865 111
rgrover1 712:b04b5db36865 112 ble_error_t
rgrover1 712:b04b5db36865 113 DiscoveredCharacteristic::discoverDescriptors(DescriptorCallback_t callback, const UUID &matchingUUID) const
rgrover1 712:b04b5db36865 114 {
rgrover1 712:b04b5db36865 115 return BLE_ERROR_NOT_IMPLEMENTED; /* TODO: this needs to be filled in. */
rgrover1 712:b04b5db36865 116 }