Revision 557:e4218a32be51, committed 2016-01-11

Comitter:

vcoubard

Date:

Mon Jan 11 10:19:13 2016 +0000

Parent:

556:ecc60b339dfa

Child:

558:c4b56f9d6f3b

Commit message:

Synchronized with git rev e7492efa
Author: Rohit Grover
Merge branch 'develop'

Changed in this revision

--- a/module.json	Mon Jan 11 10:19:12 2016 +0000
+++ b/module.json	Mon Jan 11 10:19:13 2016 +0000
@@ -1,6 +1,6 @@
 {
   "name": "ble-nrf51822",
-  "version": "2.2.0",
+  "version": "2.2.3",
   "description": "Nordic stack and drivers for the mbed BLE API.",
   "keywords": [
     "Bluetooth",
@@ -24,7 +24,7 @@
     }
   ],
   "dependencies": {
-    "ble": "^2.1.7",
+    "ble": "^2.1.11",
     "nrf51-sdk": "^1.0.0"
   },
   "extraIncludes": [

--- a/source/btle/custom/custom_helper.cpp	Mon Jan 11 10:19:12 2016 +0000
+++ b/source/btle/custom/custom_helper.cpp	Mon Jan 11 10:19:13 2016 +0000
@@ -148,9 +148,8 @@
     ble_uuid128_t base_uuid;
     uint8_t       uuid_type = 0;
 
-    /* Reverse the bytes since ble_uuid128_t is LSB */
     for (unsigned i = 0; i < UUID::LENGTH_OF_LONG_UUID; i++) {
-        base_uuid.uuid128[i] = p_uuid_base[UUID::LENGTH_OF_LONG_UUID - 1 - i];
+        base_uuid.uuid128[i] = p_uuid_base[i];
     }
 
     ASSERT_INT( ERROR_NONE, sd_ble_uuid_vs_add( &base_uuid, &uuid_type ), 0);
@@ -168,9 +167,8 @@
 {
     UUID::LongUUIDBytes_t uuid_base_le;
 
-    /* Reverse the bytes since ble_uuid128_t is LSB */
     for (uint8_t i = 0; i < UUID::LENGTH_OF_LONG_UUID; i++) {
-        uuid_base_le[i] = p_uuid_base[UUID::LENGTH_OF_LONG_UUID - 1 - i];
+        uuid_base_le[i] = p_uuid_base[i];
     }
 
     ASSERT_STATUS( sd_ble_uuid_decode(UUID::LENGTH_OF_LONG_UUID, uuid_base_le, p_uuid));

--- a/source/nRF5xServiceDiscovery.cpp	Mon Jan 11 10:19:12 2016 +0000
+++ b/source/nRF5xServiceDiscovery.cpp	Mon Jan 11 10:19:13 2016 +0000
@@ -254,7 +254,7 @@
             memcpy(uuid, response->handle_value[0].p_value, UUID::LENGTH_OF_LONG_UUID);
 
             unsigned serviceIndex = serviceUUIDDiscoveryQueue.dequeue();
-            services[serviceIndex].setupLongUUID(uuid);
+            services[serviceIndex].setupLongUUID(uuid, UUID::LSB);
 
             serviceUUIDDiscoveryQueue.triggerFirst();
         } else {
@@ -267,7 +267,7 @@
             memcpy(uuid, &(response->handle_value[0].p_value[3]), UUID::LENGTH_OF_LONG_UUID);
 
             unsigned charIndex = charUUIDDiscoveryQueue.dequeue();
-            characteristics[charIndex].setupLongUUID(uuid);
+            characteristics[charIndex].setupLongUUID(uuid, UUID::LSB);
 
             charUUIDDiscoveryQueue.triggerFirst();
         } else {

--- a/source/supress-warnings.cmake	Mon Jan 11 10:19:12 2016 +0000
+++ b/source/supress-warnings.cmake	Mon Jan 11 10:19:13 2016 +0000
@@ -16,6 +16,6 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set_target_properties(ble-nrf51822
-        PROPERTIES COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers"
+        PROPERTIES COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-variable -Wno-unused-parameter -Wno-unused-function -Wno-missing-field-initializers"
     )
 endif()
\ No newline at end of file