Commit d28eeff
committed
Merge pull request #96 in SA/ble_examples from simplelink_cc2640r2_sdk-3.30-develop to master
Squashed commit of the following:
commit d96c52668836607e5628b1eed6378b0764754572
Author: Marie Hernes <[email protected]>
Date: Fri Nov 15 14:49:33 2019 +0100
Clean up after rebase.
commit fe7e5a8eaab59a8d462c6439d835335fce89b21a
Author: Marie Hernes <[email protected]>
Date: Fri Nov 15 07:28:53 2019 -0600
Merge pull request #95 in SA/ble_examples from feature/move-develop-to-sss to simplelink_cc2640r2_sdk-3.30-develop
Squashed commit of the following:
commit 34d4fe65f8403bd0e25fbbd4e428f4c73923fc25
Author: Marie Hernes <[email protected]>
Date: Fri Nov 15 09:52:34 2019 +0100
Minor change.
commit 86f286d74313285ff0fc1a07671b5ec81d7bb61e
Author: Marie Hernes <[email protected]>
Date: Fri Nov 15 08:30:57 2019 +0100
Deleted everything that is not SSS
commit 37cf65204193d44de12d5b2467fbc1f0539c6288
Author: Marie Hernes <[email protected]>
Date: Fri Nov 15 07:46:23 2019 +0100
small changes to settings.
commit 0af161bbe7dfeda055480ddfd1bde938e3efa442
Author: Marie Hernes <[email protected]>
Date: Fri Nov 15 07:43:15 2019 +0100
Changes in docs.
commit 381945a735b8e9ea27cf922f1d6524a25636b9e3
Author: Marie Hernes <[email protected]>
Date: Thu Nov 14 14:42:52 2019 +0100
Fix memory issue.
commit 3fd413df0feb8f16373bb69d602fa6f2c4bab408
Author: Marie Hernes <[email protected]>
Date: Thu Nov 14 14:32:59 2019 +0100
Small changes client.
commit 0f9b90e98721563b8e98ba1deba1e47cde9ca7b7
Author: Marie Hernes <[email protected]>
Date: Thu Nov 14 12:51:42 2019 +0100
Configure RF mode in build config.
commit 42def47ec9ec6ee2ef3ee46e9059849f154d54f0
Author: Marie Hernes <[email protected]>
Date: Thu Nov 14 12:49:30 2019 +0100
Configure RF mode in build config.
commit cd7e6ab80458e59e171d98cfaa9c9cc96a95fdcc
Author: Marie Hernes <[email protected]>
Date: Thu Nov 14 12:45:54 2019 +0100
Remove cache as ram remains.
commit 898f490b5b2ea24d711f43962ec1eee390218aa4
Author: Marie Hernes <[email protected]>
Date: Thu Nov 14 12:41:54 2019 +0100
Fix error with SHOW_BD_ADDR.
commit 638e578af89a733b3c25f5245e6b70e81c11381c
Author: Marie Hernes <[email protected]>
Date: Thu Nov 14 10:14:42 2019 +0100
Some changes.
commit 2b30e1d419bd72e03af9292fc54cca793d303695
Author: Marie Hernes <[email protected]>
Date: Tue Nov 12 12:37:36 2019 +0100
SOmething is wrong
commit 8afa6b0c24d0b752a9b6bd565a830b32d51a8697
Author: Marie Hernes <[email protected]>
Date: Tue Nov 12 10:49:59 2019 +0100
Iar for SSSS.
commit 127dce35d627c2d88467245852fb01e75a5baf6f
Author: Marie Hernes <[email protected]>
Date: Tue Nov 12 10:42:00 2019 +0100
Effort to help iar.
commit 0ce24d66f6ae1cf4eba7c1fbe82a4a6872d0a7ad
Author: Marie Hernes <[email protected]>
Date: Tue Nov 12 10:32:20 2019 +0100
peripheral observer builds and runs in CCS
commit 5c7551efa44746a0a7ca721fee08137e28c45271
Author: Marie Hernes <[email protected]>
Date: Mon Nov 11 12:59:24 2019 +0100
Deleted ewd.
commit a72d8480beee960555ba53a0e2b2d283b42ecd48
Author: Marie Hernes <[email protected]>
Date: Mon Nov 11 12:58:13 2019 +0100
Builds and runs in IAR
commit 34eb7540e33c149dd0c548444ee1085201b4ba3a
Author: Marie Hernes <[email protected]>
Date: Mon Nov 11 12:00:56 2019 +0100
More random changes.
commit 603b8cfb190c4a8ff08f8ef5fd8d0415cb30f264
Author: Marie Hernes <[email protected]>
Date: Tue Nov 5 13:34:11 2019 +0100
IAR first try.
commit d7d19a719474b88a570360bf3ae428d3ed7d88dd
Author: Marie Hernes <[email protected]>
Date: Tue Nov 5 12:16:29 2019 +0100
SSSS and sSSC builds and runs in CCS.
commit 4d72387057b7327245a408a7ddb4096d0db50b1a
Author: Sean Lyons <[email protected]>
Date: Tue Jan 1 14:33:14 2019 -0600
Merge pull request #87 in SA/ble_examples from feature/fix_SSS_client_not_reconnecting_after_termination to simplelink_cc2640r2_sdk-2.20
Squashed commit of the following:
commit 94b26cac7840dd13ead27d50305963e5193fa8fc
Author: Wennerfeldt <[email protected]>
Date: Thu Oct 18 13:16:59 2018 +0200
Fix so that client now starts discovery again following a termination.
Fixed internal state in discovery support functions not being properly
reset.
commit b7af2d960078f1418ec36521613c1190062b1d9a
Author: Sean Lyons <[email protected]>
Date: Tue Jan 1 14:35:46 2019 -0600
Merge pull request #88 in SA/ble_examples from feature/add_heap_buffer_limit_to_sss_example to simplelink_cc2640r2_sdk-2.20-develop
Squashed commit of the following:
commit 93d0978a8d4cfdf71eadf5dc0f30fe118f102bc9
Author: Wennerfeldt <[email protected]>
Date: Wed Oct 24 08:48:12 2018 +0200
Added an "alloacte only if enough headroom" helper function that is sued
by the streaming service to reserve heap for the BLE appliation/stack.
commit d95cd3389608ca315f9b0b1ec8754533be6314a6
Author: Sean Lyons <[email protected]>
Date: Thu Sep 6 21:15:16 2018 +0200
Fix typo in readme
commit 7ac750c02cd7d997adb7bbff43d06cd7b224d9df
Author: Sean Lyons <[email protected]>
Date: Thu Sep 27 09:12:34 2018 -0500
Merge pull request #85 in SA/ble_examples from bugfix/LPRFAPPS-952-update-board-files-on-s3-example to simplelink_cc2640r2_sdk-2.20-develop
Squashed commit of the following:
commit af24ffc2060b29a89ba2c2d3137ce6bbbaacb5d6
Author: Wennerfeldt <[email protected]>
Date: Wed Sep 26 08:43:23 2018 +0200
Updates based on feedback
commit e1df1bd6a518f5d6dd7fb49e82cb3ef63c4354d3
Author: Wennerfeldt <[email protected]>
Date: Tue Sep 25 13:49:23 2018 +0200
LPRFAPPS-952: Added information on how to increase UART ring buffer and
how to enable "UART mode" support for third-party applications.
commit 074b433a9e901c28a26d2300a6d5d975f822877d
Author: Sean Lyons <[email protected]>
Date: Thu Sep 6 21:09:51 2018 +0200
Remove version # from SSSC readmes
commit d23fceb7d4efd4f945e4910c8409964cfcf7f917
Author: Sean Lyons <[email protected]>
Date: Thu Sep 6 15:45:57 2018 +0200
Readme updates
commit 54b56b5830f9a83eab03a3677853568c5446063a
Author: Sean Lyons <[email protected]>
Date: Thu Sep 6 08:24:39 2018 -0500
Merge pull request #84 in SA/ble_examples from feature/simple_serial_bridge to simplelink_cc2640r2_sdk-2.20-develop
Squashed commit of the following:
commit 8e27e047e0e7700805cceb5e790de5e4acfff879
Author: Wennerfeldt <[email protected]>
Date: Wed Sep 5 15:08:20 2018 +0200
Updated readme files
commit 9ca594e36c1ddc2fd6b16c5d22fa989d0ff95213
Author: Wennerfeldt <[email protected]>
Date: Wed Sep 5 08:57:13 2018 +0200
Refactoring and adjustments based on feedback
commit 1f9509b7c745bdba9a37ca7ef6dd0f3754f0e379
Author: Wennerfeldt <[email protected]>
Date: Thu Aug 30 10:41:37 2018 +0200
Refactoring of client side code, changed project names
commit 0c1fad0cb04fd113bf18380e775e9f7952a68995
Author: Wennerfeldt <[email protected]>
Date: Mon Aug 27 15:14:02 2018 +0200
Memory leak fixes and polishing
commit 4e6a4717fa3f43b94e7b5798bdcdec1cdc759e5b
Author: Wennerfeldt <[email protected]>
Date: Wed Aug 22 15:29:33 2018 +0200
Initial commit of Simple serial bridge example
commit aad4666b4d0f91a694c4b6612d8aa9318a9bd58a
Author: Sean Lyons <[email protected]>
Date: Thu Sep 6 15:22:44 2018 +0200
Batch prot to SDK 2.20
commit d4ee27813e2f1c56ae76187f753f70c0f8ae25bd
Author: Sean Lyons <[email protected]>
Date: Thu Sep 6 10:12:59 2018 +0200
Batch up to CC2640R2 SDK 2.201 parent 0b86232 commit d28eeff
File tree
213 files changed
+13296
-64677
lines changed- docs
- examples/rtos
- CC1352R1_LAUNCHXL/ble5apps
- simple_serial_socket_client
- Application
- Startup
- Tools
- Defines
- tirtos
- ccs
- iar
- simple_serial_socket_server
- Application
- Startup
- Tools
- Defines
- tirtos
- ccs
- iar
- CC2640R2_LAUNCHXL/bleapps
- simple_serial_socket_client
- src
- app
- stack
- tirtos
- ccs
- iar
- app
- stack
- simple_serial_socket_server
- src
- app
- stack
- tirtos
- ccs
- iar
- app
- stack
- CC26X2R1_LAUNCHXL/ble5apps
- simple_serial_socket_client
- Application
- Startup
- Tools
- Defines
- tirtos
- ccs
- iar
- simple_serial_socket_server
- Application
- Startup
- Tools
- Defines
- tirtos
- ccs
- iar
- throughput_central
- Application
- Startup
- Tools
- Defines
- tirtos
- ccs
- throughput_peripheral
- Application
- Startup
- Tools
- Defines
- tirtos
- ccs
- tree_structure_network
- Application
- Startup
- Tools
- Defines
- resources
- tirtos
- ccs
- iar
- source/ti
- ble5stack/profiles
- ccservice
- simple_service_discovery
- throughput
- tree_structure_network
- blestack
- profiles/serial_port
- sdi/src
- inc
- tools
- iar
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
213 files changed
+13296
-64677
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | | - | |
18 | | - | |
| 17 | + | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
| 25 | + | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
39 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
40 | 51 | | |
41 | 52 | | |
42 | 53 | | |
| |||
100 | 111 | | |
101 | 112 | | |
102 | 113 | | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
108 | 119 | | |
109 | 120 | | |
110 | 121 | | |
| |||
201 | 212 | | |
202 | 213 | | |
203 | 214 | | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
204 | 218 | | |
205 | 219 | | |
206 | 220 | | |
207 | 221 | | |
208 | 222 | | |
209 | 223 | | |
210 | 224 | | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
211 | 228 | | |
212 | | - | |
213 | | - | |
| 229 | + | |
| 230 | + | |
214 | 231 | | |
215 | 232 | | |
216 | 233 | | |
217 | 234 | | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
218 | 241 | | |
219 | 242 | | |
220 | 243 | | |
221 | | - | |
222 | | - | |
| 244 | + | |
| 245 | + | |
223 | 246 | | |
224 | 247 | | |
225 | 248 | | |
| |||
229 | 252 | | |
230 | 253 | | |
231 | 254 | | |
232 | | - | |
| 255 | + | |
233 | 256 | | |
234 | 257 | | |
235 | | - | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
236 | 261 | | |
237 | | - | |
238 | | - | |
| 262 | + | |
| 263 | + | |
239 | 264 | | |
240 | 265 | | |
241 | 266 | | |
242 | 267 | | |
243 | | - | |
244 | | - | |
245 | | - | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
246 | 272 | | |
247 | 273 | | |
248 | 274 | | |
| |||
264 | 290 | | |
265 | 291 | | |
266 | 292 | | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | 293 | | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
287 | 298 | | |
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 | | - | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
320 | 303 | | |
321 | 304 | | |
322 | 305 | | |
323 | 306 | | |
324 | | - | |
325 | | - | |
326 | | - | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
327 | 310 | | |
328 | 311 | | |
329 | | - | |
| 312 | + | |
330 | 313 | | |
331 | 314 | | |
332 | 315 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | | - | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | | - | |
| 12 | + | |
12 | 13 | | |
13 | | - | |
14 | | - | |
15 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
16 | 24 | | |
17 | | - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
18 | 29 | | |
19 | 30 | | |
20 | 31 | | |
| |||
27 | 38 | | |
28 | 39 | | |
29 | 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 | + | |
30 | 65 | | |
31 | 66 | | |
32 | 67 | | |
33 | 68 | | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
| 69 | + | |
| 70 | + | |
39 | 71 | | |
40 | 72 | | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
| 73 | + | |
| 74 | + | |
50 | 75 | | |
51 | 76 | | |
52 | 77 | | |
53 | 78 | | |
| 79 | + | |
54 | 80 | | |
55 | 81 | | |
56 | | - | |
| 82 | + | |
57 | 83 | | |
58 | 84 | | |
59 | 85 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
101 | | - | |
| 101 | + | |
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
181 | | - | |
182 | | - | |
| 181 | + | |
| 182 | + | |
183 | 183 | | |
184 | 184 | | |
185 | 185 | | |
| |||
0 commit comments