Skip to content

Commit 0b86232

Browse files
gunnsdattergunnsdatter
committed
Merge pull request #94 in SA/ble_examples from develop to master
Squashed commit of the following: commit b3b4995 Author: Marie Hernes <[email protected]> Date: Thu Oct 17 08:07:20 2019 -0500 Merge pull request #93 in SA/ble_examples from feature/move_develop_to_3_20 to develop Squashed commit of the following: commit 168dcbb35b84e86ff7bdddf3ad43382e3672712d Author: Marie Hernes <[email protected]> Date: Thu Oct 17 14:42:56 2019 +0200 Small changes in the readmes. commit 1a84de2b67687c23e638396f9587d010cf70d867 Author: Marie Hernes <[email protected]> Date: Thu Oct 17 14:12:07 2019 +0200 Fix memory error. commit a365389f9d770a5233b2913edef704334be9b2b2 Author: Marie Hernes <[email protected]> Date: Thu Oct 17 09:05:40 2019 +0200 SMall change in readme. commit e9912d2828bc5095b2bedcd889d00a20e5d276c5 Author: Marie Hernes <[email protected]> Date: Thu Oct 17 09:03:33 2019 +0200 Remove untested makefiles. commit 3d3855295a518cf9e733171a9bf81b1b1078d108 Author: Marie Hernes <[email protected]> Date: Thu Oct 17 08:53:47 2019 +0200 Ignore Tools/src generated files. commit 9a07dba265b231b714ccd9cec9af7bd35753c9d3 Author: Marie Hernes <[email protected]> Date: Tue Oct 8 11:40:28 2019 +0200 Add instructions for iar. commit 993c788c0718a27934bbd10f8f97eea18171beb2 Author: Marie Hernes <[email protected]> Date: Tue Oct 8 10:56:10 2019 +0200 Project build instructions for ccs. commit cbd90571bbb7679e6a631ff696d4995a628ab07f Author: Marie Hernes <[email protected]> Date: Tue Oct 8 10:46:31 2019 +0200 Updated readme commit a59e804c217b8165c7103233dab1a801a1eee563 Author: Marie Hernes <[email protected]> Date: Tue Oct 8 10:38:23 2019 +0200 Update examples. commit c7417392de706267b7bd896be0ee6fa7d364e865 Author: Marie Hernes <[email protected]> Date: Fri Sep 6 14:35:46 2019 +0200 Small changes, re-worked menu system. commit f8d64e710b47c30e68bc6d1080d9273d0542569b Author: Marie Hernes <[email protected]> Date: Fri Sep 6 14:35:18 2019 +0200 Updated readmes. commit aa8c6949f686e19ddf9b4cfb4e38dfc22eff3333 Author: Marie Hernes <[email protected]> Date: Tue Sep 3 10:51:56 2019 +0200 IAR versions now build. commit 93ce5681236d9286b4e41b9d66148d048ae544f5 Author: Marie Hernes <[email protected]> Date: Fri Aug 9 15:13:06 2019 +0200 IAR project SSSS builds for CC2652. commit 9a7819b928a61454453cec703f015f5503802a6c Author: Marie Hernes <[email protected]> Date: Fri Aug 9 14:45:38 2019 +0200 SSSC builds for CC2652 in IAR. commit 1d68ab4fcdef57ed3b9c7587bae466ced729cd58 Author: Marie Hernes <[email protected]> Date: Fri Aug 9 14:03:21 2019 +0200 Remove unecessary files. commit 5190c37db09fecd77e980f6b9d2ac0ce3076403a Author: Marie Hernes <[email protected]> Date: Fri Aug 9 13:59:56 2019 +0200 IAR builds for tree structure netwrok. commit 4787f5adfc6a6dd3103dfab3cc840cf22d8fddbf Author: Marie Hernes <[email protected]> Date: Wed Aug 7 12:47:01 2019 +0200 Restructured tree network project. commit 1a509456543a1cf2697d5cce9f669cf18371f3ab Author: Marie Hernes <[email protected]> Date: Wed Aug 7 10:29:23 2019 +0200 SSSS builds for CC1352r1 in ccs. commit 6f3cfa83a7155e47e804701754c4233a6cedf296 Author: Marie Hernes <[email protected]> Date: Thu Aug 1 14:58:07 2019 +0200 SSSC builds for cc1352r1 for ccs. commit 307ab50fb8911533361f30f57b4cebdf26a4e961 Author: Marie Hernes <[email protected]> Date: Thu Aug 1 14:05:22 2019 +0200 SSSS builds in CCS. ... and 16 more commits
1 parent b848bcc commit 0b86232

