Merge branch 'ARDIN-78-79-fix-xml-settings'

NordicSemiconductor · Dec 12, 2014 · 30cd292 · 30cd292
2 parents e364c9f + dbd8084
commit 30cd292
Show file tree

Hide file tree

Showing 39 changed files with 1,079 additions and 1,023 deletions.
diff --git a/Release notes.md b/Release notes.md
@@ -1,3 +1,11 @@
+#Release notes 0.9.5:
+
+##Changes:
+* Update timing fields of aci_state on ACI_EVT_CONNECTED
+* Changed xml file for ble_uart_project_template - more relaxed connection parameters
+* Changed service request delay in xml files to prevent an iOS 8.x issue.
+
+
 #Release notes 0.9.4:
 
 ##Changes:

diff --git a/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/hid_keyboard.xml b/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/hid_keyboard.xml
@@ -14,6 +14,7 @@
             <MaxDataLength>8</MaxDataLength>
             <AttributeLenType>2</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -28,6 +29,7 @@
             <ProfileDescriptors>
                 <ProfileDescriptor Name="Report Reference" MaxDataLength="2" DefaultValue="0001" AttributeLenType="1">
                     <ForceOpen>false</ForceOpen>
+                    <forceEncryption>false</forceEncryption>
                     <Properties>
                         <Write>false</Write>
                         <Read>true</Read>
@@ -47,6 +49,7 @@
             <MaxDataLength>4</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -68,6 +71,7 @@
             <MaxDataLength>1</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>true</WriteWithoutResponse>
                 <Write>false</Write>
@@ -89,6 +93,7 @@
             <MaxDataLength>1</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>true</WriteWithoutResponse>
                 <Write>false</Write>
@@ -110,6 +115,7 @@
             <MaxDataLength>76</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -131,6 +137,7 @@
             <MaxDataLength>1</MaxDataLength>
             <AttributeLenType>2</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>true</WriteWithoutResponse>
                 <Write>true</Write>
@@ -145,6 +152,7 @@
             <ProfileDescriptors>
                 <ProfileDescriptor Name="Report Reference" MaxDataLength="2" DefaultValue="0002" AttributeLenType="1">
                     <ForceOpen>false</ForceOpen>
+                    <forceEncryption>false</forceEncryption>
                     <Properties>
                         <Write>false</Write>
                         <Read>true</Read>
@@ -164,6 +172,7 @@
             <MaxDataLength>8</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -185,6 +194,7 @@
             <MaxDataLength>1</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>true</WriteWithoutResponse>
                 <Write>true</Write>
@@ -210,6 +220,7 @@
             <MaxDataLength>1</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -231,6 +242,7 @@
             <MaxDataLength>1</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -256,6 +268,7 @@
             <MaxDataLength>4</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>true</WriteWithoutResponse>
                 <Write>false</Write>
@@ -277,6 +290,7 @@
             <MaxDataLength>1</MaxDataLength>
             <AttributeLenType>2</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -302,6 +316,7 @@
             <MaxDataLength>7</MaxDataLength>
             <AttributeLenType>1</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -323,6 +338,7 @@
             <MaxDataLength>9</MaxDataLength>
             <AttributeLenType>2</AttributeLenType>
             <ForceOpen>false</ForceOpen>
+            <ForceEncryption>false</ForceEncryption>
             <Properties>
                 <WriteWithoutResponse>false</WriteWithoutResponse>
                 <Write>false</Write>
@@ -347,7 +363,7 @@
         <AuthenticationReq>0</AuthenticationReq>
         <IoCapabilities>0</IoCapabilities>
         <BondTimeout>600</BondTimeout>
-        <SecurityRequestDelay>0</SecurityRequestDelay>
+        <SecurityRequestDelay>5</SecurityRequestDelay>
         <MinimumKeySize>16</MinimumKeySize>
         <MaximumKeySize>16</MaximumKeySize>
         <AdvertisingDataBondedBitmap>201f</AdvertisingDataBondedBitmap>
@@ -369,6 +385,7 @@
         <TimeoutMultipler>300</TimeoutMultipler>
         <AddServiceUpdateCharacteristic>false</AddServiceUpdateCharacteristic>
         <AddServiceUpdateCharacteristicPipe>false</AddServiceUpdateCharacteristicPipe>
+        <TimingChangeDelay>5</TimingChangeDelay>
         <ServiceToAdvertise>
             <Uuid>1812</Uuid>
         </ServiceToAdvertise>

diff --git a/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/services.h b/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/services.h
@@ -1,40 +1,11 @@
-/* 
-* Copyright (c) 2013, Nordic Semiconductor ASA
-* All rights reserved.
-* 
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-* 
-* - Redistributions of source code must retain the above copyright notice, this
-*   list of conditions and the following disclaimer.
-* 
-* - Redistributions in binary form must reproduce the above copyright notice, this
-*   list of conditions and the following disclaimer in the documentation and/or
-*   other materials provided with the distribution.
-* 
-* - The name of Nordic Semiconductor ASA may not be used to endorse or promote
-*   products derived from this software without specific prior written permission.
-* 
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
 /**
-* This file is autogenerated by nRFgo Studio 1.16.1.3107 
+* This file is autogenerated by nRFgo Studio 1.17.1.3252
 */
 
 #ifndef SETUP_MESSAGES_H__
 #define SETUP_MESSAGES_H__
 
