Lancaster University / nRF51822

Clone of the nRF51822 repository from github The correct home is https://github.com/lancaster-university/nRF51822

Dependencies:   nrf51-sdk

Dependents:   microbit-dal microbit-ble-open microbit-dal-eddystone microbit-dal-ble-accelerometer-example ... more

btle/custom/custom_helper.cpp@370:295f76db798e, 2015-07-06 (annotated)

Committer:
rgrover1
Date:
Mon Jul 06 10:13:26 2015 +0100
Revision:
370:295f76db798e
Parent:
362:6fa0d4d555f6
Child:
371:8f7d2137727a
Synchronized with git rev 9f72c4ba

Author: Rohit Grover

Release 0.3.7

=============



This is a minor set of enhancements mostly around reduce our global static

memory footprint.



Enhancements

~~~~~~~~~~~~



* Reduce the maximum number of CHARACTERISTICS and DESCRIPTORS that can be

  handled. This has memory implications for static global memory. It should

  be possible to re-architect our solution for add_characteristic() to not

  require these limits; hopefully we'll get there soon.



* Move nRF51GattServer::getInstance() into a .cpp file; same for nRF51Gap::getInstance().



* Reduce max bonds to managed by device-manager to 4; this has memory implications for static global memory.



* Reduce pStorage command queue size to 2; this has memory implications for static global memory.



* Replace uses of deprecated Gap::addr_type_t with Gap::AddressType_t.



* Some UUID-related types have moved into UUID class. Minor changes were needed to work around build errors.



Bugfixes

~~~~~~~~



* None.

Who changed what in which revision?

