Nordic Semiconductor
Nordic stack and drivers for the mbed BLE API
Dependents: BLE_ANCS_SDAPI BLE_temperature BLE_HeartRate writable_gatt ... more
btle/custom/custom_helper.cpp@97:e95e35845e1c, 2015-03-02 (annotated)
- Committer:
- rgrover1
- Date:
- Mon Mar 02 11:34:45 2015 +0000
- Revision:
- 97:e95e35845e1c
- Parent:
- 85:17fe69405098
- Child:
- 109:425faebc8201
Synchronized with git rev c9d036fc
Author: Rohit Grover
Release 0.2.6
=============
Enhancements
~~~~~~~~~~~~
* Disregard bytes 2 and 3 when comparing long UUIDs. This is in response to a
user request to avoid zeroing out bytes 2 and 3 when storing long UUIDs
within the class UUID.
* Added optional data and length fields to the return struct for authorized
reads so a new value can be provided for each individual authorization. Pull
request from Marcus Chang.
* Updated return value for nRF51GattServer::updateValue. Will now report when
call fails. Pull request from Marcus Chang.
* Use GattAttribute::Handle_t for GattServer::readValue() and updateValue().
* add code to support getPermittedTxValues().
Bugfixes
~~~~~~~~
* Write permission was not set for 'write without response' characteristics.
Pull request from Marcus Chang.
* When the write-authorization attribute is enabled for a characteristic,
handleDataWritten() should still be called after authorization.
Compatibility
~~~~~~~~~~~~~
This release is backward compatible with 0.2.3.
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| Rohit Grover |
22:c6ee8136847e | 1 | /* mbed Microcontroller Library |
| Rohit Grover |
22:c6ee8136847e | 2 | * Copyright (c) 2006-2013 ARM Limited |
| Rohit Grover |
22:c6ee8136847e | 3 | * |
| Rohit Grover |
22:c6ee8136847e | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| Rohit Grover |
22:c6ee8136847e | 5 | * you may not use this file except in compliance with the License. |
| Rohit Grover |
22:c6ee8136847e | 6 | * You may obtain a copy of the License at |
| Rohit Grover |
22:c6ee8136847e | 7 | * |
| Rohit Grover |
22:c6ee8136847e | 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| Rohit Grover |
22:c6ee8136847e | 9 | * |
| Rohit Grover |
22:c6ee8136847e | 10 | * Unless required by applicable law or agreed to in writing, software |
| Rohit Grover |
22:c6ee8136847e | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| Rohit Grover |
22:c6ee8136847e | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| Rohit Grover |
22:c6ee8136847e | 13 | * See the License for the specific language governing permissions and |
| Rohit Grover |
22:c6ee8136847e | 14 | * limitations under the License. |
| Rohit Grover |
22:c6ee8136847e | 15 | */ |
| Rohit Grover |
22:c6ee8136847e | 16 | |
| Rohit Grover |
22:c6ee8136847e | 17 | #include "custom_helper.h" |
| Rohit Grover |
22:c6ee8136847e | 18 | |
| Rohit Grover |
22:c6ee8136847e | 19 | /* |
| Rohit Grover |
22:c6ee8136847e | 20 | * The current version of the soft-device doesn't handle duplicate 128-bit UUIDs |
| Rohit Grover |
22:c6ee8136847e | 21 | * very well. It is therefore necessary to filter away duplicates before |
| Rohit Grover |
22:c6ee8136847e | 22 | * passing long UUIDs to sd_ble_uuid_vs_add(). The following types and data |
| Rohit Grover |
22:c6ee8136847e | 23 | * structures involved in maintaining a local cache of 128-bit UUIDs. |
| Rohit Grover |
22:c6ee8136847e | 24 | */ |
| Rohit Grover |
22:c6ee8136847e | 25 | typedef struct { |
| Rohit Grover |
56:a1071b629aa3 | 26 | LongUUIDBytes_t uuid; |
| Rohit Grover |
56:a1071b629aa3 | 27 | uint8_t type; |
| Rohit Grover |
22:c6ee8136847e | 28 | } converted_uuid_table_entry_t; |
| Rohit Grover |
66:b3680699d9a4 | 29 | static const unsigned UUID_TABLE_MAX_ENTRIES = 8; /* This is the maximum number of 128-bit UUIDs with distinct bases that |
| Rohit Grover |
66:b3680699d9a4 | 30 | * we expect to be in use; increase this limit if needed. */ |
| Rohit Grover |
22:c6ee8136847e | 31 | static unsigned uuidTableEntries = 0; /* current usage of the table */ |
| Rohit Grover |
22:c6ee8136847e | 32 | converted_uuid_table_entry_t convertedUUIDTable[UUID_TABLE_MAX_ENTRIES]; |
| Rohit Grover |
22:c6ee8136847e | 33 | |
| Rohit Grover |
22:c6ee8136847e | 34 | /** |
| Rohit Grover |
22:c6ee8136847e | 35 | * lookup the cache of previously converted 128-bit UUIDs to find a type value. |
| Rohit Grover |
66:b3680699d9a4 | 36 | * @param uuid base 128-bit UUID |
| Rohit Grover |
22:c6ee8136847e | 37 | * @param recoveredType the type field of the 3-byte nRF's uuid. |
| Rohit Grover |
22:c6ee8136847e | 38 | * @return true if a match is found. |
| Rohit Grover |
22:c6ee8136847e | 39 | */ |
| Rohit Grover |
22:c6ee8136847e | 40 | static bool |
| Rohit Grover |
56:a1071b629aa3 | 41 | lookupConvertedUUIDTable(const LongUUIDBytes_t uuid, uint8_t *recoveredType) |
| Rohit Grover |
22:c6ee8136847e | 42 | { |
| Rohit Grover |
22:c6ee8136847e | 43 | unsigned i; |
| Rohit Grover |
22:c6ee8136847e | 44 | for (i = 0; i < uuidTableEntries; i++) { |
| rgrover1 | 97:e95e35845e1c | 45 | unsigned byteIndex; |
| rgrover1 | 97:e95e35845e1c | 46 | for (byteIndex = 0; byteIndex < LENGTH_OF_LONG_UUID; byteIndex++) { |
| rgrover1 | 97:e95e35845e1c | 47 | /* Skip bytes 2 and 3, because they contain the shortUUID (16-bit) version of the |
| rgrover1 | 97:e95e35845e1c | 48 | * long UUID; and we're comparing against the remainder. */ |
| rgrover1 | 97:e95e35845e1c | 49 | if ((byteIndex == 2) || (byteIndex == 3)) { |
| rgrover1 | 97:e95e35845e1c | 50 | continue; |
| rgrover1 | 97:e95e35845e1c | 51 | } |
| rgrover1 | 97:e95e35845e1c | 52 | |
| rgrover1 | 97:e95e35845e1c | 53 | if (convertedUUIDTable[i].uuid[byteIndex] != uuid[byteIndex]) { |
| rgrover1 | 97:e95e35845e1c | 54 | break; |
| rgrover1 | 97:e95e35845e1c | 55 | } |
| rgrover1 | 97:e95e35845e1c | 56 | } |
| rgrover1 | 97:e95e35845e1c | 57 | |
| rgrover1 | 97:e95e35845e1c | 58 | if (byteIndex == LENGTH_OF_LONG_UUID) { |
| Rohit Grover |
22:c6ee8136847e | 59 | *recoveredType = convertedUUIDTable[i].type; |
| Rohit Grover |
22:c6ee8136847e | 60 | return true; |
| Rohit Grover |
22:c6ee8136847e | 61 | } |
| Rohit Grover |
22:c6ee8136847e | 62 | } |
| Rohit Grover |
22:c6ee8136847e | 63 | |
| Rohit Grover |
22:c6ee8136847e | 64 | return false; |
| Rohit Grover |
22:c6ee8136847e | 65 | } |
| Rohit Grover |
22:c6ee8136847e | 66 | |
| Rohit Grover |
22:c6ee8136847e | 67 | static void |
| Rohit Grover |
56:a1071b629aa3 | 68 | addToConvertedUUIDTable(const LongUUIDBytes_t uuid, uint8_t type) |
| Rohit Grover |
22:c6ee8136847e | 69 | { |
| Rohit Grover |
22:c6ee8136847e | 70 | if (uuidTableEntries == UUID_TABLE_MAX_ENTRIES) { |
| Rohit Grover |
66:b3680699d9a4 | 71 | return; /* recovery needed; or at least the user should be warned about this fact.*/ |
| Rohit Grover |
22:c6ee8136847e | 72 | } |
| Rohit Grover |
22:c6ee8136847e | 73 | |
| rgrover1 | 97:e95e35845e1c | 74 | memcpy(convertedUUIDTable[uuidTableEntries].uuid, uuid, LENGTH_OF_LONG_UUID); |
| rgrover1 | 97:e95e35845e1c | 75 | convertedUUIDTable[uuidTableEntries].uuid[2] = 0; |
| rgrover1 | 97:e95e35845e1c | 76 | convertedUUIDTable[uuidTableEntries].uuid[3] = 0; |
| rgrover1 | 97:e95e35845e1c | 77 | convertedUUIDTable[uuidTableEntries].type = type; |
| Rohit Grover |
22:c6ee8136847e | 78 | uuidTableEntries++; |
| Rohit Grover |
22:c6ee8136847e | 79 | } |
| Rohit Grover |
22:c6ee8136847e | 80 | |
| Rohit Grover |
22:c6ee8136847e | 81 | /** |
| Rohit Grover |
22:c6ee8136847e | 82 | * The nRF transport has its own 3-byte representation of a UUID. If the user- |
| Rohit Grover |
22:c6ee8136847e | 83 | * specified UUID is 128-bits wide, then the UUID base needs to be added to the |
| Rohit Grover |
22:c6ee8136847e | 84 | * soft-device and converted to a 3-byte handle before being used further. This |
| Rohit Grover |
22:c6ee8136847e | 85 | * function is responsible for this translation of user-specified UUIDs into |
| Rohit Grover |
22:c6ee8136847e | 86 | * nRF's representation. |
| Rohit Grover |
22:c6ee8136847e | 87 | * |
| Rohit Grover |
22:c6ee8136847e | 88 | * @param[in] uuid |
| Rohit Grover |
22:c6ee8136847e | 89 | * user-specified UUID |
| Rohit Grover |
22:c6ee8136847e | 90 | * @return nRF |
| Rohit Grover |
22:c6ee8136847e | 91 | * 3-byte UUID (containing a type and 16-bit UUID) representation |
| Rohit Grover |
22:c6ee8136847e | 92 | * to be used with SVC calls. |
| Rohit Grover |
22:c6ee8136847e | 93 | */ |
| Rohit Grover |
22:c6ee8136847e | 94 | ble_uuid_t custom_convert_to_nordic_uuid(const UUID &uuid) |
| Rohit Grover |
22:c6ee8136847e | 95 | { |
| Rohit Grover |
22:c6ee8136847e | 96 | ble_uuid_t nordicUUID = { |
| Rohit Grover |
22:c6ee8136847e | 97 | .uuid = uuid.getShortUUID(), |
| Rohit Grover |
22:c6ee8136847e | 98 | .type = BLE_UUID_TYPE_UNKNOWN /* to be set below */ |
| Rohit Grover |
22:c6ee8136847e | 99 | }; |
| Rohit Grover |
22:c6ee8136847e | 100 | |
| Rohit Grover |
22:c6ee8136847e | 101 | if (uuid.shortOrLong() == UUID::UUID_TYPE_SHORT) { |
| Rohit Grover |
22:c6ee8136847e | 102 | nordicUUID.type = BLE_UUID_TYPE_BLE; |
| Rohit Grover |
22:c6ee8136847e | 103 | } else { |
| Rohit Grover |
22:c6ee8136847e | 104 | if (!lookupConvertedUUIDTable(uuid.getBaseUUID(), &nordicUUID.type)) { |
| Rohit Grover |
22:c6ee8136847e | 105 | nordicUUID.type = custom_add_uuid_base(uuid.getBaseUUID()); |
| Rohit Grover |
22:c6ee8136847e | 106 | addToConvertedUUIDTable(uuid.getBaseUUID(), nordicUUID.type); |
| Rohit Grover |
22:c6ee8136847e | 107 | } |
| Rohit Grover |
22:c6ee8136847e | 108 | } |
| Rohit Grover |
22:c6ee8136847e | 109 | |
| Rohit Grover |
22:c6ee8136847e | 110 | return nordicUUID; |
| Rohit Grover |
22:c6ee8136847e | 111 | } |
| Rohit Grover |
22:c6ee8136847e | 112 | |
| Rohit Grover |
22:c6ee8136847e | 113 | /**************************************************************************/ |
| Rohit Grover |
22:c6ee8136847e | 114 | /*! |
| Rohit Grover |
22:c6ee8136847e | 115 | @brief Adds the base UUID to the custom service. All UUIDs used |
| Rohit Grover |
22:c6ee8136847e | 116 | by this service are based on this 128-bit UUID. |
| Rohit Grover |
22:c6ee8136847e | 117 | |
| Rohit Grover |
22:c6ee8136847e | 118 | @note This UUID needs to be added to the SoftDevice stack before |
| Rohit Grover |
22:c6ee8136847e | 119 | adding the service's primary service via |
| Rohit Grover |
22:c6ee8136847e | 120 | 'sd_ble_gatts_service_add' |
| Rohit Grover |
22:c6ee8136847e | 121 | |
| Rohit Grover |
22:c6ee8136847e | 122 | @param[in] p_uuid_base A pointer to the 128-bit UUID array (8*16) |
| Rohit Grover |
22:c6ee8136847e | 123 | |
| Rohit Grover |
22:c6ee8136847e | 124 | @returns The UUID type. |
| Rohit Grover |
22:c6ee8136847e | 125 | A return value of 0 should be considered an error. |
| Rohit Grover |
22:c6ee8136847e | 126 | |
| Rohit Grover |
22:c6ee8136847e | 127 | @retval 0x00 BLE_UUID_TYPE_UNKNOWN |
| Rohit Grover |
22:c6ee8136847e | 128 | @retval 0x01 BLE_UUID_TYPE_BLE |
| Rohit Grover |
22:c6ee8136847e | 129 | @retval 0x02 BLE_UUID_TYPE_VENDOR_BEGIN |
| Rohit Grover |
22:c6ee8136847e | 130 | |
| Rohit Grover |
22:c6ee8136847e | 131 | @section EXAMPLE |
| Rohit Grover |
22:c6ee8136847e | 132 | @code |
| Rohit Grover |
22:c6ee8136847e | 133 | |
| Rohit Grover |
22:c6ee8136847e | 134 | // Take note that bytes 2/3 are blank since these are used to identify |
| Rohit Grover |
22:c6ee8136847e | 135 | // the primary service and individual characteristics |
| Rohit Grover |
22:c6ee8136847e | 136 | #define CFG_CUSTOM_UUID_BASE "\x6E\x40\x00\x00\xB5\xA3\xF3\x93\xE0\xA9\xE5\x0E\x24\xDC\xCA\x9E" |
| Rohit Grover |
22:c6ee8136847e | 137 | |
| Rohit Grover |
22:c6ee8136847e | 138 | uint8_t uuid_type = custom_add_uuid_base(CFG_CUSTOM_UUID_BASE); |
| Rohit Grover |
22:c6ee8136847e | 139 | ASSERT(uuid_type > 0, ERROR_NOT_FOUND); |
| Rohit Grover |
22:c6ee8136847e | 140 | |
| Rohit Grover |
22:c6ee8136847e | 141 | // We can now safely add the primary service and any characteristics |
| Rohit Grover |
22:c6ee8136847e | 142 | // for our custom service ... |
| Rohit Grover |
22:c6ee8136847e | 143 | |
| Rohit Grover |
22:c6ee8136847e | 144 | @endcode |
| Rohit Grover |
22:c6ee8136847e | 145 | */ |
| Rohit Grover |
22:c6ee8136847e | 146 | /**************************************************************************/ |
| Rohit Grover |
22:c6ee8136847e | 147 | uint8_t custom_add_uuid_base(uint8_t const *const p_uuid_base) |
| Rohit Grover |
22:c6ee8136847e | 148 | { |
| Rohit Grover |
22:c6ee8136847e | 149 | ble_uuid128_t base_uuid; |
| Rohit Grover |
22:c6ee8136847e | 150 | uint8_t uuid_type = 0; |
| Rohit Grover |
22:c6ee8136847e | 151 | |
| Rohit Grover |
22:c6ee8136847e | 152 | /* Reverse the bytes since ble_uuid128_t is LSB */ |
| rgrover1 | 97:e95e35845e1c | 153 | for (unsigned i = 0; i < LENGTH_OF_LONG_UUID; i++) { |
| rgrover1 | 97:e95e35845e1c | 154 | base_uuid.uuid128[i] = p_uuid_base[LENGTH_OF_LONG_UUID - 1 - i]; |
| Rohit Grover |
22:c6ee8136847e | 155 | } |
| Rohit Grover |
22:c6ee8136847e | 156 | |
| Rohit Grover |
22:c6ee8136847e | 157 | ASSERT_INT( ERROR_NONE, sd_ble_uuid_vs_add( &base_uuid, &uuid_type ), 0); |
| Rohit Grover |
22:c6ee8136847e | 158 | |
| Rohit Grover |
22:c6ee8136847e | 159 | return uuid_type; |
| Rohit Grover |
22:c6ee8136847e | 160 | } |
| Rohit Grover |
22:c6ee8136847e | 161 | |
| Rohit Grover |
22:c6ee8136847e | 162 | /**************************************************************************/ |
| Rohit Grover |
22:c6ee8136847e | 163 | /*! |
| Rohit Grover |
22:c6ee8136847e | 164 | |
| Rohit Grover |
22:c6ee8136847e | 165 | */ |
| Rohit Grover |
22:c6ee8136847e | 166 | /**************************************************************************/ |
| Rohit Grover |
22:c6ee8136847e | 167 | error_t custom_decode_uuid_base(uint8_t const *const p_uuid_base, |
| Rohit Grover |
22:c6ee8136847e | 168 | ble_uuid_t *p_uuid) |
| Rohit Grover |
22:c6ee8136847e | 169 | { |
| Rohit Grover |
56:a1071b629aa3 | 170 | LongUUIDBytes_t uuid_base_le; |
| Rohit Grover |
22:c6ee8136847e | 171 | |
| Rohit Grover |
22:c6ee8136847e | 172 | /* Reverse the bytes since ble_uuid128_t is LSB */ |
| rgrover1 | 97:e95e35845e1c | 173 | for (uint8_t i = 0; i < LENGTH_OF_LONG_UUID; i++) { |
| rgrover1 | 97:e95e35845e1c | 174 | uuid_base_le[i] = p_uuid_base[LENGTH_OF_LONG_UUID - 1 - i]; |
| Rohit Grover |
22:c6ee8136847e | 175 | } |
| Rohit Grover |
22:c6ee8136847e | 176 | |
| rgrover1 | 97:e95e35845e1c | 177 | ASSERT_STATUS( sd_ble_uuid_decode(LENGTH_OF_LONG_UUID, uuid_base_le, p_uuid)); |
| Rohit Grover |
22:c6ee8136847e | 178 | |
| Rohit Grover |
22:c6ee8136847e | 179 | return ERROR_NONE; |
| Rohit Grover |
22:c6ee8136847e | 180 | } |
| Rohit Grover |
22:c6ee8136847e | 181 | |
| Rohit Grover |
22:c6ee8136847e | 182 | /**************************************************************************/ |
| Rohit Grover |
22:c6ee8136847e | 183 | /*! |
| Rohit Grover |
22:c6ee8136847e | 184 | @brief Adds a new characteristic to the custom service, assigning |
| Rohit Grover |
22:c6ee8136847e | 185 | properties, a UUID add-on value, etc. |
| Rohit Grover |
22:c6ee8136847e | 186 | |
| Rohit Grover |
22:c6ee8136847e | 187 | @param[in] service_handle |
| Rohit Grover |
22:c6ee8136847e | 188 | @param[in] p_uuid The 16-bit value to add to the base UUID |
| Rohit Grover |
22:c6ee8136847e | 189 | for this characteristic (normally >1 |
| Rohit Grover |
22:c6ee8136847e | 190 | since 1 is typically used by the primary |
| Rohit Grover |
22:c6ee8136847e | 191 | service). |
| Rohit Grover |
22:c6ee8136847e | 192 | @param[in] char_props The characteristic properties, as |
| Rohit Grover |
22:c6ee8136847e | 193 | defined by ble_gatt_char_props_t |
| Rohit Grover |
22:c6ee8136847e | 194 | @param[in] max_length The maximum length of this characeristic |
| Rohit Grover |
22:c6ee8136847e | 195 | @param[in] p_char_handle |
| Rohit Grover |
22:c6ee8136847e | 196 | |
| Rohit Grover |
22:c6ee8136847e | 197 | @returns |
| Rohit Grover |
22:c6ee8136847e | 198 | @retval ERROR_NONE Everything executed normally |
| Rohit Grover |
22:c6ee8136847e | 199 | */ |
| Rohit Grover |
22:c6ee8136847e | 200 | /**************************************************************************/ |
| Rohit Grover |
22:c6ee8136847e | 201 | error_t custom_add_in_characteristic(uint16_t service_handle, |
| Rohit Grover |
22:c6ee8136847e | 202 | ble_uuid_t *p_uuid, |
| Rohit Grover |
22:c6ee8136847e | 203 | uint8_t properties, |
| Rohit Grover |
22:c6ee8136847e | 204 | uint8_t *p_data, |
| Rohit Grover |
22:c6ee8136847e | 205 | uint16_t min_length, |
| Rohit Grover |
22:c6ee8136847e | 206 | uint16_t max_length, |
| rgrover1 | 83:71302acf1804 | 207 | bool readAuthorization, |
| rgrover1 | 82:6c51cbe4bc12 | 208 | bool writeAuthorization, |
| Rohit Grover |
22:c6ee8136847e | 209 | ble_gatts_char_handles_t *p_char_handle) |
| Rohit Grover |
22:c6ee8136847e | 210 | { |
| Rohit Grover |
22:c6ee8136847e | 211 | /* Characteristic metadata */ |
| Rohit Grover |
22:c6ee8136847e | 212 | ble_gatts_attr_md_t cccd_md; |
| Rohit Grover |
22:c6ee8136847e | 213 | ble_gatt_char_props_t char_props; |
| Rohit Grover |
22:c6ee8136847e | 214 | |
| Rohit Grover |
22:c6ee8136847e | 215 | memcpy(&char_props, &properties, 1); |
| Rohit Grover |
22:c6ee8136847e | 216 | |
| Rohit Grover |
22:c6ee8136847e | 217 | if (char_props.notify || char_props.indicate) { |
| Rohit Grover |
22:c6ee8136847e | 218 | /* Notification requires cccd */ |
| Rohit Grover |
22:c6ee8136847e | 219 | memclr_( &cccd_md, sizeof(ble_gatts_attr_md_t)); |
| Rohit Grover |
22:c6ee8136847e | 220 | cccd_md.vloc = BLE_GATTS_VLOC_STACK; |
| Rohit Grover |
22:c6ee8136847e | 221 | BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.read_perm); |
| Rohit Grover |
22:c6ee8136847e | 222 | BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.write_perm); |
| Rohit Grover |
22:c6ee8136847e | 223 | } |
| Rohit Grover |
22:c6ee8136847e | 224 | |
| Rohit Grover |
22:c6ee8136847e | 225 | ble_gatts_char_md_t char_md = {0}; |
| Rohit Grover |
22:c6ee8136847e | 226 | |
| Rohit Grover |
22:c6ee8136847e | 227 | char_md.char_props = char_props; |
| Rohit Grover |
22:c6ee8136847e | 228 | char_md.p_cccd_md = |
| Rohit Grover |
22:c6ee8136847e | 229 | (char_props.notify || char_props.indicate) ? &cccd_md : NULL; |
| Rohit Grover |
22:c6ee8136847e | 230 | |
| Rohit Grover |
22:c6ee8136847e | 231 | /* Attribute declaration */ |
| rgrover1 | 84:658e5ec772a1 | 232 | ble_gatts_attr_md_t attr_md = {0}; |
| rgrover1 | 84:658e5ec772a1 | 233 | |
| rgrover1 | 84:658e5ec772a1 | 234 | attr_md.rd_auth = readAuthorization; |
| rgrover1 | 84:658e5ec772a1 | 235 | attr_md.wr_auth = writeAuthorization; |
| Rohit Grover |
22:c6ee8136847e | 236 | |
| Rohit Grover |
22:c6ee8136847e | 237 | attr_md.vloc = BLE_GATTS_VLOC_STACK; |
| Rohit Grover |
22:c6ee8136847e | 238 | attr_md.vlen = (min_length == max_length) ? 0 : 1; |
| Rohit Grover |
22:c6ee8136847e | 239 | |
| Rohit Grover |
22:c6ee8136847e | 240 | if (char_props.read || char_props.notify || char_props.indicate) { |
| Rohit Grover |
22:c6ee8136847e | 241 | BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.read_perm); |
| Rohit Grover |
22:c6ee8136847e | 242 | } |
| Rohit Grover |
22:c6ee8136847e | 243 | |
| marcuschang | 85:17fe69405098 | 244 | if (char_props.write || char_props.write_wo_resp) { |
| Rohit Grover |
22:c6ee8136847e | 245 | BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.write_perm); |
| Rohit Grover |
22:c6ee8136847e | 246 | } |
| Rohit Grover |
22:c6ee8136847e | 247 | |
| Rohit Grover |
22:c6ee8136847e | 248 | ble_gatts_attr_t attr_char_value = {0}; |
| Rohit Grover |
22:c6ee8136847e | 249 | |
| Rohit Grover |
22:c6ee8136847e | 250 | attr_char_value.p_uuid = p_uuid; |
| Rohit Grover |
22:c6ee8136847e | 251 | attr_char_value.p_attr_md = &attr_md; |
| Rohit Grover |
22:c6ee8136847e | 252 | attr_char_value.init_len = min_length; |
| Rohit Grover |
22:c6ee8136847e | 253 | attr_char_value.max_len = max_length; |
| Rohit Grover |
22:c6ee8136847e | 254 | attr_char_value.p_value = p_data; |
| Rohit Grover |
22:c6ee8136847e | 255 | |
| Rohit Grover |
22:c6ee8136847e | 256 | ASSERT_STATUS ( sd_ble_gatts_characteristic_add(service_handle, |
| Rohit Grover |
22:c6ee8136847e | 257 | &char_md, |
| Rohit Grover |
22:c6ee8136847e | 258 | &attr_char_value, |
| Rohit Grover |
22:c6ee8136847e | 259 | p_char_handle)); |
| Rohit Grover |
22:c6ee8136847e | 260 | |
| Rohit Grover |
22:c6ee8136847e | 261 | return ERROR_NONE; |
| Rohit Grover |
22:c6ee8136847e | 262 | } |
| Rohit Grover |
59:2819e564b613 | 263 | |
| Rohit Grover |
59:2819e564b613 | 264 | |
| Rohit Grover |
59:2819e564b613 | 265 | |
| Rohit Grover |
59:2819e564b613 | 266 | /**************************************************************************/ |
| Rohit Grover |
59:2819e564b613 | 267 | /*! |
| Rohit Grover |
59:2819e564b613 | 268 | @brief Adds a new descriptor to the custom service, assigning |
| Rohit Grover |
59:2819e564b613 | 269 | value, a UUID add-on value, etc. |
| Rohit Grover |
59:2819e564b613 | 270 | |
| Rohit Grover |
59:2819e564b613 | 271 | @param[in] char_handle |
| Rohit Grover |
59:2819e564b613 | 272 | @param[in] p_uuid The 16-bit value to add to the base UUID |
| Rohit Grover |
59:2819e564b613 | 273 | for this descriptor (normally >1 |
| Rohit Grover |
59:2819e564b613 | 274 | since 1 is typically used by the primary |
| Rohit Grover |
59:2819e564b613 | 275 | service). |
| Rohit Grover |
59:2819e564b613 | 276 | @param[in] max_length The maximum length of this descriptor |
| Rohit Grover |
59:2819e564b613 | 277 | |
| Rohit Grover |
59:2819e564b613 | 278 | @returns |
| Rohit Grover |
59:2819e564b613 | 279 | @retval ERROR_NONE Everything executed normally |
| Rohit Grover |
59:2819e564b613 | 280 | */ |
| Rohit Grover |
59:2819e564b613 | 281 | /**************************************************************************/ |
| Rohit Grover |
59:2819e564b613 | 282 | error_t custom_add_in_descriptor(uint16_t char_handle, |
| Rohit Grover |
59:2819e564b613 | 283 | ble_uuid_t *p_uuid, |
| Rohit Grover |
59:2819e564b613 | 284 | uint8_t *p_data, |
| Rohit Grover |
59:2819e564b613 | 285 | uint16_t min_length, |
| Rohit Grover |
59:2819e564b613 | 286 | uint16_t max_length, |
| Rohit Grover |
59:2819e564b613 | 287 | uint16_t *p_desc_handle) |
| Rohit Grover |
59:2819e564b613 | 288 | { |
| Rohit Grover |
59:2819e564b613 | 289 | /* Descriptor metadata */ |
| Rohit Grover |
59:2819e564b613 | 290 | ble_gatts_attr_md_t desc_md = {0}; |
| Rohit Grover |
59:2819e564b613 | 291 | |
| Rohit Grover |
59:2819e564b613 | 292 | desc_md.vloc = BLE_GATTS_VLOC_STACK; |
| Rohit Grover |
59:2819e564b613 | 293 | desc_md.vlen = (min_length == max_length) ? 0 : 1; |
| Rohit Grover |
59:2819e564b613 | 294 | |
| Rohit Grover |
59:2819e564b613 | 295 | /* Make it readable and writable */ |
| Rohit Grover |
59:2819e564b613 | 296 | BLE_GAP_CONN_SEC_MODE_SET_OPEN(&desc_md.read_perm); |
| Rohit Grover |
59:2819e564b613 | 297 | BLE_GAP_CONN_SEC_MODE_SET_OPEN(&desc_md.write_perm); |
| Rohit Grover |
59:2819e564b613 | 298 | |
| Rohit Grover |
59:2819e564b613 | 299 | ble_gatts_attr_t attr_desc = {0}; |
| Rohit Grover |
59:2819e564b613 | 300 | |
| Rohit Grover |
59:2819e564b613 | 301 | attr_desc.p_uuid = p_uuid; |
| Rohit Grover |
59:2819e564b613 | 302 | attr_desc.p_attr_md = &desc_md; |
| Rohit Grover |
59:2819e564b613 | 303 | attr_desc.init_len = min_length; |
| Rohit Grover |
59:2819e564b613 | 304 | attr_desc.max_len = max_length; |
| Rohit Grover |
59:2819e564b613 | 305 | attr_desc.p_value = p_data; |
| Rohit Grover |
59:2819e564b613 | 306 | |
| Rohit Grover |
59:2819e564b613 | 307 | ASSERT_STATUS ( sd_ble_gatts_descriptor_add(char_handle, |
| Rohit Grover |
59:2819e564b613 | 308 | &attr_desc, |
| Rohit Grover |
59:2819e564b613 | 309 | p_desc_handle)); |
| Rohit Grover |
59:2819e564b613 | 310 | |
| Rohit Grover |
59:2819e564b613 | 311 | return ERROR_NONE; |
| rgrover1 | 82:6c51cbe4bc12 | 312 | } |
