Janek Mann / nRF51822_openwear

Openwear requires RC oscillator to be used

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 12:e151f55035b8, committed 2014-05-29

Comitter:
Rohit Grover
Date:
Thu May 29 08:26:42 2014 +0100
Parent:
11:6277845e1cc5
Child:
13:b8251438f5c4
Commit message:
rename to convert_to_nordic_uuid()

Changed in this revision

btle/custom/custom_helper.cpp Show annotated file Show diff for this revision Revisions of this file
btle/custom/custom_helper.h Show annotated file Show diff for this revision Revisions of this file
nRF51GattServer.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/btle/custom/custom_helper.cpp	Thu May 29 08:24:36 2014 +0100
+++ b/btle/custom/custom_helper.cpp	Thu May 29 08:26:42 2014 +0100
@@ -83,7 +83,7 @@
  *              3-byte UUID (containing a type and 16-bit UUID) representation
  *              to be used with SVC calls.
  */
-ble_uuid_t custom_convert_to_transport_uuid(const UUID &uuid)
+ble_uuid_t custom_convert_to_nordic_uuid(const UUID &uuid)
 {
     ble_uuid_t nordicUUID = {
         .uuid = uuid.value,

--- a/btle/custom/custom_helper.h	Thu May 29 08:24:36 2014 +0100
+++ b/btle/custom/custom_helper.h	Thu May 29 08:26:42 2014 +0100
@@ -28,7 +28,7 @@
 uint8_t custom_add_uuid_base(uint8_t const *const p_uuid_base);
 error_t custom_decode_uuid(uint8_t const *const p_uuid_base,
                            ble_uuid_t          *p_uuid);
-ble_uuid_t custom_convert_to_transport_uuid(const UUID &uuid);
+ble_uuid_t custom_convert_to_nordic_uuid(const UUID &uuid);
 
 error_t custom_add_in_characteristic(uint16_t                  service_handle,
                                      ble_uuid_t               *p_uuid,

--- a/nRF51GattServer.cpp	Thu May 29 08:24:36 2014 +0100
+++ b/nRF51GattServer.cpp	Thu May 29 08:26:42 2014 +0100
@@ -46,7 +46,7 @@
 
     /* Add the service to the nRF51 */
     ble_uuid_t nordicUUID;
-    nordicUUID = custom_convert_to_transport_uuid(service.primaryServiceID);
+    nordicUUID = custom_convert_to_nordic_uuid(service.primaryServiceID);
     ASSERT( ERROR_NONE ==
             sd_ble_gatts_service_add(BLE_GATTS_SRVC_TYPE_PRIMARY,
                                      &nordicUUID,
@@ -57,7 +57,7 @@
     for (uint8_t i = 0; i < service.characteristicCount; i++) {
         GattCharacteristic *p_char = service.characteristics[i];
 
-        nordicUUID = custom_convert_to_transport_uuid(p_char->uuid);
+        nordicUUID = custom_convert_to_nordic_uuid(p_char->uuid);
 
         ASSERT ( ERROR_NONE ==
                  custom_add_in_characteristic(service.handle,