projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6a6c0ab)
[ARDUINO][BLE] Changed UUID's as per OIC Spec
authorAbhishek Sharma <ce.abhishek@samsung.com>
Tue, 21 Jul 2015 10:55:36 +0000 (16:25 +0530)
committerErich Keane <erich.keane@intel.com>
Wed, 22 Jul 2015 21:58:11 +0000 (21:58 +0000)
Updated RBL library patch to advertise new UUID's as per OIC spec

Change-Id: I50c50d59779922b2c16e86156fe43ec0a62cde52
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
resource/csdk/connectivity/lib/arduino/RBL_nRF8001.patch patch | blob | history

diff --git a/resource/csdk/connectivity/lib/arduino/RBL_nRF8001.patch b/resource/csdk/connectivity/lib/arduino/RBL_nRF8001.patch
index ab0e231..5b46df5 100644 (file)
--- a/resource/csdk/connectivity/lib/arduino/RBL_nRF8001.patch
+++ b/resource/csdk/connectivity/lib/arduino/RBL_nRF8001.patch
@@ -134,4 +134,141 @@ diff -rupN RBL_nRF8001_old/RBL_nRF8001.h RBL_nRF8001/RBL_nRF8001.h
  
  #endif
  
-
+diff -rupN RBL_nRF8001_old/RBL_nRF8001.xml RBL_nRF8001/RBL_nRF8001.xml
+--- RBL_nRF8001_old/RBL_nRF8001.xml    2015-01-14 01:52:26.000000000 +0530
++++ RBL_nRF8001/RBL_nRF8001.xml        2015-07-21 14:27:18.000000000 +0530
+@@ -5,10 +5,10 @@
+     <Device>nRF8001_Dx</Device>
+     <Service Type="local" PrimaryService="true">
+         <Name>UART over BTLE</Name>
+-        <Uuid BaseUUID="713D0000503E4C75BA943148F18D941E" BaseUUIDName="Custom UART">0000</Uuid>
++        <Uuid BaseUUID="ADE30000C7844F63A987EB69F70EE816" BaseUUIDName="Custom UART">D529</Uuid>
+         <Characteristic>
+             <Name>UART RX</Name>
+-            <Uuid BaseUUID="713D0000503E4C75BA943148F18D941E" BaseUUIDName="Custom UART">0003</Uuid>
++            <Uuid BaseUUID="AD7B000046374B8690B69D787F03D218" BaseUUIDName="Custom UART2">334f</Uuid>
+             <DefaultValue></DefaultValue>
+             <UsePresentationFormat>0</UsePresentationFormat>
+             <MaxDataLength>20</MaxDataLength>
+@@ -30,7 +30,7 @@
+         </Characteristic>
+         <Characteristic>
+             <Name>UART TX</Name>
+-            <Uuid BaseUUID="713D0000503E4C75BA943148F18D941E" BaseUUIDName="Custom UART">0002</Uuid>
++            <Uuid BaseUUID="E9240000458042C4883195048216B256" BaseUUIDName="Custom UART3">1982</Uuid>
+             <DefaultValue></DefaultValue>
+             <UsePresentationFormat>0</UsePresentationFormat>
+             <MaxDataLength>20</MaxDataLength>
+@@ -111,7 +111,7 @@
+         <AddServiceUpdateCharacteristicPipe>true</AddServiceUpdateCharacteristicPipe>
+         <TimingChangeDelay>5</TimingChangeDelay>
+         <ServiceToAdvertise>
+-            <Uuid BaseUUID="713D0000503E4C75BA943148F18D941E" BaseUUIDName="Custom UART">0000</Uuid>
++            <Uuid BaseUUID="ADE30000C7844F63A987EB69F70EE816" BaseUUIDName="Custom UART">D529</Uuid>
+         </ServiceToAdvertise>
+         <CustomAdTypes>
+             <AdType index="1">
+diff -rupN RBL_nRF8001_old/RBL_services.h RBL_nRF8001/RBL_services.h
+--- RBL_nRF8001_old/RBL_services.h     2015-01-14 01:52:26.000000000 +0530
++++ RBL_nRF8001/RBL_services.h 2015-07-17 15:22:22.000000000 +0530
+@@ -49,7 +49,7 @@
+ #define GAP_PPCP_SLAVE_LATENCY 0
+ #define GAP_PPCP_CONN_TIMEOUT 0xa /** Connection Supervision timeout multiplier as a multiple of 10msec, 0xFFFF means no specific value requested */
+ 
+-#define NB_SETUP_MESSAGES 23
++#define NB_SETUP_MESSAGES 24
+ #define SETUP_MESSAGES_CONTENT {\
+     {0x00,\
+         {\
+@@ -59,13 +59,13 @@
+     {0x00,\
+         {\
+             0x1f,0x06,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x05,0x01,0x01,0x00,0x00,0x06,0x00,0x00,\
+-            0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
++            0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd5,\
+         },\
+     },\
+     {0x00,\
+         {\
+-            0x1f,0x06,0x10,0x1c,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+-            0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x03,0x90,0x01,0xff,\
++            0x1f,0x06,0x10,0x1c,0x29,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
++            0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x03,0x90,0x03,0xff,\
+         },\
+     },\
+     {0x00,\
+@@ -112,30 +112,30 @@
+     {0x00,\
+         {\
+             0x1f,0x06,0x20,0x8c,0x03,0x02,0x00,0x0b,0x29,0x02,0x01,0x00,0x00,0x04,0x04,0x10,0x10,0x00,0x0c,0x28,\
+-            0x00,0x01,0x1e,0x94,0x8d,0xf1,0x48,0x31,0x94,0xba,0x75,0x4c,\
++            0x00,0x01,0x16,0xe8,0x0e,0xf7,0x69,0xeb,0x87,0xa9,0x63,0x4f,\
+         },\
+     },\
+     {0x00,\
+         {\
+-            0x1f,0x06,0x20,0xa8,0x3e,0x50,0x00,0x00,0x3d,0x71,0x04,0x04,0x13,0x13,0x00,0x0d,0x28,0x03,0x01,0x04,\
+-            0x0e,0x00,0x1e,0x94,0x8d,0xf1,0x48,0x31,0x94,0xba,0x75,0x4c,\
++            0x1f,0x06,0x20,0xa8,0x84,0xc7,0x29,0xd5,0xe3,0xad,0x04,0x04,0x13,0x13,0x00,0x0d,0x28,0x03,0x01,0x04,\
++            0x0e,0x00,0x18,0xd2,0x03,0x7f,0x78,0x9d,0xb6,0x90,0x86,0x4b,\
+         },\
+     },\
+     {0x00,\
+         {\
+-            0x1f,0x06,0x20,0xc4,0x3e,0x50,0x03,0x00,0x3d,0x71,0x44,0x10,0x14,0x00,0x00,0x0e,0x00,0x03,0x02,0x00,\
++            0x1f,0x06,0x20,0xc4,0x37,0x46,0x4f,0x33,0x7b,0xad,0x44,0x10,0x14,0x00,0x00,0x0e,0x33,0x4f,0x03,0x00,\
+             0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+         },\
+     },\
+     {0x00,\
+         {\
+             0x1f,0x06,0x20,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x13,0x13,0x00,0x0f,0x28,0x03,0x01,\
+-            0x10,0x10,0x00,0x1e,0x94,0x8d,0xf1,0x48,0x31,0x94,0xba,0x75,\
++            0x10,0x10,0x00,0x56,0xb2,0x16,0x82,0x04,0x95,0x31,0x88,0xc4,\
+         },\
+     },\
+     {0x00,\
+         {\
+-            0x1f,0x06,0x20,0xfc,0x4c,0x3e,0x50,0x02,0x00,0x3d,0x71,0x14,0x00,0x14,0x00,0x00,0x10,0x00,0x02,0x02,\
++            0x1f,0x06,0x20,0xfc,0x42,0x80,0x45,0x82,0x19,0x24,0xe9,0x14,0x00,0x14,0x00,0x00,0x10,0x19,0x82,0x04,\
+             0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+         },\
+     },\
+@@ -159,18 +159,25 @@
+     {0x00,\
+         {\
+             0x1f,0x06,0x40,0x00,0x2a,0x00,0x01,0x00,0x80,0x04,0x00,0x03,0x00,0x00,0x2a,0x05,0x01,0x00,0x04,0x04,\
+-            0x00,0x0a,0x00,0x0b,0x00,0x03,0x02,0x00,0x08,0x04,0x00,0x0e,\
++            0x00,0x0a,0x00,0x0b,0x33,0x4f,0x03,0x00,0x08,0x04,0x00,0x0e,\
+         },\
+     },\
+     {0x00,\
+         {\
+-            0x19,0x06,0x40,0x1c,0x00,0x00,0x00,0x02,0x02,0x00,0x02,0x04,0x00,0x10,0x00,0x11,0x2a,0x27,0x01,0x00,\
++            0x19,0x06,0x40,0x1c,0x00,0x00,0x19,0x82,0x04,0x00,0x02,0x04,0x00,0x10,0x00,0x11,0x2a,0x27,0x01,0x00,\
+             0x80,0x04,0x00,0x14,0x00,0x00,\
+         },\
+     },\
+     {0x00,\
+         {\
+-            0x13,0x06,0x50,0x00,0x1e,0x94,0x8d,0xf1,0x48,0x31,0x94,0xba,0x75,0x4c,0x3e,0x50,0x00,0x00,0x3d,0x71,\
++            0x1f,0x06,0x50,0x00,0x16,0xe8,0x0e,0xf7,0x69,0xeb,0x87,0xa9,0x63,0x4f,0x84,0xc7,0x00,0x00,0xe3,0xad,\
++            0x18,0xd2,0x03,0x7f,0x78,0x9d,0xb6,0x90,0x86,0x4b,0x37,0x46,\
++        },\
++    },\
++    {0x00,\
++        {\
++            0x17,0x06,0x50,0x1c,0x00,0x00,0x7b,0xad,0x56,0xb2,0x16,0x82,0x04,0x95,0x31,0x88,0xc4,0x42,0x80,0x45,\
++            0x00,0x00,0x24,0xe9,\
+         },\
+     },\
+     {0x00,\
+@@ -180,7 +187,7 @@
+     },\
+     {0x00,\
+         {\
+-            0x06,0x06,0xf0,0x00,0x03,0x3d,0x6c,\
++            0x06,0x06,0xf0,0x00,0x03,0x2b,0x7e,\
+         },\
+     },\
+ }
Domain: Network & Connectivity / IoT Connectivity;