File tree

228 files changed

+53359
-34102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+53359
-34102
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
**/config/src
1111
**/tirtos/src
1212
**/tirtos/iar/config/
13+
**/Tools/src
1314
*.dep
1415
*.log
1516
*.ewt

‎README.md‎

Lines changed: 59 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
# Introduction
1414

15-
These examples and demos are for **TI SimpleLink CC13x2 / CC26x2 SDK 2.40.00.XX**
15+
These examples and demos are for **TI SimpleLink CC13x2 / CC26x2 SDK 3.20.00.67**
1616

1717
This repository contains *Bluetooth&reg;* 5 sample applications for
1818
Texas Instruments' SimpleLink CC13x2 / CC26x2 SDK. These examples have not been
@@ -23,7 +23,7 @@ validated as production-ready.
2323

2424
To use the examples and tools in this repository, please download and install
2525
the [SimpleLink CC13x2 / CC26x2 SDK](http://www.ti.com/tool/SIMPLELINK-CC13X2-26X2-SDK) **first**, and if
26-
necessary [buy an CC26X2](http://www.ti.com/tool/LAUNCHXL-CC26X2R1) or [CC1352](http://www.ti.com/tool/LAUNCHXL-CC1352R1) evaluation kit].
26+
necessary [buy an CC26X2](http://www.ti.com/tool/LAUNCHXL-CC26X2R1) or [CC1352](http://www.ti.com/tool/LAUNCHXL-CC1352R1) evaluation kit.
2727

2828
If you have any questions please refer to the [FAQ page](docs/faq.md).
2929
For examples for other SDK versions and platforms, see table below.
@@ -36,11 +36,23 @@ For examples for other SDK versions and platforms, see table below.
3636
</tr>
3737
<tr>
3838
<td>
39-
<a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-2.40">TI SimpleLink CC13x2 / CC26x2 SDK 2.40.00.81 (current)</a>
39+
<a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-3.20">TI SimpleLink CC13x2 / CC26x2 SDK 3.20.00.67 (current)</a>
4040
</td>
4141
<td>
4242
<ul>
43-
<li><a href="#simple-serial-socket">Simple Serial Socket</li>
43+
<li>Simple Serial Socket</li>
44+
<li>Bluetooth 5 Throughput Demo</li>
45+
<li>Tree Structure Network</li>
46+
</ul>
47+
</td>
48+
</tr>
49+
<tr>
50+
<td>
51+
<a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-2.40">TI SimpleLink CC13x2 / CC26x2 SDK 2.40.00.81</a>
52+
</td>
53+
<td>
54+
<ul>
55+
<li>Simple Serial Socket</li>
4456
</ul>
4557
</td>
4658
</tr>
@@ -53,6 +65,8 @@ For examples for other SDK versions and platforms, see table below.
5365
<li>Full Duplex Bidirectional Audio Demo (Central/Peripheral)</li>
5466
<li>I2S Echo</li>
5567
<li>Serial Port Profile</li>
68+
<li>Bluetooth 5 Throughput Demo</li>
69+
<li>Tree Structure Network</li>
5670
</ul>
5771
</td>
5872
</tr>
@@ -110,7 +124,7 @@ For examples for other SDK versions and platforms, see table below.
110124
</tr>
111125
<tr>
112126
<td>
113-
<a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-1.40">TI SimpleLink CC2640R2 SDK 1.40.00.42</a>
127+
<a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-1.40">TI SimpleLink CC2640R2 SDK 1.40.00.45</a>
114128
</td>
115129
<td>
116130
<ul>
@@ -194,6 +208,10 @@ The numbering scheme is in the form of M.mm.pp.bb. The fields pp.bb are incremen
194208
as GitHub examples are released, M.mm will map a GitHub release to a SimpleLink
195209
SDK release.
196210

211+
### 3.20.00.00
212+
Initial offering of SimpleLink CC13x2 / CC26x2 SDK 3.20.00.67 examples,
213+
supporting the rev. E of the SimpleLinkCC26x2 and CC13x2 MCUs.
214+
197215
### 2.40.00.00
198216
Initial offering of SimpleLink CC13x2 / CC26x2 SDK 2.40.00.81 examples.
199217

@@ -214,19 +232,17 @@ This repository can be cloned/download anywhere on your computer. There is a
214232
dependency between this repository and the SimpleLink CC26x2 SDK install
215233
location.
216234

217-
By default the SimpleLink CC13x2 / CC26x2 SDK will install to:
218-
219-
C:\ti\simplelink_cc13x2_26x2_sdk_2_40_00_81
235+
By default the SimpleLink CC13x2 / CC26x2 SDK will install to ``C:\ti\``
220236

221-
If the SimpleLink CC13x2 / CC26x2 SDK must be installed to a different location, then
222-
see the [FAQ page](docs/faq.md) for IDE specific instructions for changing
237+
If the SimpleLink CC13x2 / CC26x2 SDK must be installed to a different location,
238+
then see the [FAQ page](docs/faq.md) for IDE specific instructions for changing
223239
environment variables.
224240

225241
## Required Tools
226242

227-
Similar to the SimpleLink CC13x2 / CC26x2 SDK, the examples in this repository support
228-
the CCS and IAR toolchains. Please pay careful attention to versions of these
229-
tools, please refer to the release notes for supported versions.
243+
Similar to the SimpleLink CC13x2 / CC26x2 SDK, the examples in this repository
244+
support the CCS and IAR toolchains. Please pay careful attention to versions of
245+
these tools, please refer to the release notes for supported versions.
230246

231247
For more information on toolchain setup, please refer to our
232248
[FAQ page](docs/faq.md).
@@ -248,7 +264,7 @@ socket over BLE implementation.
248264

249265
**Note: this example replaces the SPP over BLE example**
250266

251-
#### For CC1352
267+
#### For CC1352R
252268

253269
* Simple Serial Socket Client
254270
* [Documentation](examples/rtos/CC1352R1_LAUNCHXL/ble5apps/simple_serial_socket_client/readme.md)
@@ -261,7 +277,7 @@ socket over BLE implementation.
261277
* [CCS Project Files](examples/rtos/CC1352R1_LAUNCHXL/ble5apps/simple_serial_socket_server/tirtos/ccs)
262278
* [Source](examples/rtos/CC1352R1_LAUNCHXL/ble5apps/simple_serial_socket_server/src)
263279

264-
#### For CC26x2
280+
#### For CC26x2R
265281

266282
* Simple Serial Socket Client
267283
* [Documentation](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/simple_serial_socket_client/readme.md)
@@ -274,6 +290,34 @@ socket over BLE implementation.
274290
* [CCS Project Files](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/simple_serial_socket_server/tirtos/ccs)
275291
* [Source](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/simple_serial_socket_server/src)
276292

293+
### Bluetooth 5 Throughput Demo
294+
295+
Showcase a high (near theoretical max) data throughput over Bluetooth 5. The demo
296+
can be run with two CC26x2 Launchpads, or one CC26x2 Launchpad and one smartphone
297+
with the Simplelink Starter app.
298+
299+
* throughput\_peripheral
300+
* [Documentation](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/throughput_peripheral/readme.md)
301+
* [CCS Project Files](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/throughput_peripheral/tirtos/ccs)
302+
* [Source](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/throughput_peripheral/src)
303+
* throughput\_central
304+
* [Documentation](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/throughput_central/readme.md)
305+
* [CCS Project Files](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/throughput_central/tirtos/ccs)
306+
* [Source](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/throughput_central/src)
307+
308+
### Tree Structure Network
309+
310+
Set up a tree structure network using tiers of star network. This network format
311+
can be used to set up a network with up to 47 devices. The same application is used
312+
for the founding node (grandpa node), the middle nodes (father nodes) and the
313+
children nodes.
314+
315+
* tree_structure_network
316+
* [Documentation](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/tree_structure_network/readme.md)
317+
* [CCS Project Files](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/tree_structure_network/tirtos/ccs)
318+
* [IAR Project Files](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/tree_structure_network/tirtos/iar)
319+
* [Source](examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/tree_structure_network/src)
320+
277321
## References
278322

279323
The following reference pages may be helpful during general Bluetooth Low

‎docs/faq.md‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
## Frequently Asked Questions
22

3-
* [What if I installed the SimpleLink CC26x2 SDK at a non default location (e.g. Not at ``C:\ti\``)?](#what-if-i-installed-the-simplelink-cc26x2-sdk-at-a-non-default-location-eg-not-at-cti)
3+
* [What if I installed the SimpleLink CC13X2 / CC26x2 SDK at a non default location (e.g. Not at ``C:\ti\``)?](#what-if-i-installed-the-simplelink-cc13x2-26x2-sdk-at-a-non-default-location-eg-not-at-cti)
44
* [How can I setup my toolchain for use with the ble\_examples repo?](#how-can-i-setup-my-toolchain-for-use-with-the-ble_examples-repo)
55
* [I am using a LaunchPad device, how can I view display data?](#i-am-using-a-launchpad-device-how-can-i-view-display-data)
66
---
77

8-
### <a name="default"></a>What if I installed the SimpleLink CC26x2 SDK at a non default location (e.g. Not at ``C:\ti\``)?
8+
### <a name="default"></a>What if I installed the SimpleLink CC13X2 / CC26x2 SDK at a non default location (e.g. Not at ``C:\ti\``)?
99

1010
All projects reference files from the BLE stack using environment variables, you
11-
can change this in your IDE's project files.
11+
can change this in your IDE's project files.
1212

13-
**CCS**
14-
15-
No changes to the project is necessary. You just need to ensure that Code
16-
Composer Studio was able to discover the SimpleLink CC26x2 SDK in the
17-
available *RTSC Products* tab. See the [BLE5-Stack User's Guide](http://dev.ti.com/tirex/#/?link=Software%2FSimpleLink%20CC26X2%20SDK%2FDocuments%2FBLE5-Stack%2FBLE5-Stack%20User's%20Guide)
18-
for more details.
19-
20-
**IAR**
13+
Alternatively, you can make a symlink in the default location pointing to your
14+
custom location. E.g., if you have cloned this repo to ``C:\git\`` you can use
15+
the following command:
2116

22-
1. Navigate to the sample project directory within the repo and open the
23-
`.custom_argvars` file.
24-
1. Update the value of ``SIMPLELINK_CORE_SDK_INSTALL_DIR`` to point to your
25-
custom installation directory where you installed the SimpleLink CC26x2 SDK.
17+
``mklink /d ble_examples-simplelink_cc13x2_26x2_sdk-3.20 C:\git\ble_examples``
2618

2719
---
2820
### <a name="versioning"></a>How should I keep my application based on a TI BLE-Stack SDK under version control?
@@ -39,20 +31,29 @@ You can read more here: [Version Control](suggested_workflow.md)
3931

4032
**CCS**
4133

42-
For BLE5-Stack examples, see the *Using BLE5-Stack Projects with CCS* section in the
43-
[BLE5-Stack Quick Start Guide](http://dev.ti.com/tirex/#/?link=Software%2FSimpleLink%20CC26X2%20SDK%2FDocuments%2FBLE5-Stack%2FBLE5-Stack%20Quick%20Start%20Guide)
34+
1. Import the project to your CCS workspace
35+
2. Open Project -> Properties -> General -> Products and select the 3.20.00.68
36+
version of SimpleLink CC13x2 26x2 SDK.
37+
3. Build and flash the example project.
4438

4539
**IAR**
4640

47-
For BLE5-Stack examples, see the *Using BLE5-Stack Projects with IAR* section in the
48-
[BLE5-Stack Quick Start Guide](http://dev.ti.com/tirex/#/?link=Software%2FSimpleLink%20CC26X2%20SDK%2FDocuments%2FBLE5-Stack%2FBLE5-Stack%20Quick%20Start%20Guide)
41+
1. Open IAR, if there is any active workspace close it.
42+
2. Open Tools -> Configure Custom Argvars -> Global and make sure no groups are
43+
active (if they are you can disable or delete them with the buttons on the
44+
left side). Import ``ble_examples.custom_argvars`` from ``ble_examples\tools\iar``.
45+
3. Close the Configure Custom Argvars view. Open the ``.template.eww`` file with
46+
the Open Workspace option.
47+
4. When asked to select a folder for the workspace, make sure to select an empty
48+
folder.
49+
5. Build and flash the example project.
4950

5051
---
5152

5253
### <a name="display"></a>I am using a LaunchPad device, how can I view display data?
5354
LaunchPad projects are already set up to use the tidriver Display. For more
5455
information about the Display driver please see the Display.h driver
55-
documentation in the SimpleLink CC26x2 SDK (`docs/tidrivers/tidriversAPI.html`)
56+
documentation in the SimpleLink CC13X2 / CC26x2 SDK (`docs/tidrivers/tidriversAPI.html`)
5657

5758
To setup your PC to receive this data please follow the steps below:
5859

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/simple_serial_socket_client/src/app/simple_serial_socket_client.c renamed to examples/rtos/CC1352R1_LAUNCHXL/ble5apps/simple_serial_socket_client/Application/simple_serial_socket_client.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ void SimpleSerialSocketClient_genericClockHandler(UArg a0)
10741074
static void SimpleSerialSocketClient_connEvtCB(Gap_ConnEventRpt_t *pReport)
10751075
{
10761076
// Enqueue the event for processing in the app context.
1077-
if( SimpleSerialSocketClient_enqueueMsg(SSSC_EVT_CONN, 0 ,(uint8_t *) pReport, NULL) == FALSE)
1077+
if( SimpleSerialSocketClient_enqueueMsg(SSSC_EVT_CONN, 0 ,(uint8_t *) pReport, NULL) != SUCCESS)
10781078
{
10791079
ICall_free(pReport);
10801080
}
@@ -1095,6 +1095,7 @@ static void SimpleSerialSocketClient_connEvtCB(Gap_ConnEventRpt_t *pReport)
10951095
static uint8_t SimpleSerialSocketClient_enqueueMsg(uint8_t event, uint8_t state,
10961096
uint8_t *pData, uint16_t arg0)
10971097
{
1098+
uint8_t success;
10981099
ssscEvt_t *pMsg = ICall_malloc(sizeof(ssscEvt_t));
10991100

11001101
// Create dynamic pointer to message.
@@ -1106,7 +1107,8 @@ static uint8_t SimpleSerialSocketClient_enqueueMsg(uint8_t event, uint8_t state,
11061107
pMsg->arg0 = arg0;
11071108

11081109
// Enqueue the message.
1109-
return Util_enqueueMsg(appMsgQueue, syncEvent, (uint8_t *)pMsg);
1110+
success = Util_enqueueMsg(appMsgQueue, syncEvent, (uint8_t *)pMsg);
1111+
return (success) ? SUCCESS : FAILURE;
11101112
}
11111113

11121114
return FALSE;
@@ -1148,7 +1150,7 @@ void SimpleSerialSocketClient_scanCb(uint32_t evt, void* pMsg, uintptr_t arg)
11481150
return;
11491151
}
11501152

1151-
if(SimpleSerialSocketClient_enqueueMsg(event, SUCCESS, pMsg, NULL) == FALSE)
1153+
if(SimpleSerialSocketClient_enqueueMsg(event, SUCCESS, pMsg, NULL) != SUCCESS)
11521154
{
11531155
ICall_free(pMsg);
11541156
}

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/simple_serial_socket_client/src/app/simple_serial_socket_client.h renamed to examples/rtos/CC1352R1_LAUNCHXL/ble5apps/simple_serial_socket_client/Application/simple_serial_socket_client.h

File renamed without changes.

0 commit comments

Comments
 (0)