Skip to content

Commit 278e2cb

Browse files
author
Sean Lyons
committed
Merge pull request #61 in SA/ble_examples from feature/spp_ble_1_40_update to develop
Squashed commit of the following: commit 30c24a8d9ddea22603df9c466232899d7f39254f Author: Haq <[email protected]> Date: Fri Aug 25 17:13:25 2017 -0700 readded some files after merge commit eab2741a2f273d41c4118ca16a8a222fa87aef0e Author: Haq <[email protected]> Date: Thu Aug 24 12:22:58 2017 -0700 ble5 iar working commit 72e3ec6eeb75f4b16884e7f92b819fb426a0c71a Author: Haq <[email protected]> Date: Wed Aug 23 14:13:02 2017 -0700 ble5 ccs working commit 77adcb11754c64710ddb71e2f80313b4fbaea60b Author: Haq <[email protected]> Date: Wed Aug 23 08:54:49 2017 -0700 ble5 iar not working commit a9d739098018fca180e5157289ab1e0e11c1aec8 Author: Haq <[email protected]> Date: Tue Aug 22 10:35:26 2017 -0700 fixed BLE3 CCS projects commit 2b9388dbd0d5cf11f97daea2552d3a6ef5adf1b6 Author: Haq <[email protected]> Date: Fri Aug 18 12:25:12 2017 -0700 porting spp_ble_client to 1_40 commit 92d2d5be042fecae206185b75665ba3c37a73a32 Author: Haq <[email protected]> Date: Mon Aug 14 12:39:36 2017 -0700 spp server iar working with 1_40
1 parent b4d05e7 commit 278e2cb

File tree

57 files changed

+18162
-29449
lines changed

Some content is hidden

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

57 files changed

+18162
-29449
lines changed

examples/rtos/CC2640R2_LAUNCHXL/ble5apps/spp_ble_client/tirtos/build_config.opt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22

3-
@file build_config.opt
3+
@file build_config.opt
44

55
@brief This file contains the Bluetooth Low Energy (BLE) build config options.
66

@@ -40,8 +40,8 @@
4040
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4141

4242
******************************************************************************
43-
Release Name: simplelink_cc2640r2_sdk_1_35_00_29
44-
Release Date: 2017-04-21 17:44:47
43+
Release Name: simplelink_cc2640r2_sdk_1_40_00_45
44+
Release Date: 2017-07-20 17:16:59
4545
*****************************************************************************/
4646

4747
/*

examples/rtos/CC2640R2_LAUNCHXL/ble5apps/spp_ble_client/tirtos/ccs/ble5_spp_ble_client_cc2640r2lp_app.projectspec

Lines changed: 53 additions & 52 deletions
Large diffs are not rendered by default.

examples/rtos/CC2640R2_LAUNCHXL/ble5apps/spp_ble_client/tirtos/ccs/ble5_spp_ble_client_cc2640r2lp_stack_library.projectspec

Lines changed: 59 additions & 61 deletions
Large diffs are not rendered by default.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
utils.importFile("common/cc26xx/kernel/cc2640/config/cc2640_r2_csdk.cfg");
2+
/*
3+
* Extend the cc2640 configuration
4+
*/
5+
6+
/* If you want to ease the TI-RTOS/application debug, you may want to disable the following option.
7+
* If you enable assert, be sure you have xdc_runtime_Assert_DISABLE_ALL NOT define in your project option */
8+
//Error.policyFxn = Error.policyDefault;
9+
//BIOS.assertsEnabled = true;
10+
11+
12+
/* Heap Configuration defines the type of Heap you want to use for the system (application + Stack)
13+
* Only one Heap buffer will be allocated. This heap will be shared by the system and the stack through one manager (HeapMem, HeapMem+HeapTrack or OSAL)
14+
* You can still decide to create several heaps if you want, but at least one heap needs to be created.
15+
* The stack must have a Heap to run.
16+
* The different Heap manager available are :
17+
* OSAL HEAP: legacy Heap manager provided with all BLE sdk. By default, this Heap manager is used.
18+
* HeapMem:  heap manager provided by TI-RTOS (see TI-RTOS user guide for properties)
19+
* HeapTrack: module on top of HeapMem allowing an easy debugging of memory allocated through HeapMem.
20+
21+
* The heap manager to use is selected by setting HEAPMGR_CONFIG to the corresponding value (see below)
22+
* 0 = osal Heap manager, size is static.
23+
* 0x80 = osal Heap manager, with auto-size: The remainning RAM (not used by the system) will be fully assign to the Heap.
24+
* 1 = HeapMem with Static size
25+
* 0x81 = HeapMem with auto-size. The remainning RAM (not used by the system) will be fully assign to the Heap.
26+
* 2 = HeapTrack (with HeapMem) with fixe size
27+
* 0x82 = HeapTrack (with HeapMem) with auto-size: The remainning RAM (not used by the system) will be fully assign to the Heap.
28+
*
29+
* If HEAPMGR_CONFIG is not defined, but the configuration file ble_stack_heap.cfg is used, then the value HEAPMGR_CONFIG = 0x80 is assumed.
30+
* If HEAPMGR_CONFIG is not defined, and the file ble_stack_heap.cfg is not used, then the value HEAPMGR_CONFIG = 0x80 is assumed and the default Heap size will be 3072
31+
* unless you define HEAPMGR_SIZE to a different value in the project option (0 meaning auto-size).
32+
*
33+
* From the configuration below, two #define will be created that will be used by the application to setup the Heap:
34+
* #define HEAPMGR_SIZE
35+
* #define HEAPMGR_CONFIG
36+
* In order to use those define, this include line needs to be added: #include <xdc/cfg/global.h>
37+
*
38+
* In order for the auto-size Heap to work, the following symbol needs to be created by the linker:
39+
* heapStart
40+
* heapEnd
41+
*
42+
*/
43+
/* modification of HEAPMGR_CONFIG and HEAPMGR_SIZE value must be done inside the include file bellow (ble_stack_jheap.cfg) */
44+
utils.importFile("common/cc26xx/kernel/cc2640/config/ble_stack_heap.cfg");

examples/rtos/CC2640R2_LAUNCHXL/ble5apps/spp_ble_client/tirtos/ccs/config/ccs_compiler_defines.bcfg

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)