Skip to content

Commit 30cd292

Browse files
SkjerveSkjerve
committed
Merge branch 'ARDIN-78-79-fix-xml-settings'
2 parents e364c9f + dbd8084 commit 30cd292

39 files changed

+1079
-1023
lines changed

‎Release notes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#Release notes 0.9.5:
2+
3+
##Changes:
4+
* Update timing fields of aci_state on ACI_EVT_CONNECTED
5+
* Changed xml file for ble_uart_project_template - more relaxed connection parameters
6+
* Changed service request delay in xml files to prevent an iOS 8.x issue.
7+
8+
19
#Release notes 0.9.4:
210

311
##Changes:

‎libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/hid_keyboard.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<MaxDataLength>8</MaxDataLength>
1515
<AttributeLenType>2</AttributeLenType>
1616
<ForceOpen>false</ForceOpen>
17+
<ForceEncryption>false</ForceEncryption>
1718
<Properties>
1819
<WriteWithoutResponse>false</WriteWithoutResponse>
1920
<Write>false</Write>
@@ -28,6 +29,7 @@
2829
<ProfileDescriptors>
2930
<ProfileDescriptor Name="Report Reference" MaxDataLength="2" DefaultValue="0001" AttributeLenType="1">
3031
<ForceOpen>false</ForceOpen>
32+
<forceEncryption>false</forceEncryption>
3133
<Properties>
3234
<Write>false</Write>
3335
<Read>true</Read>
@@ -47,6 +49,7 @@
4749
<MaxDataLength>4</MaxDataLength>
4850
<AttributeLenType>1</AttributeLenType>
4951
<ForceOpen>false</ForceOpen>
52+
<ForceEncryption>false</ForceEncryption>
5053
<Properties>
5154
<WriteWithoutResponse>false</WriteWithoutResponse>
5255
<Write>false</Write>
@@ -68,6 +71,7 @@
6871
<MaxDataLength>1</MaxDataLength>
6972
<AttributeLenType>1</AttributeLenType>
7073
<ForceOpen>false</ForceOpen>
74+
<ForceEncryption>false</ForceEncryption>
7175
<Properties>
7276
<WriteWithoutResponse>true</WriteWithoutResponse>
7377
<Write>false</Write>
@@ -89,6 +93,7 @@
8993
<MaxDataLength>1</MaxDataLength>
9094
<AttributeLenType>1</AttributeLenType>
9195
<ForceOpen>false</ForceOpen>
96+
<ForceEncryption>false</ForceEncryption>
9297
<Properties>
9398
<WriteWithoutResponse>true</WriteWithoutResponse>
9499
<Write>false</Write>
@@ -110,6 +115,7 @@
110115
<MaxDataLength>76</MaxDataLength>
111116
<AttributeLenType>1</AttributeLenType>
112117
<ForceOpen>false</ForceOpen>
118+
<ForceEncryption>false</ForceEncryption>
113119
<Properties>
114120
<WriteWithoutResponse>false</WriteWithoutResponse>
115121
<Write>false</Write>
@@ -131,6 +137,7 @@
131137
<MaxDataLength>1</MaxDataLength>
132138
<AttributeLenType>2</AttributeLenType>
133139
<ForceOpen>false</ForceOpen>
140+
<ForceEncryption>false</ForceEncryption>
134141
<Properties>
135142
<WriteWithoutResponse>true</WriteWithoutResponse>
136143
<Write>true</Write>
@@ -145,6 +152,7 @@
145152
<ProfileDescriptors>
146153
<ProfileDescriptor Name="Report Reference" MaxDataLength="2" DefaultValue="0002" AttributeLenType="1">
147154
<ForceOpen>false</ForceOpen>
155+
<forceEncryption>false</forceEncryption>
148156
<Properties>
149157
<Write>false</Write>
150158
<Read>true</Read>
@@ -164,6 +172,7 @@
164172
<MaxDataLength>8</MaxDataLength>
165173
<AttributeLenType>1</AttributeLenType>
166174
<ForceOpen>false</ForceOpen>
175+
<ForceEncryption>false</ForceEncryption>
167176
<Properties>
168177
<WriteWithoutResponse>false</WriteWithoutResponse>
169178
<Write>false</Write>
@@ -185,6 +194,7 @@
185194
<MaxDataLength>1</MaxDataLength>
186195
<AttributeLenType>1</AttributeLenType>
187196
<ForceOpen>false</ForceOpen>
197+
<ForceEncryption>false</ForceEncryption>
188198
<Properties>
189199
<WriteWithoutResponse>true</WriteWithoutResponse>
190200
<Write>true</Write>
@@ -210,6 +220,7 @@
210220
<MaxDataLength>1</MaxDataLength>
211221
<AttributeLenType>1</AttributeLenType>
212222
<ForceOpen>false</ForceOpen>
223+
<ForceEncryption>false</ForceEncryption>
213224
<Properties>
214225
<WriteWithoutResponse>false</WriteWithoutResponse>
215226
<Write>false</Write>
@@ -231,6 +242,7 @@
231242
<MaxDataLength>1</MaxDataLength>
232243
<AttributeLenType>1</AttributeLenType>
233244
<ForceOpen>false</ForceOpen>
245+
<ForceEncryption>false</ForceEncryption>
234246
<Properties>
235247
<WriteWithoutResponse>false</WriteWithoutResponse>
236248
<Write>false</Write>
@@ -256,6 +268,7 @@
256268
<MaxDataLength>4</MaxDataLength>
257269
<AttributeLenType>1</AttributeLenType>
258270
<ForceOpen>false</ForceOpen>
271+
<ForceEncryption>false</ForceEncryption>
259272
<Properties>
260273
<WriteWithoutResponse>true</WriteWithoutResponse>
261274
<Write>false</Write>
@@ -277,6 +290,7 @@
277290
<MaxDataLength>1</MaxDataLength>
278291
<AttributeLenType>2</AttributeLenType>
279292
<ForceOpen>false</ForceOpen>
293+
<ForceEncryption>false</ForceEncryption>
280294
<Properties>
281295
<WriteWithoutResponse>false</WriteWithoutResponse>
282296
<Write>false</Write>
@@ -302,6 +316,7 @@
302316
<MaxDataLength>7</MaxDataLength>
303317
<AttributeLenType>1</AttributeLenType>
304318
<ForceOpen>false</ForceOpen>
319+
<ForceEncryption>false</ForceEncryption>
305320
<Properties>
306321
<WriteWithoutResponse>false</WriteWithoutResponse>
307322
<Write>false</Write>
@@ -323,6 +338,7 @@
323338
<MaxDataLength>9</MaxDataLength>
324339
<AttributeLenType>2</AttributeLenType>
325340
<ForceOpen>false</ForceOpen>
341+
<ForceEncryption>false</ForceEncryption>
326342
<Properties>
327343
<WriteWithoutResponse>false</WriteWithoutResponse>
328344
<Write>false</Write>
@@ -347,7 +363,7 @@
347363
<AuthenticationReq>0</AuthenticationReq>
348364
<IoCapabilities>0</IoCapabilities>
349365
<BondTimeout>600</BondTimeout>
350-
<SecurityRequestDelay>0</SecurityRequestDelay>
366+
<SecurityRequestDelay>5</SecurityRequestDelay>
351367
<MinimumKeySize>16</MinimumKeySize>
352368
<MaximumKeySize>16</MaximumKeySize>
353369
<AdvertisingDataBondedBitmap>201f</AdvertisingDataBondedBitmap>
@@ -369,6 +385,7 @@
369385
<TimeoutMultipler>300</TimeoutMultipler>
370386
<AddServiceUpdateCharacteristic>false</AddServiceUpdateCharacteristic>
371387
<AddServiceUpdateCharacteristicPipe>false</AddServiceUpdateCharacteristicPipe>
388+
<TimingChangeDelay>5</TimingChangeDelay>
372389
<ServiceToAdvertise>
373390
<Uuid>1812</Uuid>
374391
</ServiceToAdvertise>

