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:05 2015 +0000
Revision:
929:918d93d409c1
Parent:
728:997ba5e7b3b6
Child:
930:d6883d67fcb3
Synchronized with git rev ebb982f7
Author: Vincent Coubard
Add read end to end operation

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 929:918d93d409c1 34
rgrover1 929:918d93d409c1 35 struct OneShotReadCallback {
rgrover1 929:918d93d409c1 36 static void launch(GattClient* client, const GattClient::ReadCallback_t& cb) {
rgrover1 929:918d93d409c1 37 OneShotReadCallback* oneShot = new OneShotReadCallback(client, cb);
rgrover1 929:918d93d409c1 38 oneShot->attach();
rgrover1 929:918d93d409c1 39 // delete will be made when this callback is called
rgrover1 929:918d93d409c1 40 }
rgrover1 929:918d93d409c1 41
rgrover1 929:918d93d409c1 42 private:
rgrover1 929:918d93d409c1 43 OneShotReadCallback(GattClient* client, const GattClient::ReadCallback_t& cb) :
rgrover1 929:918d93d409c1 44 _client(client),
rgrover1 929:918d93d409c1 45 _callback(cb) { }
rgrover1 929:918d93d409c1 46
rgrover1 929:918d93d409c1 47 void attach() {
rgrover1 929:918d93d409c1 48 _client->onDataRead(makeFunctionPointer(this, &OneShotReadCallback::call));
rgrover1 929:918d93d409c1 49 }
rgrover1 929:918d93d409c1 50
rgrover1 929:918d93d409c1 51 void call(const GattReadCallbackParams* params) {
rgrover1 929:918d93d409c1 52 _callback(params);
rgrover1 929:918d93d409c1 53 _client->onDataRead().detach(makeFunctionPointer(this, &OneShotReadCallback::call));
rgrover1 929:918d93d409c1 54 delete this;
rgrover1 929:918d93d409c1 55 }
rgrover1 929:918d93d409c1 56
rgrover1 929:918d93d409c1 57 GattClient* _client;
rgrover1 929:918d93d409c1 58 GattClient::ReadCallback_t _callback;
rgrover1 929:918d93d409c1 59 };
rgrover1 929:918d93d409c1 60
rgrover1 929:918d93d409c1 61 ble_error_t DiscoveredCharacteristic::read(uint16_t offset, const GattClient::ReadCallback_t& onRead) const {
rgrover1 929:918d93d409c1 62 ble_error_t error = read(offset);
rgrover1 929:918d93d409c1 63 if(error) {
rgrover1 929:918d93d409c1 64 return error;
rgrover1 929:918d93d409c1 65 }
rgrover1 929:918d93d409c1 66
rgrover1 929:918d93d409c1 67 OneShotReadCallback::launch(gattc, onRead);
rgrover1 929:918d93d409c1 68
rgrover1 929:918d93d409c1 69 return error;
rgrover1 929:918d93d409c1 70 }
rgrover1 929:918d93d409c1 71
rgrover1 929:918d93d409c1 72
rgrover1 929:918d93d409c1 73
rgrover1 929:918d93d409c1 74
rgrover1 712:b04b5db36865 75 ble_error_t
rgrover1 712:b04b5db36865 76 DiscoveredCharacteristic::write(uint16_t length, const uint8_t *value) const
rgrover1 712:b04b5db36865 77 {
rgrover1 712:b04b5db36865 78 if (!props.write()) {
rgrover1 712:b04b5db36865 79 return BLE_ERROR_OPERATION_NOT_PERMITTED;
rgrover1 712:b04b5db36865 80 }
rgrover1 712:b04b5db36865 81
rgrover1 712:b04b5db36865 82 if (!gattc) {
rgrover1 712:b04b5db36865 83 return BLE_ERROR_INVALID_STATE;
rgrover1 712:b04b5db36865 84 }
rgrover1 712:b04b5db36865 85
rgrover1 712:b04b5db36865 86 return gattc->write(GattClient::GATT_OP_WRITE_REQ, connHandle, valueHandle, length, value);
rgrover1 712:b04b5db36865 87 }
rgrover1 712:b04b5db36865 88
rgrover1 712:b04b5db36865 89 ble_error_t
rgrover1 712:b04b5db36865 90 DiscoveredCharacteristic::writeWoResponse(uint16_t length, const uint8_t *value) const
rgrover1 712:b04b5db36865 91 {
rgrover1 712:b04b5db36865 92 if (!props.writeWoResp()) {
rgrover1 712:b04b5db36865 93 return BLE_ERROR_OPERATION_NOT_PERMITTED;
rgrover1 712:b04b5db36865 94 }
rgrover1 712:b04b5db36865 95
rgrover1 712:b04b5db36865 96 if (!gattc) {
rgrover1 712:b04b5db36865 97 return BLE_ERROR_INVALID_STATE;
rgrover1 712:b04b5db36865 98 }
rgrover1 712:b04b5db36865 99
rgrover1 712:b04b5db36865 100 return gattc->write(GattClient::GATT_OP_WRITE_CMD, connHandle, valueHandle, length, value);
rgrover1 712:b04b5db36865 101 }
rgrover1 712:b04b5db36865 102
rgrover1 712:b04b5db36865 103 ble_error_t
rgrover1 712:b04b5db36865 104 DiscoveredCharacteristic::discoverDescriptors(DescriptorCallback_t callback, const UUID &matchingUUID) const
rgrover1 712:b04b5db36865 105 {
rgrover1 712:b04b5db36865 106 return BLE_ERROR_NOT_IMPLEMENTED; /* TODO: this needs to be filled in. */
rgrover1 712:b04b5db36865 107 }