UserRevisionLine numberNew 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 {
rgrover1 285:55ac765bcc8d 26 UUID::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
rgrover1 285:55ac765bcc8d 41 lookupConvertedUUIDTable(const UUID::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 285:55ac765bcc8d 46 for (byteIndex = 0; byteIndex < UUID::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 285:55ac765bcc8d 58 if (byteIndex == UUID::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
rgrover1 285:55ac765bcc8d 68 addToConvertedUUIDTable(const UUID::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 285:55ac765bcc8d 74 memcpy(convertedUUIDTable[uuidTableEntries].uuid, 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 {
rgrover1 109:425faebc8201 96 ble_uuid_t nordicUUID;
rgrover1 109:425faebc8201 97 nordicUUID.uuid = uuid.getShortUUID();
rgrover1 109:425faebc8201 98 nordicUUID.type = BLE_UUID_TYPE_UNKNOWN; /* to be set below */
Rohit Grover 22:c6ee8136847e 99
Rohit Grover 22:c6ee8136847e 100 if (uuid.shortOrLong() == UUID::UUID_TYPE_SHORT) {
Rohit Grover 22:c6ee8136847e 101 nordicUUID.type = BLE_UUID_TYPE_BLE;
Rohit Grover 22:c6ee8136847e 102 } else {
Rohit Grover 22:c6ee8136847e 103 if (!lookupConvertedUUIDTable(uuid.getBaseUUID(), &nordicUUID.type)) {
Rohit Grover 22:c6ee8136847e 104 nordicUUID.type = custom_add_uuid_base(uuid.getBaseUUID());
Rohit Grover 22:c6ee8136847e 105 addToConvertedUUIDTable(uuid.getBaseUUID(), nordicUUID.type);
Rohit Grover 22:c6ee8136847e 106 }
Rohit Grover 22:c6ee8136847e 107 }
Rohit Grover 22:c6ee8136847e 108
Rohit Grover 22:c6ee8136847e 109 return nordicUUID;
Rohit Grover 22:c6ee8136847e 110 }
Rohit Grover 22:c6ee8136847e 111
Rohit Grover 22:c6ee8136847e 112 /**************************************************************************/
Rohit Grover 22:c6ee8136847e 113 /*!
Rohit Grover 22:c6ee8136847e 114 @brief Adds the base UUID to the custom service. All UUIDs used
Rohit Grover 22:c6ee8136847e 115 by this service are based on this 128-bit UUID.
Rohit Grover 22:c6ee8136847e 116
Rohit Grover 22:c6ee8136847e 117 @note This UUID needs to be added to the SoftDevice stack before
Rohit Grover 22:c6ee8136847e 118 adding the service's primary service via
Rohit Grover 22:c6ee8136847e 119 'sd_ble_gatts_service_add'
Rohit Grover 22:c6ee8136847e 120
Rohit Grover 22:c6ee8136847e 121 @param[in] p_uuid_base A pointer to the 128-bit UUID array (8*16)
Rohit Grover 22:c6ee8136847e 122
Rohit Grover 22:c6ee8136847e 123 @returns The UUID type.
Rohit Grover 22:c6ee8136847e 124 A return value of 0 should be considered an error.
Rohit Grover 22:c6ee8136847e 125
Rohit Grover 22:c6ee8136847e 126 @retval 0x00 BLE_UUID_TYPE_UNKNOWN
Rohit Grover 22:c6ee8136847e 127 @retval 0x01 BLE_UUID_TYPE_BLE
Rohit Grover 22:c6ee8136847e 128 @retval 0x02 BLE_UUID_TYPE_VENDOR_BEGIN
Rohit Grover 22:c6ee8136847e 129
Rohit Grover 22:c6ee8136847e 130 @section EXAMPLE
Rohit Grover 22:c6ee8136847e 131 @code
Rohit Grover 22:c6ee8136847e 132
Rohit Grover 22:c6ee8136847e 133 // Take note that bytes 2/3 are blank since these are used to identify
Rohit Grover 22:c6ee8136847e 134 // the primary service and individual characteristics
Rohit Grover 22:c6ee8136847e 135 #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 136
Rohit Grover 22:c6ee8136847e 137 uint8_t uuid_type = custom_add_uuid_base(CFG_CUSTOM_UUID_BASE);
Rohit Grover 22:c6ee8136847e 138 ASSERT(uuid_type > 0, ERROR_NOT_FOUND);
Rohit Grover 22:c6ee8136847e 139
Rohit Grover 22:c6ee8136847e 140 // We can now safely add the primary service and any characteristics
Rohit Grover 22:c6ee8136847e 141 // for our custom service ...
Rohit Grover 22:c6ee8136847e 142
Rohit Grover 22:c6ee8136847e 143 @endcode
Rohit Grover 22:c6ee8136847e 144 */
Rohit Grover 22:c6ee8136847e 145 /**************************************************************************/
Rohit Grover 22:c6ee8136847e 146 uint8_t custom_add_uuid_base(uint8_t const *const p_uuid_base)
Rohit Grover 22:c6ee8136847e 147 {
Rohit Grover 22:c6ee8136847e 148 ble_uuid128_t base_uuid;
Rohit Grover 22:c6ee8136847e 149 uint8_t uuid_type = 0;
Rohit Grover 22:c6ee8136847e 150
Rohit Grover 22:c6ee8136847e 151 /* Reverse the bytes since ble_uuid128_t is LSB */
rgrover1 285:55ac765bcc8d 152 for (unsigned i = 0; i < UUID::LENGTH_OF_LONG_UUID; i++) {
rgrover1 285:55ac765bcc8d 153 base_uuid.uuid128[i] = p_uuid_base[UUID::LENGTH_OF_LONG_UUID - 1 - i];
Rohit Grover 22:c6ee8136847e 154 }
Rohit Grover 22:c6ee8136847e 155
Rohit Grover 22:c6ee8136847e 156 ASSERT_INT( ERROR_NONE, sd_ble_uuid_vs_add( &base_uuid, &uuid_type ), 0);
Rohit Grover 22:c6ee8136847e 157
Rohit Grover 22:c6ee8136847e 158 return uuid_type;
Rohit Grover 22:c6ee8136847e 159 }
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 error_t custom_decode_uuid_base(uint8_t const *const p_uuid_base,
Rohit Grover 22:c6ee8136847e 167 ble_uuid_t *p_uuid)
Rohit Grover 22:c6ee8136847e 168 {
rgrover1 285:55ac765bcc8d 169 UUID::LongUUIDBytes_t uuid_base_le;
Rohit Grover 22:c6ee8136847e 170
Rohit Grover 22:c6ee8136847e 171 /* Reverse the bytes since ble_uuid128_t is LSB */
rgrover1 285:55ac765bcc8d 172 for (uint8_t i = 0; i < UUID::LENGTH_OF_LONG_UUID; i++) {
rgrover1 285:55ac765bcc8d 173 uuid_base_le[i] = p_uuid_base[UUID::LENGTH_OF_LONG_UUID - 1 - i];
Rohit Grover 22:c6ee8136847e 174 }
Rohit Grover 22:c6ee8136847e 175
rgrover1 285:55ac765bcc8d 176 ASSERT_STATUS( sd_ble_uuid_decode(UUID::LENGTH_OF_LONG_UUID, uuid_base_le, p_uuid));
Rohit Grover 22:c6ee8136847e 177
Rohit Grover 22:c6ee8136847e 178 return ERROR_NONE;
Rohit Grover 22:c6ee8136847e 179 }
Rohit Grover 22:c6ee8136847e 180
Rohit Grover 22:c6ee8136847e 181 /**************************************************************************/
Rohit Grover 22:c6ee8136847e 182 /*!
Rohit Grover 22:c6ee8136847e 183 @brief Adds a new characteristic to the custom service, assigning
Rohit Grover 22:c6ee8136847e 184 properties, a UUID add-on value, etc.
Rohit Grover 22:c6ee8136847e 185
Rohit Grover 22:c6ee8136847e 186 @param[in] service_handle
Rohit Grover 22:c6ee8136847e 187 @param[in] p_uuid The 16-bit value to add to the base UUID
Rohit Grover 22:c6ee8136847e 188 for this characteristic (normally >1
Rohit Grover 22:c6ee8136847e 189 since 1 is typically used by the primary
Rohit Grover 22:c6ee8136847e 190 service).
Rohit Grover 22:c6ee8136847e 191 @param[in] char_props The characteristic properties, as
Rohit Grover 22:c6ee8136847e 192 defined by ble_gatt_char_props_t
Rohit Grover 22:c6ee8136847e 193 @param[in] max_length The maximum length of this characeristic
rgrover1 126:e6114201f092 194 @param[out] p_char_handle
Rohit Grover 22:c6ee8136847e 195
Rohit Grover 22:c6ee8136847e 196 @returns
Rohit Grover 22:c6ee8136847e 197 @retval ERROR_NONE Everything executed normally
Rohit Grover 22:c6ee8136847e 198 */
Rohit Grover 22:c6ee8136847e 199 /**************************************************************************/
rgrover1 156:8e97c41fd7ab 200 error_t custom_add_in_characteristic(uint16_t service_handle,
rgrover1 156:8e97c41fd7ab 201 ble_uuid_t *p_uuid,
rgrover1 156:8e97c41fd7ab 202 uint8_t properties,
rgrover1 370:295f76db798e 203 Gap::SecurityMode_t requiredSecurity,
rgrover1 156:8e97c41fd7ab 204 uint8_t *p_data,
rgrover1 156:8e97c41fd7ab 205 uint16_t min_length,
rgrover1 156:8e97c41fd7ab 206 uint16_t max_length,
rgrover1 156:8e97c41fd7ab 207 const uint8_t *userDescriptionDescriptorValuePtr,
rgrover1 156:8e97c41fd7ab 208 uint16_t userDescriptionDescriptorValueLen,
rgrover1 156:8e97c41fd7ab 209 bool readAuthorization,
rgrover1 156:8e97c41fd7ab 210 bool writeAuthorization,
rgrover1 156:8e97c41fd7ab 211 ble_gatts_char_handles_t *p_char_handle)
Rohit Grover 22:c6ee8136847e 212 {
Rohit Grover 22:c6ee8136847e 213 /* Characteristic metadata */
Rohit Grover 22:c6ee8136847e 214 ble_gatts_attr_md_t cccd_md;
Rohit Grover 22:c6ee8136847e 215 ble_gatt_char_props_t char_props;
Rohit Grover 22:c6ee8136847e 216
Rohit Grover 22:c6ee8136847e 217 memcpy(&char_props, &properties, 1);
Rohit Grover 22:c6ee8136847e 218
Rohit Grover 22:c6ee8136847e 219 if (char_props.notify || char_props.indicate) {
Rohit Grover 22:c6ee8136847e 220 /* Notification requires cccd */
Rohit Grover 22:c6ee8136847e 221 memclr_( &cccd_md, sizeof(ble_gatts_attr_md_t));
Rohit Grover 22:c6ee8136847e 222 cccd_md.vloc = BLE_GATTS_VLOC_STACK;
Rohit Grover 22:c6ee8136847e 223 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.read_perm);
Rohit Grover 22:c6ee8136847e 224 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.write_perm);
Rohit Grover 22:c6ee8136847e 225 }
Rohit Grover 22:c6ee8136847e 226
Rohit Grover 22:c6ee8136847e 227 ble_gatts_char_md_t char_md = {0};
Rohit Grover 22:c6ee8136847e 228
Rohit Grover 22:c6ee8136847e 229 char_md.char_props = char_props;
Rohit Grover 22:c6ee8136847e 230 char_md.p_cccd_md =
Rohit Grover 22:c6ee8136847e 231 (char_props.notify || char_props.indicate) ? &cccd_md : NULL;
rgrover1 119:3ba3e377b972 232 if ((userDescriptionDescriptorValueLen > 0) && (userDescriptionDescriptorValuePtr != NULL)) {
rgrover1 119:3ba3e377b972 233 char_md.p_char_user_desc = const_cast<uint8_t *>(userDescriptionDescriptorValuePtr);
rgrover1 119:3ba3e377b972 234 char_md.char_user_desc_max_size = userDescriptionDescriptorValueLen;
rgrover1 119:3ba3e377b972 235 char_md.char_user_desc_size = userDescriptionDescriptorValueLen;
rgrover1 119:3ba3e377b972 236 }
Rohit Grover 22:c6ee8136847e 237
Rohit Grover 22:c6ee8136847e 238 /* Attribute declaration */
rgrover1 84:658e5ec772a1 239 ble_gatts_attr_md_t attr_md = {0};
rgrover1 84:658e5ec772a1 240
rgrover1 84:658e5ec772a1 241 attr_md.rd_auth = readAuthorization;
rgrover1 84:658e5ec772a1 242 attr_md.wr_auth = writeAuthorization;
Rohit Grover 22:c6ee8136847e 243
Rohit Grover 22:c6ee8136847e 244 attr_md.vloc = BLE_GATTS_VLOC_STACK;
Rohit Grover 22:c6ee8136847e 245 attr_md.vlen = (min_length == max_length) ? 0 : 1;
Rohit Grover 22:c6ee8136847e 246
Rohit Grover 22:c6ee8136847e 247 if (char_props.read || char_props.notify || char_props.indicate) {
rgrover1 131:b21411170d00 248 switch (requiredSecurity) {
rgrover1 370:295f76db798e 249 case Gap::SECURITY_MODE_ENCRYPTION_OPEN_LINK :
rgrover1 131:b21411170d00 250 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.read_perm);
rgrover1 131:b21411170d00 251 break;
rgrover1 370:295f76db798e 252 case Gap::SECURITY_MODE_ENCRYPTION_NO_MITM :
rgrover1 131:b21411170d00 253 BLE_GAP_CONN_SEC_MODE_SET_ENC_NO_MITM(&attr_md.read_perm);
rgrover1 131:b21411170d00 254 break;
rgrover1 370:295f76db798e 255 case Gap::SECURITY_MODE_ENCRYPTION_WITH_MITM :
rgrover1 131:b21411170d00 256 BLE_GAP_CONN_SEC_MODE_SET_ENC_WITH_MITM(&attr_md.read_perm);
rgrover1 131:b21411170d00 257 break;
rgrover1 370:295f76db798e 258 case Gap::SECURITY_MODE_SIGNED_NO_MITM :
rgrover1 131:b21411170d00 259 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_NO_MITM(&attr_md.read_perm);
rgrover1 131:b21411170d00 260 break;
rgrover1 370:295f76db798e 261 case Gap::SECURITY_MODE_SIGNED_WITH_MITM :
rgrover1 131:b21411170d00 262 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_WITH_MITM(&attr_md.read_perm);
rgrover1 131:b21411170d00 263 break;
rgrover1 157:0fa76927dcfe 264 default:
rgrover1 157:0fa76927dcfe 265 break;
rgrover1 131:b21411170d00 266 };
Rohit Grover 22:c6ee8136847e 267 }
Rohit Grover 22:c6ee8136847e 268
marcuschang 85:17fe69405098 269 if (char_props.write || char_props.write_wo_resp) {
rgrover1 131:b21411170d00 270 switch (requiredSecurity) {
rgrover1 370:295f76db798e 271 case Gap::SECURITY_MODE_ENCRYPTION_OPEN_LINK :
rgrover1 131:b21411170d00 272 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.write_perm);
rgrover1 131:b21411170d00 273 break;
rgrover1 370:295f76db798e 274 case Gap::SECURITY_MODE_ENCRYPTION_NO_MITM :
rgrover1 131:b21411170d00 275 BLE_GAP_CONN_SEC_MODE_SET_ENC_NO_MITM(&attr_md.write_perm);
rgrover1 131:b21411170d00 276 break;
rgrover1 370:295f76db798e 277 case Gap::SECURITY_MODE_ENCRYPTION_WITH_MITM :
rgrover1 131:b21411170d00 278 BLE_GAP_CONN_SEC_MODE_SET_ENC_WITH_MITM(&attr_md.write_perm);
rgrover1 131:b21411170d00 279 break;
rgrover1 370:295f76db798e 280 case Gap::SECURITY_MODE_SIGNED_NO_MITM :
rgrover1 131:b21411170d00 281 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_NO_MITM(&attr_md.write_perm);
rgrover1 131:b21411170d00 282 break;
rgrover1 370:295f76db798e 283 case Gap::SECURITY_MODE_SIGNED_WITH_MITM :
rgrover1 131:b21411170d00 284 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_WITH_MITM(&attr_md.write_perm);
rgrover1 131:b21411170d00 285 break;
rgrover1 157:0fa76927dcfe 286 default:
rgrover1 157:0fa76927dcfe 287 break;
rgrover1 131:b21411170d00 288 };
Rohit Grover 22:c6ee8136847e 289 }
Rohit Grover 22:c6ee8136847e 290
Rohit Grover 22:c6ee8136847e 291 ble_gatts_attr_t attr_char_value = {0};
Rohit Grover 22:c6ee8136847e 292
Rohit Grover 22:c6ee8136847e 293 attr_char_value.p_uuid = p_uuid;
Rohit Grover 22:c6ee8136847e 294 attr_char_value.p_attr_md = &attr_md;
Rohit Grover 22:c6ee8136847e 295 attr_char_value.init_len = min_length;
Rohit Grover 22:c6ee8136847e 296 attr_char_value.max_len = max_length;
Rohit Grover 22:c6ee8136847e 297 attr_char_value.p_value = p_data;
Rohit Grover 22:c6ee8136847e 298
Rohit Grover 22:c6ee8136847e 299 ASSERT_STATUS ( sd_ble_gatts_characteristic_add(service_handle,
Rohit Grover 22:c6ee8136847e 300 &char_md,
Rohit Grover 22:c6ee8136847e 301 &attr_char_value,
Rohit Grover 22:c6ee8136847e 302 p_char_handle));
Rohit Grover 22:c6ee8136847e 303
Rohit Grover 22:c6ee8136847e 304 return ERROR_NONE;
Rohit Grover 22:c6ee8136847e 305 }
Rohit Grover 59:2819e564b613 306
Rohit Grover 59:2819e564b613 307
Rohit Grover 59:2819e564b613 308
Rohit Grover 59:2819e564b613 309 /**************************************************************************/
Rohit Grover 59:2819e564b613 310 /*!
Rohit Grover 59:2819e564b613 311 @brief Adds a new descriptor to the custom service, assigning
Rohit Grover 59:2819e564b613 312 value, a UUID add-on value, etc.
Rohit Grover 59:2819e564b613 313
Rohit Grover 59:2819e564b613 314 @param[in] char_handle
Rohit Grover 59:2819e564b613 315 @param[in] p_uuid The 16-bit value to add to the base UUID
Rohit Grover 59:2819e564b613 316 for this descriptor (normally >1
Rohit Grover 59:2819e564b613 317 since 1 is typically used by the primary
Rohit Grover 59:2819e564b613 318 service).
Rohit Grover 59:2819e564b613 319 @param[in] max_length The maximum length of this descriptor
Rohit Grover 59:2819e564b613 320
Rohit Grover 59:2819e564b613 321 @returns
Rohit Grover 59:2819e564b613 322 @retval ERROR_NONE Everything executed normally
Rohit Grover 59:2819e564b613 323 */
Rohit Grover 59:2819e564b613 324 /**************************************************************************/
Rohit Grover 59:2819e564b613 325 error_t custom_add_in_descriptor(uint16_t char_handle,
Rohit Grover 59:2819e564b613 326 ble_uuid_t *p_uuid,
Rohit Grover 59:2819e564b613 327 uint8_t *p_data,
Rohit Grover 59:2819e564b613 328 uint16_t min_length,
Rohit Grover 59:2819e564b613 329 uint16_t max_length,
Rohit Grover 59:2819e564b613 330 uint16_t *p_desc_handle)
Rohit Grover 59:2819e564b613 331 {
Rohit Grover 59:2819e564b613 332 /* Descriptor metadata */
Rohit Grover 59:2819e564b613 333 ble_gatts_attr_md_t desc_md = {0};
Rohit Grover 59:2819e564b613 334
Rohit Grover 59:2819e564b613 335 desc_md.vloc = BLE_GATTS_VLOC_STACK;
Rohit Grover 59:2819e564b613 336 desc_md.vlen = (min_length == max_length) ? 0 : 1;
Rohit Grover 59:2819e564b613 337
Rohit Grover 59:2819e564b613 338 /* Make it readable and writable */
Rohit Grover 59:2819e564b613 339 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&desc_md.read_perm);
Rohit Grover 59:2819e564b613 340 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&desc_md.write_perm);
Rohit Grover 59:2819e564b613 341
Rohit Grover 59:2819e564b613 342 ble_gatts_attr_t attr_desc = {0};
Rohit Grover 59:2819e564b613 343
Rohit Grover 59:2819e564b613 344 attr_desc.p_uuid = p_uuid;
Rohit Grover 59:2819e564b613 345 attr_desc.p_attr_md = &desc_md;
Rohit Grover 59:2819e564b613 346 attr_desc.init_len = min_length;
Rohit Grover 59:2819e564b613 347 attr_desc.max_len = max_length;
Rohit Grover 59:2819e564b613 348 attr_desc.p_value = p_data;
Rohit Grover 59:2819e564b613 349
Rohit Grover 59:2819e564b613 350 ASSERT_STATUS ( sd_ble_gatts_descriptor_add(char_handle,
Rohit Grover 59:2819e564b613 351 &attr_desc,
Rohit Grover 59:2819e564b613 352 p_desc_handle));
Rohit Grover 59:2819e564b613 353
Rohit Grover 59:2819e564b613 354 return ERROR_NONE;
rgrover1 82:6c51cbe4bc12 355 }