‎libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/services.h

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,11 @@
1-
/*
2-
* Copyright (c) 2013, Nordic Semiconductor ASA
3-
* All rights reserved.
4-
*
5-
* Redistribution and use in source and binary forms, with or without modification,
6-
* are permitted provided that the following conditions are met:
7-
*
8-
* - Redistributions of source code must retain the above copyright notice, this
9-
* list of conditions and the following disclaimer.
10-
*
11-
* - Redistributions in binary form must reproduce the above copyright notice, this
12-
* list of conditions and the following disclaimer in the documentation and/or
13-
* other materials provided with the distribution.
14-
*
15-
* - The name of Nordic Semiconductor ASA may not be used to endorse or promote
16-
* products derived from this software without specific prior written permission.
17-
*
18-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20-
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
22-
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23-
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25-
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26-
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27-
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28-
*/
29-
301
/**
31-
* This file is autogenerated by nRFgo Studio 1.16.1.3107
2+
* This file is autogenerated by nRFgo Studio 1.17.1.3252
323
*/
334

345
#ifndef SETUP_MESSAGES_H__
356
#define SETUP_MESSAGES_H__
367

37-
#include "hal_platform.h"
8+
#include "hal_platform.h"
389
#include "aci.h"
3910

4011

@@ -137,7 +108,7 @@
137108
#define SETUP_MESSAGES_CONTENT {\
138109
{0x00,\
139110
{\
140-
0x07,0x06,0x00,0x00,0x03,0x02,0x41,0xfe,\
111+
0x07,0x06,0x00,0x00,0x03,0x02,0x42,0x07,\
141112
},\
142113
},\
143114
{0x00,\
@@ -154,7 +125,7 @@
154125
},\
155126
{0x00,\
156127
{\
157-
0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
128+
0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x05,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
158129
0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,\
159130
},\
160131
},\
@@ -355,7 +326,7 @@
355326
},\
356327
{0x00,\
357328
{\
358-
0x06,0x06,0xf0,0x00,0x03,0xdf,0x42,\
329+
0x06,0x06,0xf0,0x00,0x03,0x86,0x0c,\
359330
},\
360331
},\
361332
}

