forked from NordicSemiconductor/pc-ble-driver
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathnRF5_SDK_11.0.0_connectivity.patch
805 lines (724 loc) · 41.7 KB
/
nRF5_SDK_11.0.0_connectivity.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
diff --git nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler.h nRF5_SDK_11.0.0_XXXXXXX/components/libraries/scheduler/app_scheduler.h
index f52e616..eeb9689 100644
--- nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler.h
+++ nRF5_SDK_11.0.0_XXXXXXX/components/libraries/scheduler/app_scheduler.h
@@ -54,6 +54,8 @@
#include "app_error.h"
#include "app_util.h"
+#define APP_SCHEDULER_WITH_PROFILER
+
#define APP_SCHED_EVENT_HEADER_SIZE 8 /**< Size of app_scheduler.event_header_t (only for use inside APP_SCHED_BUF_SIZE()). */
/**@brief Compute number of bytes required to hold the scheduler buffer.
@@ -140,6 +142,12 @@ uint32_t app_sched_event_put(void * p_event_data,
* @return Maximum number of events in queue observed so far.
*/
uint16_t app_sched_queue_utilization_get(void);
+
+/**@brief Function for getting the current amount of free space in the queue.
+ *
+ * @return Number of events that can be stored in the queue.
+ */
+uint16_t app_sched_queue_space_get(void);
#endif
#ifdef APP_SCHEDULER_WITH_PAUSE
diff --git nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler_serconn.c nRF5_SDK_11.0.0_XXXXXXX/components/libraries/scheduler/app_scheduler_serconn.c
index f411eff..8d505d9 100644
--- nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler_serconn.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/libraries/scheduler/app_scheduler_serconn.c
@@ -99,7 +99,16 @@ uint32_t app_sched_init(uint16_t event_size, uint16_t queue_size, void * p_event
#ifdef APP_SCHEDULER_WITH_PROFILER
-static void check_queue_utilization(void)
+uint16_t app_sched_queue_space_get()
+{
+ uint16_t start = m_queue_start_index;
+ uint16_t end = m_queue_end_index;
+ uint16_t free_space = m_queue_size - ((end >= start) ?
+ (end - start) : (m_queue_size + 1 - start + end));
+ return free_space;
+}
+
+static __INLINE void check_queue_utilization(void)
{
uint16_t start = m_queue_start_index;
uint16_t end = m_queue_end_index;
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/middleware/app_mw_ble_gatts.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/application/codecs/s130/middleware/app_mw_ble_gatts.c
index f9ede04..0fb57f4 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/middleware/app_mw_ble_gatts.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/application/codecs/s130/middleware/app_mw_ble_gatts.c
@@ -586,7 +586,8 @@ static uint32_t gatts_attr_get_rsp_dec(const uint8_t * p_buffer, uint16_t length
const uint32_t err_code = ble_gatts_attr_get_rsp_dec(
p_buffer,
length,
- (ble_gatts_attr_md_t **)&mp_out_params[0],
+ (ble_uuid_t **)&mp_out_params[0],
+ (ble_gatts_attr_md_t **)&mp_out_params[1],
&result_code);
APP_ERROR_CHECK(err_code);
@@ -603,7 +604,8 @@ uint32_t sd_ble_gatts_attr_get(uint16_t handle,
uint32_t buffer_length = 0;
tx_buf_alloc(&p_buffer, (uint16_t *)&buffer_length);
- mp_out_params[0] = p_md;
+ mp_out_params[0] = p_uuid;
+ mp_out_params[1] = p_md;
const uint32_t err_code = ble_gatts_attr_get_req_enc(handle,
p_uuid,
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_attr_get.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/application/codecs/s130/serializers/ble_gatts_attr_get.c
index c2e7b44..9092f64 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_attr_get.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/application/codecs/s130/serializers/ble_gatts_attr_get.c
@@ -38,7 +38,7 @@ uint32_t ble_gatts_attr_get_req_enc(uint16_t handle,
err_code = uint16_t_enc(&handle, p_buf, total_len, &index);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
- err_code = cond_field_enc(p_uuid, p_buf, total_len, &index, ble_uuid_t_enc);
+ err_code = cond_field_enc(p_uuid, p_buf, total_len, &index, NULL);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
err_code = cond_field_enc(p_md, p_buf, total_len, &index, NULL);
@@ -52,6 +52,7 @@ uint32_t ble_gatts_attr_get_req_enc(uint16_t handle,
uint32_t ble_gatts_attr_get_rsp_dec(uint8_t const * const p_buf,
uint32_t packet_len,
+ ble_uuid_t ** pp_uuid,
ble_gatts_attr_md_t ** pp_md,
uint32_t * const p_result_code)
{
@@ -76,6 +77,8 @@ uint32_t ble_gatts_attr_get_rsp_dec(uint8_t const * const p_buf,
return NRF_SUCCESS;
}
+ err_code = cond_field_dec(p_buf, packet_len, &index, (void * *)pp_uuid,
+ ble_uuid_t_dec);
err_code = cond_field_dec(p_buf, packet_len, &index, (void * *)pp_md,
ble_gatts_attr_md_dec);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/common/ser_config.h nRF5_SDK_11.0.0_XXXXXXX/components/serialization/common/ser_config.h
index 67b4f8a..2faaffa 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/common/ser_config.h
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/common/ser_config.h
@@ -66,7 +66,7 @@
/** UART transmission parameters */
#define SER_PHY_UART_FLOW_CTRL APP_UART_FLOW_CONTROL_ENABLED
-#define SER_PHY_UART_PARITY true
+#define SER_PHY_UART_PARITY false
#define SER_PHY_UART_BAUDRATE UART_BAUDRATE_BAUDRATE_Baud1M
/** Find UART baudrate value based on chosen register setting. */
@@ -110,4 +110,6 @@
#define SER_MAX_CONNECTIONS 8
+#define HCI_LINK_CONTROL
+
#endif /* SER_CONFIG_H__ */
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/common/transport/ser_phy/config/ser_phy_config_conn_nrf51.h nRF5_SDK_11.0.0_XXXXXXX/components/serialization/common/transport/ser_phy/config/ser_phy_config_conn_nrf51.h
index 47a9b51..9d19866 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/common/transport/ser_phy/config/ser_phy_config_conn_nrf51.h
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/common/transport/ser_phy/config/ser_phy_config_conn_nrf51.h
@@ -34,9 +34,9 @@
/* UART configuration */
#define UART_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
-#define SER_PHY_UART_RX SER_CON_RX_PIN
-#define SER_PHY_UART_TX SER_CON_TX_PIN
-#define SER_PHY_UART_CTS SER_CON_CTS_PIN
-#define SER_PHY_UART_RTS SER_CON_RTS_PIN
+#define SER_PHY_UART_RX RX_PIN_NUMBER
+#define SER_PHY_UART_TX TX_PIN_NUMBER
+#define SER_PHY_UART_CTS CTS_PIN_NUMBER
+#define SER_PHY_UART_RTS RTS_PIN_NUMBER
#endif //SER_PHY_CONFIG_CONN_NRF51_H__
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/common/transport/ser_phy/ser_phy_hci.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/common/transport/ser_phy/ser_phy_hci.c
index a83d92e..f1c62b5 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/common/transport/ser_phy/ser_phy_hci.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/common/transport/ser_phy/ser_phy_hci.c
@@ -37,6 +37,8 @@
(SER_HAL_TRANSPORT_MAX_PKT_SIZE + PKT_HDR_SIZE + PKT_CRC_SIZE))
#define BAUD_TIME_us (1000000uL / SER_PHY_UART_BAUDRATE_VAL)
+#define PKT_TYPE_RESET 5
+
#define TX_EVT_QUEUE_SIZE 16
#define RX_EVT_QUEUE_SIZE 16
#define PKT_TYPE_VENDOR_SPECIFIC 14 /**< Packet type vendor specific. */
@@ -48,7 +50,11 @@
#define INITIAL_SEQ_NUMBER INITIAL_ACK_NUMBER_EXPECTED /**< Initial acknowledge number transmitted. */
#define INVALID_PKT_TYPE 0xFFFFFFFFu /**< Internal invalid packet type value. */
#define MAX_TRANSMISSION_TIME_ms (MAX_PACKET_SIZE_IN_BITS * BAUD_TIME_us / 1000uL) /**< Max transmission time of a single application packet over UART in units of mseconds. */
+#if SER_PHY_UART_BAUDRATE == UART_BAUDRATE_BAUDRATE_Baud115200
#define RETRANSMISSION_TIMEOUT_IN_ms (10uL * MAX_TRANSMISSION_TIME_ms) /**< Retransmission timeout for application packet in units of mseconds. */
+#else
+#define RETRANSMISSION_TIMEOUT_IN_ms (50uL * MAX_TRANSMISSION_TIME_ms) /**< Retransmission timeout for application packet in units of mseconds. */
+#endif
#ifdef HCI_LINK_CONTROL
#define HCI_PKT_SYNC 0x7E01u /**< Link Control Packet: type SYNC */
@@ -756,6 +762,11 @@ static void hci_slip_event_handler(ser_phy_hci_slip_evt_t * p_event)
event.evt.ser_phy_slip_evt.evt_params.received_pkt.p_buffer,
event.evt.ser_phy_slip_evt.evt_params.received_pkt.num_of_bytes);
+ if (packet_type == PKT_TYPE_RESET)
+ {
+ NVIC_SystemReset();
+ }
+
if (packet_type == PKT_TYPE_ACK )
{
DEBUG_EVT_SLIP_ACK_RXED(0);
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gap.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gap.c
index 8e4e2d1..fd00fe2 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gap.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gap.c
@@ -621,6 +621,12 @@ uint32_t conn_mw_ble_gap_sec_params_reply(uint8_t const * const p_rx_buf,
&p_sec_keyset);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
+ if (p_sec_keyset == NULL)
+ {
+ //If no keyset was sent destroy the context.
+ conn_ble_gap_sec_context_destroy(*p_conn_handle);
+ }
+
sd_err_code = sd_ble_gap_sec_params_reply(*p_conn_handle, sec_status, p_sec_params, p_sec_keyset);
err_code = ble_gap_sec_params_reply_rsp_enc(sd_err_code, p_tx_buf, p_tx_buf_len, p_sec_keyset);
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gatts.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gatts.c
index f429e3e..32aa281 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gatts.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/middleware/conn_mw_ble_gatts.c
@@ -430,7 +430,7 @@ uint32_t conn_mw_ble_gatts_attr_get(uint8_t const * const p_rx_buf,
sd_err_code = sd_ble_gatts_attr_get(handle, p_uuid, p_md);
- err_code = ble_gatts_attr_get_rsp_enc(sd_err_code, p_tx_buf, p_tx_buf_len, p_md);
+ err_code = ble_gatts_attr_get_rsp_enc(sd_err_code, p_tx_buf, p_tx_buf_len, p_uuid, p_md);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
return err_code;
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/middleware/conn_mw_items.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/middleware/conn_mw_items.c
index 8c1f113..e677eda 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/middleware/conn_mw_items.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/middleware/conn_mw_items.c
@@ -53,6 +53,7 @@ static const conn_mw_item_t conn_mw_item[] = {
{SD_BLE_GAP_CONN_SEC_GET, conn_mw_ble_gap_conn_sec_get},
{SD_BLE_GAP_RSSI_START, conn_mw_ble_gap_rssi_start},
{SD_BLE_GAP_RSSI_STOP, conn_mw_ble_gap_rssi_stop},
+ {SD_BLE_GAP_RSSI_GET, conn_mw_ble_gap_rssi_get},
{SD_BLE_GAP_KEYPRESS_NOTIFY, conn_mw_ble_gap_keypress_notify},
{SD_BLE_GAP_LESC_DHKEY_REPLY, conn_mw_ble_gap_lesc_dhkey_reply},
{SD_BLE_GAP_LESC_OOB_DATA_SET, conn_mw_ble_gap_lesc_oob_data_set},
@@ -80,4 +81,5 @@ static const conn_mw_item_t conn_mw_item[] = {
{SD_BLE_GATTS_RW_AUTHORIZE_REPLY, conn_mw_ble_gatts_rw_authorize_reply},
{SD_BLE_GATTS_SYS_ATTR_SET, conn_mw_ble_gatts_sys_attr_set},
{SD_BLE_GATTS_SYS_ATTR_GET, conn_mw_ble_gatts_sys_attr_get},
+ {SD_BLE_USER_MEM_REPLY, conn_mw_ble_user_mem_reply},
};
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_auth_status.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_auth_status.c
index 817f269..2b50dce 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_auth_status.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_auth_status.c
@@ -46,18 +46,22 @@ uint32_t ble_gap_evt_auth_status_enc(ble_evt_t const * const p_event,
err_code = ble_gap_evt_auth_status_t_enc(&(p_event->evt.gap_evt.params.auth_status), p_buf, total_len, &index);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
- if (p_event->evt.gap_evt.params.auth_status.bonded)
- {
// keyset is an extension of standard event data - used to synchronize keys at application
err_code = conn_ble_gap_sec_context_find(p_event->evt.gap_evt.conn_handle, &conn_index);
- SER_ASSERT(err_code == NRF_SUCCESS, err_code);
+ if (err_code == NRF_SUCCESS)
+ {
err_code = ble_gap_sec_keyset_t_enc(&(m_conn_keys_table[conn_index].keyset), p_buf, total_len, &index);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
err_code = conn_ble_gap_sec_context_destroy(p_event->evt.gap_evt.conn_handle);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
}
+ else
+ {
+ err_code = NRF_SUCCESS;
+ }
+
*p_buf_len = index;
return err_code;
}
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_disconnected.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_disconnected.c
index 0434d1c..50471bd 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_disconnected.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gap_evt_disconnected.c
@@ -15,6 +15,7 @@
#include "app_util.h"
#include "ble.h"
#include "ble_gap_struct_serialization.h"
+#include "conn_ble_gap_sec_keys.h"
#include "ble_gap_evt_conn.h"
uint32_t ble_gap_evt_disconnected_enc(ble_evt_t const * const p_event,
@@ -45,5 +46,14 @@ uint32_t ble_gap_evt_disconnected_enc(ble_evt_t const * const p_event,
*p_buf_len = index;
- return err_code;
+ // If disconnected and context is not yet destroyed, destroy it now
+ uint32_t conn_index;
+ err_code = conn_ble_gap_sec_context_find(p_event->evt.gap_evt.conn_handle, &conn_index);
+ if (err_code == NRF_SUCCESS)
+ {
+ err_code = conn_ble_gap_sec_context_destroy(p_event->evt.gap_evt.conn_handle);
+ SER_ASSERT(err_code == NRF_SUCCESS, err_code);
+ }
+
+ return NRF_SUCCESS;
}
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_attr_get.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_attr_get.c
index 824bdee..2b8c745 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_attr_get.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_attr_get.c
@@ -41,7 +41,7 @@ uint32_t ble_gatts_attr_get_req_dec(uint8_t const * const p_buf,
err_code = uint16_t_dec(p_buf, packet_len, &index, p_handle);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
- err_code = cond_field_dec(p_buf, packet_len, &index, (void * *)pp_uuid, ble_uuid_t_dec);
+ err_code = cond_field_dec(p_buf, packet_len, &index, (void * *)pp_uuid, NULL);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
err_code = cond_field_dec(p_buf, packet_len, &index, (void * *)pp_md, NULL);
@@ -56,6 +56,7 @@ uint32_t ble_gatts_attr_get_req_dec(uint8_t const * const p_buf,
uint32_t ble_gatts_attr_get_rsp_enc(uint32_t return_code,
uint8_t * const p_buf,
uint32_t * const p_buf_len,
+ ble_uuid_t * p_uuid,
ble_gatts_attr_md_t * p_md)
{
SER_ASSERT_NOT_NULL(p_buf);
@@ -71,6 +72,10 @@ uint32_t ble_gatts_attr_get_rsp_enc(uint32_t return_code,
return NRF_SUCCESS;
}
uint32_t index = *p_buf_len;
+
+ err_code = cond_field_enc(p_uuid, p_buf, buflen, &index, ble_uuid_t_enc);
+ SER_ASSERT(err_code == NRF_SUCCESS, err_code);
+
err_code = cond_field_enc(p_md, p_buf, buflen, &index, ble_gatts_attr_md_enc);
SER_ASSERT(err_code == NRF_SUCCESS, err_code);
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_conn.h nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_conn.h
index 7eb052f..f17df14 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_conn.h
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/codecs/s130/serializers/ble_gatts_conn.h
@@ -539,7 +539,8 @@ uint32_t ble_gatts_attr_get_req_dec(uint8_t const * const p_buf,
* returned.
* @param[in,out] p_buf_len \c in: size of \p p_buf buffer.
* \c out: Length of encoded command response packet.
- * @param[in] p_md Pointer to structure to be encoded.
+ * @param[in] p_uuid Pointer to UUID structure to be encoded.
+ * @param[in] p_md Pointer to metadata structure to be encoded.
*
* @retval NRF_SUCCESS Encoding success.
* @retval NRF_ERROR_NULL Encoding failure. NULL pointer supplied.
@@ -548,6 +549,7 @@ uint32_t ble_gatts_attr_get_req_dec(uint8_t const * const p_buf,
uint32_t ble_gatts_attr_get_rsp_enc(uint32_t return_code,
uint8_t * const p_buf,
uint32_t * const p_buf_len,
+ ble_uuid_t * p_uuid,
ble_gatts_attr_md_t * p_md);
/**@brief Decodes @ref ble_gatts_initial_user_handle_get_req_dec command request.
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/ser_conn_error_handling.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/ser_conn_error_handling.c
index a4ca279..5a0f788 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/ser_conn_error_handling.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/ser_conn_error_handling.c
@@ -74,7 +74,7 @@ void app_error_fault_handler(uint32_t id, uint32_t pc, uint32_t info)
/* ble_debug_assert_handler(error_code, line_num, p_file_name); */
-#if 0
+#if 1
/* Reset the chip. Should be used in the release version. */
NVIC_SystemReset();
#else /* Debug version. */
diff --git nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/ser_conn_handlers.c nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/ser_conn_handlers.c
index e69e44e..553d61c 100644
--- nRF5_SDK_11.0.0_89a8197/components/serialization/connectivity/ser_conn_handlers.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/serialization/connectivity/ser_conn_handlers.c
@@ -124,6 +124,12 @@ void ser_conn_ble_event_handle(ble_evt_t * p_ble_evt)
err_code = app_sched_event_put(p_ble_evt, sizeof (ble_evt_hdr_t) + p_ble_evt->header.evt_len,
ser_conn_ble_event_encoder);
APP_ERROR_CHECK(err_code);
+ uint16_t free_space = app_sched_queue_space_get();
+ if (!free_space)
+ {
+ // Queue is full. Do not pull new events.
+ softdevice_handler_suspend();
+ }
}
/** @} */
diff --git nRF5_SDK_11.0.0_89a8197/components/softdevice/common/softdevice_handler/softdevice_handler.c nRF5_SDK_11.0.0_XXXXXXX/components/softdevice/common/softdevice_handler/softdevice_handler.c
index 81ee38f..705dc06 100644
--- nRF5_SDK_11.0.0_89a8197/components/softdevice/common/softdevice_handler/softdevice_handler.c
+++ nRF5_SDK_11.0.0_XXXXXXX/components/softdevice/common/softdevice_handler/softdevice_handler.c
@@ -70,6 +70,7 @@ nrf_nvic_state_t nrf_nvic_state;
static softdevice_evt_schedule_func_t m_evt_schedule_func; /**< Pointer to function for propagating SoftDevice events to the scheduler. */
static volatile bool m_softdevice_enabled = false; /**< Variable to indicate whether the SoftDevice is enabled. */
+static volatile bool m_suspended; /**< Current state of the event handler. */
#ifdef BLE_STACK_SUPPORT_REQD
// The following three definitions is needed only if BLE events are needed to be pulled from the stack.
@@ -133,6 +134,11 @@ void intern_softdevice_events_execute(void)
if (!no_more_soc_evts)
{
+ if (m_suspended)
+ {
+ // Cancel pulling next event if event handler was suspended by user.
+ return;
+ }
uint32_t evt_id;
// Pull event from SOC.
@@ -165,6 +171,12 @@ void intern_softdevice_events_execute(void)
// Fetch BLE Events.
if (!no_more_ble_evts)
{
+ if (m_suspended)
+ {
+ // Cancel pulling next event if event handler was suspended by user.
+ return;
+ }
+
// Pull event from stack
uint16_t evt_len = m_ble_evt_buffer_size;
@@ -189,6 +201,12 @@ void intern_softdevice_events_execute(void)
// Fetch ANT Events.
if (!no_more_ant_evts)
{
+ if (m_suspended)
+ {
+ // Cancel pulling next event if event handler was suspended by user.
+ return;
+ }
+
// Pull event from stack
err_code = sd_ant_event_get(&m_ant_evt_buffer.channel,
&m_ant_evt_buffer.event,
@@ -363,6 +381,45 @@ void SOFTDEVICE_EVT_IRQHandler(void)
}
}
+void softdevice_handler_suspend()
+{
+#ifdef SOFTDEVICE_PRESENT
+ ret_code_t err_code = sd_nvic_DisableIRQ((IRQn_Type)SOFTDEVICE_EVT_IRQ);
+ APP_ERROR_CHECK(err_code);
+#else
+ NVIC_DisableIRQ(SOFTDEVICE_EVT_IRQ);
+#endif
+ m_suspended = true;
+ return;
+}
+
+void softdevice_handler_resume()
+{
+ if (!m_suspended) return;
+ m_suspended = false;
+
+#ifdef SOFTDEVICE_PRESENT
+ ret_code_t err_code;
+
+ // Force calling ISR again to make sure that events not pulled previously
+ // has been processed.
+ err_code = sd_nvic_SetPendingIRQ((IRQn_Type)SOFTDEVICE_EVT_IRQ);
+ APP_ERROR_CHECK(err_code);
+ err_code = sd_nvic_EnableIRQ((IRQn_Type)SOFTDEVICE_EVT_IRQ);
+ APP_ERROR_CHECK(err_code);
+#else
+ NVIC_SetPendingIRQ((IRQn_Type)SOFTDEVICE_EVT_IRQ);
+ NVIC_EnableIRQ(SOFTDEVICE_EVT_IRQ);
+#endif
+
+ return;
+}
+
+bool softdevice_handler_is_suspended()
+{
+ return m_suspended;
+}
+
#if defined(BLE_STACK_SUPPORT_REQD)
uint32_t softdevice_enable_get_default_config(uint8_t central_links_count,
uint8_t periph_links_count,
diff --git nRF5_SDK_11.0.0_89a8197/components/softdevice/common/softdevice_handler/softdevice_handler.h nRF5_SDK_11.0.0_XXXXXXX/components/softdevice/common/softdevice_handler/softdevice_handler.h
index 84d5ff8..9a72955 100644
--- nRF5_SDK_11.0.0_89a8197/components/softdevice/common/softdevice_handler/softdevice_handler.h
+++ nRF5_SDK_11.0.0_XXXXXXX/components/softdevice/common/softdevice_handler/softdevice_handler.h
@@ -150,6 +150,23 @@ uint32_t softdevice_handler_init(nrf_clock_lf_cfg_t * p_clock_lf_cf
*/
uint32_t softdevice_handler_sd_disable(void);
+/**@brief Function for suspending the event handler.
+ *
+ * @details When event handler is disabled, no new events are pulled from SoftDevice.
+ * Application can suspend pulling incoming events when its event queue is full.
+ */
+void softdevice_handler_suspend(void);
+
+/**@brief Function for re-enabling the event handler after suspending.
+ */
+void softdevice_handler_resume(void);
+
+/**@brief Function for retrieving the information about the event handler state
+ *
+ * @retval false Event handler is active.
+ * @retval true Event handler is suspended and events from SD will not be pulled.
+ */
+bool softdevice_handler_is_suspended(void);
/**@brief Function for registering for System (SOC) events.
*
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/main.c nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/main.c
index 83241ef..addb80a 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/main.c
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/main.c
@@ -28,9 +28,47 @@
#include "ser_hal_transport.h"
#include "ser_conn_handlers.h"
#include "boards.h"
+#include "ser_config.h"
#include "ser_phy_debug_comm.h"
+typedef struct __attribute__((packed))
+{
+ uint32_t magic_number; /* Magic number to verify the presence of this structure in memory */
+ uint32_t struct_version : 8; /* Version of this struct format */
+ uint32_t rfu0 : 24; /* Reserved for future use, shall be 0xFFFFFF */
+ uint32_t revision_hash; /* Unique revision identifier */
+ uint32_t version_major : 8; /* Major version number */
+ uint32_t version_minor : 8; /* Minor version number */
+ uint32_t version_patch : 8; /* Patch version number */
+ uint32_t rfu1 : 8; /* Reserved for future use, shall be 0xFF */
+ uint32_t sd_ble_api_version : 8; /* SoftDevice BLE API version number */
+ uint32_t transport_type : 8; /* Connectivity transport type, 1 = UART HCI */
+ uint32_t rfu2 : 16; /* Reserved for future use, shall be 0xFFFF */
+ uint32_t baud_rate; /* UART transport baud rate */
+} version_info_t;
+#if defined ( __CC_ARM )
+static const version_info_t version_info __attribute__((at(0x20000))) =
+#elif defined ( __GNUC__ ) || defined ( __SES_ARM )
+volatile static const version_info_t version_info __attribute__ ((section(".connectivity_version_info"))) =
+#elif defined ( __ICCARM__ )
+__root const version_info_t version_info @ 0x20000 =
+#endif
+{
+ .magic_number = 0x46D8A517,
+ .struct_version = 2,
+ .rfu0 = 0xFFFFFF,
+ .revision_hash = 0,
+ .version_major = APP_VERSION_MAJOR,
+ .version_minor = APP_VERSION_MINOR,
+ .version_patch = APP_VERSION_PATCH,
+ .rfu1 = 0xFF,
+ .sd_ble_api_version = 2,
+ .transport_type = 1,
+ .rfu2 = 0xFFFF,
+ .baud_rate = SER_PHY_UART_BAUDRATE_VAL,
+};
+
/**@brief Main function of the connectivity application. */
int main(void)
{
@@ -65,6 +103,15 @@ int main(void)
{
/* Process SoftDevice events. */
app_sched_execute();
+ if (softdevice_handler_is_suspended())
+ {
+ // Resume pulling new events if queue utilization drops below 50%.
+ if (app_sched_queue_space_get() > (SER_CONN_SCHED_QUEUE_SIZE >> 1))
+ {
+ softdevice_handler_resume();
+ app_sched_execute();
+ }
+ }
/* Process received packets.
* We can NOT add received packets as events to the application scheduler queue because
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/arm5_no_packs/ble_connectivity_s130_hci_pca10028.uvprojx nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/arm5_no_packs/ble_connectivity_s130_hci_pca10028.uvprojx
index 0265b80..13d400b 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/arm5_no_packs/ble_connectivity_s130_hci_pca10028.uvprojx
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/arm5_no_packs/ble_connectivity_s130_hci_pca10028.uvprojx
@@ -366,7 +366,7 @@
<vShortEn>0</vShortEn>
<vShortWch>0</vShortWch>
<VariousControls>
- <MiscControls></MiscControls>
+ <MiscControls>--reduce_paths</MiscControls>
<Define> HCI_TIMER2 BLE_STACK_SUPPORT_REQD __STACK_SIZE=2048 __HEAP_SIZE=1024 BOARD_PCA10028 S130 SER_CONNECTIVITY APP_SCHEDULER_WITH_PAUSE BSP_DEFINES_ONLY NRF51 SOFTDEVICE_PRESENT SWI_DISABLE0</Define>
<Undefine></Undefine>
<IncludePath>..\..\..\config\ble_connectivity_s130_hci_pca10028;..\..\..\config;..\..\..\..\..\..\components\ble\ble_dtm;..\..\..\..\..\..\components\ble\common;..\..\..\..\..\..\components\drivers_nrf\common;..\..\..\..\..\..\components\drivers_nrf\config;..\..\..\..\..\..\components\drivers_nrf\delay;..\..\..\..\..\..\components\drivers_nrf\hal;..\..\..\..\..\..\components\drivers_nrf\uart;..\..\..\..\..\..\components\libraries\crc16;..\..\..\..\..\..\components\libraries\mailbox;..\..\..\..\..\..\components\libraries\scheduler;..\..\..\..\..\..\components\libraries\timer;..\..\..\..\..\..\components\libraries\uart;..\..\..\..\..\..\components\libraries\util;..\..\..\..\..\..\components\serialization\common;..\..\..\..\..\..\components\serialization\common\struct_ser\s130;..\..\..\..\..\..\components\serialization\common\transport;..\..\..\..\..\..\components\serialization\common\transport\ser_phy;..\..\..\..\..\..\components\serialization\common\transport\ser_phy\config;..\..\..\..\..\..\components\serialization\connectivity;..\..\..\..\..\..\components\serialization\connectivity\codecs\common;..\..\..\..\..\..\components\serialization\connectivity\codecs\s130\middleware;..\..\..\..\..\..\components\serialization\connectivity\codecs\s130\serializers;..\..\..\..\..\..\components\serialization\connectivity\hal;..\..\..\..\..\..\components\softdevice\common\softdevice_handler;..\..\..\..\..\..\components\softdevice\s130\headers;..\..\..\..\..\..\components\softdevice\s130\headers\nrf51;..\..\..\..\..\..\components\toolchain;..\..\..\..\..\bsp</IncludePath>
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/Makefile
index f02d9d2..9fc735c 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
@@ -240,7 +240,7 @@ OUTPUT_BINARY_DIRECTORY = $(OBJECT_DIRECTORY)
BUILD_DIRECTORIES := $(sort $(OBJECT_DIRECTORY) $(OUTPUT_BINARY_DIRECTORY) $(LISTING_DIRECTORY) )
#flags common to all targets
-CFLAGS = -D__HEAP_SIZE=1024
+CFLAGS += -D__HEAP_SIZE=1024
CFLAGS += -DBOARD_PCA10028
CFLAGS += -D__STACK_SIZE=2048
CFLAGS += -DNRF51
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/ble_connectivity_gcc_nrf51.ld nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/ble_connectivity_gcc_nrf51.ld
index 52c6617..4654217 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/ble_connectivity_gcc_nrf51.ld
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_hci/armgcc/ble_connectivity_gcc_nrf51.ld
@@ -5,12 +5,19 @@ GROUP(-lgcc -lc -lnosys)
MEMORY
{
- FLASH (rx) : ORIGIN = 0x1b000, LENGTH = 0x25000
+ FLASH (rx) : ORIGIN = 0x1b000, LENGTH = 0x1e000
RAM (rwx) : ORIGIN = 0x20004300, LENGTH = 0x3d00
+ connectivity_version_info (r) : ORIGIN = 0x39000, LENGTH = 0x18
}
SECTIONS
{
+ .connectivity_version_info :
+ {
+ PROVIDE(__start_connectivity_version_info = .);
+ KEEP(*(SORT(.connectivity_version_info*)))
+ PROVIDE(__stop_connectivity_version_info = .);
+ } > connectivity_version_info
.fs_data :
{
PROVIDE(__start_fs_data = .);
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi/armgcc/Makefile
index 39a998a..c8dc2a6 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi_5W/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi_5W/armgcc/Makefile
index 37dbe7c..917ae00 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi_5W/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_spi_5W/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_uart/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_uart/armgcc/Makefile
index 77f246a..1e6f8eb 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_uart/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10028/ser_s130_uart/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_hci/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_hci/armgcc/Makefile
index 989b76f..f0f1df0 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_hci/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_hci/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
@@ -240,7 +240,7 @@ OUTPUT_BINARY_DIRECTORY = $(OBJECT_DIRECTORY)
BUILD_DIRECTORIES := $(sort $(OBJECT_DIRECTORY) $(OUTPUT_BINARY_DIRECTORY) $(LISTING_DIRECTORY) )
#flags common to all targets
-CFLAGS = -DNRF52_PAN_16
+CFLAGS += -DNRF52_PAN_16
CFLAGS += -DNRF52_PAN_23
CFLAGS += -D__STACK_SIZE=2048
CFLAGS += -DSER_CONNECTIVITY
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi/armgcc/Makefile
index 2459d52..e79a308 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi_5W/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi_5W/armgcc/Makefile
index 955648e..8269725 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi_5W/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_spi_5W/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_uart/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_uart/armgcc/Makefile
index fb5210d..9d004e8 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_uart/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10036/ser_s132_uart/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/Makefile
index f4b3fc1..c14fae0 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
@@ -240,7 +240,7 @@ OUTPUT_BINARY_DIRECTORY = $(OBJECT_DIRECTORY)
BUILD_DIRECTORIES := $(sort $(OBJECT_DIRECTORY) $(OUTPUT_BINARY_DIRECTORY) $(LISTING_DIRECTORY) )
#flags common to all targets
-CFLAGS = -D__STACK_SIZE=2048
+CFLAGS += -D__STACK_SIZE=2048
CFLAGS += -DNRF52
CFLAGS += -DSOFTDEVICE_PRESENT
CFLAGS += -DSER_CONNECTIVITY
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/ble_connectivity_gcc_nrf52.ld nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/ble_connectivity_gcc_nrf52.ld
index 3c6e5b1..996be3c 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/ble_connectivity_gcc_nrf52.ld
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_hci/armgcc/ble_connectivity_gcc_nrf52.ld
@@ -5,12 +5,19 @@ GROUP(-lgcc -lc -lnosys)
MEMORY
{
- FLASH (rx) : ORIGIN = 0x1c000, LENGTH = 0x64000
+ FLASH (rx) : ORIGIN = 0x1c000, LENGTH = 0x34000
RAM (rwx) : ORIGIN = 0x20004300, LENGTH = 0xbd00
+ connectivity_version_info (r) : ORIGIN = 0x50000, LENGTH = 0x18
}
SECTIONS
{
+ .connectivity_version_info :
+ {
+ PROVIDE(__start_connectivity_version_info = .);
+ KEEP(*(SORT(.connectivity_version_info*)))
+ PROVIDE(__stop_connectivity_version_info = .);
+ } > connectivity_version_info
.fs_data :
{
PROVIDE(__start_fs_data = .);
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi/armgcc/Makefile
index 5ef79e6..9618498 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi_5W/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi_5W/armgcc/Makefile
index 86f56c1..5cc47ef 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi_5W/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_spi_5W/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")
diff --git nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_uart/armgcc/Makefile nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_uart/armgcc/Makefile
index d7efd5d..ab0e8b9 100644
--- nRF5_SDK_11.0.0_89a8197/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_uart/armgcc/Makefile
+++ nRF5_SDK_11.0.0_XXXXXXX/examples/ble_central_and_peripheral/ble_connectivity/pca10040/ser_s132_uart/armgcc/Makefile
@@ -13,7 +13,7 @@ include $(TEMPLATE_PATH)/Makefile.posix
endif
MK := mkdir
-RM := rm -rf
+RM := cmake -E remove_directory
#echo suspend
ifeq ("$(VERBOSE)","1")