-#include "hal_platform.h" 
+#include "hal_platform.h"
 #include "aci.h"
 
 
@@ -137,7 +108,7 @@
 #define SETUP_MESSAGES_CONTENT {\
     {0x00,\
         {\
-            0x07,0x06,0x00,0x00,0x03,0x02,0x41,0xfe,\
+            0x07,0x06,0x00,0x00,0x03,0x02,0x42,0x07,\
         },\
     },\
     {0x00,\
@@ -154,7 +125,7 @@
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+            0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x05,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
             0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,\
         },\
     },\
@@ -355,7 +326,7 @@
     },\
     {0x00,\
         {\
-            0x06,0x06,0xf0,0x00,0x03,0xdf,0x42,\
+            0x06,0x06,0xf0,0x00,0x03,0x86,0x0c,\
         },\
     },\
 }

diff --git a/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/services_lock.h b/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/services_lock.h
@@ -1,40 +1,11 @@
-/* 
-* Copyright (c) 2013, Nordic Semiconductor ASA
-* All rights reserved.
-* 
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-* 
-* - Redistributions of source code must retain the above copyright notice, this
-*   list of conditions and the following disclaimer.
-* 
-* - Redistributions in binary form must reproduce the above copyright notice, this
-*   list of conditions and the following disclaimer in the documentation and/or
-*   other materials provided with the distribution.
-* 
-* - The name of Nordic Semiconductor ASA may not be used to endorse or promote
-*   products derived from this software without specific prior written permission.
-* 
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
 /**
-* This file is autogenerated by nRFgo Studio 1.16.1.3107 
+* This file is autogenerated by nRFgo Studio 1.17.1.3252
 */
 
 #ifndef SETUP_MESSAGES_H__
 #define SETUP_MESSAGES_H__
 
-#include "hal_platform.h" 
+#include "hal_platform.h"
 #include "aci.h"
 
 // You have now chosen to upload the configuration to OTP on the device.
@@ -141,7 +112,7 @@
 #define SETUP_MESSAGES_CONTENT {\
     {0x00,\
         {\
-            0x07,0x06,0x00,0x00,0x03,0x02,0x41,0xfe,\
+            0x07,0x06,0x00,0x00,0x03,0x02,0x42,0x07,\
         },\
     },\
     {0x00,\
@@ -158,7 +129,7 @@
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+            0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x05,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
             0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,\
         },\
     },\
@@ -359,7 +330,7 @@
     },\
     {0x00,\
         {\
-            0x06,0x06,0xf0,0x00,0x83,0x4e,0xca,\
+            0x06,0x06,0xf0,0x00,0x83,0x17,0x84,\
         },\
     },\
 }

diff --git a/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/ublue_setup.gen.out.txt b/libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/ublue_setup.gen.out.txt
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
  uBlue Setup generation report
- Generated with uBlue setup DLL version: 1.0.0.16894
- Generated: Thu Jan 30 12:21:38 2014 (UTC)
+ Generated with uBlue setup DLL version: 1.0.0.16903
+ Generated: Fri Dec 12 13:55:16 2014 (UTC)
  This file is automatically generated, do not modify
 ------------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ Setup ID                   = 0x0000683A
 Setup Format               = 0x03
 Security                   = ENCRYPTED (2)
 Bond Timeout               = 600
-Security Request Delay     = 0
+Security Request Delay     = 5
 Change Timing Delay        = 5
 Whitelist                  = Disabled
 
@@ -133,10 +133,10 @@ Pipe   Store    Type     Service      Char.       CPF           Desc.
 
 [Setup Data] 
 
-07-06-00-00-03-02-41-FE
+07-06-00-00-03-02-42-07
 1F-06-10-00-3A-68-00-00-02-00-0C-00-10-01-01-00-00-02-00-04-81-12-18-00-00-00-00-00-00-00-00-00
 1F-06-10-1C-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-40-12-00-00-40-12-03-99-00-64
-1F-06-10-38-02-FF-02-58-00-05-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-01-00-01-00-00-00
+1F-06-10-38-02-FF-02-58-05-05-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-01-00-01-00-00-00
 05-06-10-54-01-01
 1F-06-20-00-04-04-02-02-00-01-28-00-01-00-18-04-04-05-05-00-02-28-03-01-0E-03-00-00-2A-04-34-11
 1F-06-20-1C-0F-00-03-2A-00-01-4B-65-79-62-6F-61-72-64-20-4E-6F-72-64-69-63-00-00-04-04-05-05-00
@@ -170,4 +170,4 @@ Pipe   Store    Type     Service      Char.       CPF           Desc.
 1F-06-60-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
 0B-06-60-1C-00-00-00-00-00-00-00-00
 19-06-70-00-19-02-C1-03-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
-06-06-F0-00-83-4E-CA
+06-06-F0-00-83-17-84