‎libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/services_lock.h

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,11 @@
1-
/*
2-
* Copyright (c) 2013, Nordic Semiconductor ASA
3-
* All rights reserved.
4-
*
5-
* Redistribution and use in source and binary forms, with or without modification,
6-
* are permitted provided that the following conditions are met:
7-
*
8-
* - Redistributions of source code must retain the above copyright notice, this
9-
* list of conditions and the following disclaimer.
10-
*
11-
* - Redistributions in binary form must reproduce the above copyright notice, this
12-
* list of conditions and the following disclaimer in the documentation and/or
13-
* other materials provided with the distribution.
14-
*
15-
* - The name of Nordic Semiconductor ASA may not be used to endorse or promote
16-
* products derived from this software without specific prior written permission.
17-
*
18-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20-
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
22-
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23-
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25-
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26-
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27-
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28-
*/
29-
301
/**
31-
* This file is autogenerated by nRFgo Studio 1.16.1.3107
2+
* This file is autogenerated by nRFgo Studio 1.17.1.3252
323
*/
334

345
#ifndef SETUP_MESSAGES_H__
356
#define SETUP_MESSAGES_H__
367

37-
#include "hal_platform.h"
8+
#include "hal_platform.h"
389
#include "aci.h"
3910

4011
// You have now chosen to upload the configuration to OTP on the device.
@@ -141,7 +112,7 @@
141112
#define SETUP_MESSAGES_CONTENT {\
142113
{0x00,\
143114
{\
144-
0x07,0x06,0x00,0x00,0x03,0x02,0x41,0xfe,\
115+
0x07,0x06,0x00,0x00,0x03,0x02,0x42,0x07,\
145116
},\
146117
},\
147118
{0x00,\
@@ -158,7 +129,7 @@
158129
},\
159130
{0x00,\
160131
{\
161-
0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
132+
0x1f,0x06,0x10,0x38,0x02,0xff,0x02,0x58,0x05,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
162133
0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,\
163134
},\
164135
},\
@@ -359,7 +330,7 @@
359330
},\
360331
{0x00,\
361332
{\
362-
0x06,0x06,0xf0,0x00,0x83,0x4e,0xca,\
333+
0x06,0x06,0xf0,0x00,0x83,0x17,0x84,\
363334
},\
364335
},\
365336
}

‎libraries/BLE/examples/ble_HID_keyboard_2_bonds_template/ublue_setup.gen.out.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
uBlue Setup generation report
3-
Generated with uBlue setup DLL version: 1.0.0.16894
4-
Generated: Thu Jan 30 12:21:38 2014 (UTC)
3+
Generated with uBlue setup DLL version: 1.0.0.16903
4+
Generated: Fri Dec 12 13:55:16 2014 (UTC)
55
This file is automatically generated, do not modify
66
------------------------------------------------------------------------------
77

@@ -30,7 +30,7 @@ Setup ID = 0x0000683A
3030
Setup Format = 0x03
3131
Security = ENCRYPTED (2)
3232
Bond Timeout = 600
33-
Security Request Delay = 0
33+
Security Request Delay = 5
3434
Change Timing Delay = 5
3535
Whitelist = Disabled
3636

@@ -133,10 +133,10 @@ Pipe Store Type Service Char. CPF Desc.
133133

134134
[Setup Data]
135135

136-
07-06-00-00-03-02-41-FE
136+
07-06-00-00-03-02-42-07
137137
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
138138
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
139-
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
139+
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
140140
05-06-10-54-01-01
141141
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
142142
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.
170170
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
171171
0B-06-60-1C-00-00-00-00-00-00-00-00
172172
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
173-
06-06-F0-00-83-4E-CA
173+
06-06-F0-00-83-17-84

0 commit comments

Comments
 (0)