Skip to content

Commit 34a0bec

Browse files
author
Thomas Kopriva
committed
Merge pull request #56 in SA/ble_examples from bugfix/lr-demo to develop
Squashed commit of the following: commit ed366da041b20b2241b42293912f8ba0762fc647 Author: Thomas Kopriva <[email protected]> Date: Thu Aug 17 11:20:12 2017 -0700 long range project updates for ccs and iar commit 095f209fa7f130112070632f3113d38fab1e5e03 Author: Thomas Kopriva <[email protected]> Date: Wed Aug 16 12:16:58 2017 -0700 project updates for lr demo commit 6e7cdb83834038fcc1df9d3a1127e80c5a9ff737 Author: Thomas Kopriva <[email protected]> Date: Wed Aug 16 11:32:01 2017 -0700 rm HEAPMGR* defines commit 1a1289cefb1d46adfe61ba1750e82dbe378b0ee6 Author: Thomas Kopriva <[email protected]> Date: Wed Aug 16 11:16:41 2017 -0700 suppress wchar_t warning
1 parent 38e01f8 commit 34a0bec

22 files changed

+2879
-3096
lines changed

‎examples/rtos/CC2640R2_LAUNCHXL/ble5apps/longrange_central/src/app/main.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
3939
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
4040
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41+
******************************************************************************/
4142

4243

4344
/*******************************************************************************

‎examples/rtos/CC2640R2_LAUNCHXL/ble5apps/longrange_central/tirtos/ccs/ble5_longrange_central_cc2640r2lp_app.projectspec‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,16 @@
3434
-mv7M3 -O4 --opt_for_speed=0 --code_state=16 --abi=eabi -me -g --c99 --gcc --gen_func_subsections=on --display_error_number --diag_wrap=off
3535
-D${COM_TI_SIMPLELINK_CC2640R2_SDK_SYMBOLS}
3636
-DDeviceFamily_CC26X0R2
37-
-DHEAPMGR_METRICS
3837
-DCACHE_AS_RAM
3938
-DxMAX_PDU_SIZE=251
4039
-DMAX_NUM_PDU=6
40+
-DGAPCENTRALROLE_TASK_STACK_SIZE=768
4141
-DBOARD_DISPLAY_USE_LCD=0
4242
-DBOARD_DISPLAY_USE_UART=1
4343
-DBOARD_DISPLAY_USE_UART_ANSI=1
4444
-DCC2640R2_LAUNCHXL
4545
-DCC26XX
4646
-DCC26XX_R2
47-
-DHEAPMGR_SIZE=0
4847
-DICALL_EVENTS
4948
-DICALL_JT
5049
-DICALL_LITE
@@ -58,13 +57,13 @@
5857
-DTBM_ACTIVE_ITEMS_ONLY
5958
-Dxdc_runtime_Assert_DISABLE_ALL
6059
-Dxdc_runtime_Log_DISABLE_ALL
60+
-I${SRC_LOCAL_DIR}/
6161
-I${PROJECT_LOC}/Application
6262
-I${PROJECT_LOC}/Startup
6363
-I${PROJECT_LOC}/PROFILES
6464
-I${PROJECT_LOC}/Include
6565
-I${CG_TOOL_ROOT}/include
6666
-I${COM_TI_SIMPLELINK_CC2640R2_SDK_INCLUDE_PATH}
67-
-I${SRC_LOCAL_DIR}/
6867
-I${SRC_BLE_DIR}/controller/cc26xx_r2/inc
6968
-I${SRC_BLE_DIR}/inc
7069
-I${SRC_BLE_DIR}/rom
@@ -85,6 +84,7 @@
8584
-l${COM_TI_SIMPLELINK_CC2640R2_SDK_INSTALL_DIR}/source/ti/devices/cc26x0r2/driverlib/bin/ccs/driverlib.lib
8685
-l${COM_TI_SIMPLELINK_CC2640R2_SDK_INSTALL_DIR}/kernel/tirtos/packages/ti/dpl/lib/dpl_cc26x0r2.aem3
8786
-l${COM_TI_SIMPLELINK_CC2640R2_SDK_INSTALL_DIR}/source/ti/drivers/lib/drivers_cc26x0r2.aem3
87+
-l${COM_TI_SIMPLELINK_CC2640R2_SDK_INSTALL_DIR}/source/ti/drivers/rf/lib/rf_singleMode_cc26x0r2.aem3
8888
-l${COM_TI_SIMPLELINK_CC2640R2_SDK_INSTALL_DIR}/source/ti/display/lib/display.aem3
8989
-l${WORKSPACE_LOC}/ble5_longrange_central_cc2640r2lp_stack_library/FlashROM_Library/ble_r2.symbols
9090
-l${WORKSPACE_LOC}/ble5_longrange_central_cc2640r2lp_stack_library/FlashROM_Library/lib_linker.cmd
@@ -120,10 +120,6 @@
120120
<file path="SRC_BLE_DIR/common/cc26xx/ecc/ECCROMCC26XX.c" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/ECC" createVirtualFolders="true" applicableConfigurations="FlashROM_StackLibrary"/>
121121
<file path="SRC_BLE_DIR/common/cc26xx/ecc/ECCROMCC26XX.h" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/ECC" createVirtualFolders="true" applicableConfigurations="FlashROM_StackLibrary"/>
122122

123-
<!-- Drivers/RF Folder -->
124-
<file path="COM_TI_SIMPLELINK_CC2640R2_SDK_INSTALL_DIR/source/ti/drivers/rf/RF.h" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/RF" createVirtualFolders="true" applicableConfigurations="FlashROM_StackLibrary"/>
125-
<file path="COM_TI_SIMPLELINK_CC2640R2_SDK_INSTALL_DIR/source/ti/drivers/rf/RFCC26XX_singleMode.c" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/RF" createVirtualFolders="true" applicableConfigurations="FlashROM_StackLibrary"/>
126-
127123
<!-- Drivers/TRNG Folder -->
128124
<file path="SRC_COMMON_DIR/hal/src/target/_common/TRNGCC26XX.c" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/TRNG" createVirtualFolders="true" applicableConfigurations="FlashROM_StackLibrary"/>
129125
<file path="SRC_COMMON_DIR/hal/src/target/_common/TRNGCC26XX.h" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/TRNG" createVirtualFolders="true" applicableConfigurations="FlashROM_StackLibrary"/>

‎examples/rtos/CC2640R2_LAUNCHXL/ble5apps/longrange_central/tirtos/iar/app/cc2640r2lp_app.ewp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@
211211
<debug>1</debug>
212212
<option>
213213
<name>CCDefines</name>
214-
<state>HEAPMGR_METRICS</state>
215214
<state>CACHE_AS_RAM</state>
215+
<state>GAPCENTRALROLE_TASK_STACK_SIZE=768</state>
216216
<state>xMAX_PDU_SIZE=251</state>
217217
<state>MAX_NUM_PDU=6</state>
218218
<state>BOARD_DISPLAY_USE_LCD=0</state>
@@ -222,7 +222,6 @@
222222
<state>CC26XX</state>
223223
<state>CC26XX_R2</state>
224224
<state>DeviceFamily_CC26X0R2</state>
225-
<state>HEAPMGR_SIZE=0</state>
226225
<state>ICALL_EVENTS</state>
227226
<state>ICALL_JT</state>
228227
<state>ICALL_LITE</state>
@@ -712,8 +711,8 @@
712711
<name>BUILDACTION</name>
713712
<archiveVersion>1</archiveVersion>
714713
<data>
715-
<prebuild>"$XDCROOT$\xs" --xdcpath="$XDCPATH$" iar.tools.configuro -c "$TOOLKIT_DIR$" --cc "$COMPILER_PATH$" --device "$DEVICE$" --compileOptions $COMPILER_ARGS_ROOT_QUOTED$ --linkOptions $LINKER_ARGS_QUOTED$ --profile release --projFile "$PROJ_PATH$" --cfgArgs NO_ROM=0 -o $PROJ_DIR$\..\config\configPkg $EXAMPLE_BLE_ROOT$\tirtos\app_ble.cfg</prebuild>
716-
<postbuild>$TOOLS_BLE_DIR$\output_converter\output_converter.exe $EXE_DIR$\$TARGET_BNAME$.bin</postbuild>
714+
<prebuild>"$XDCROOT$\xs" --xdcpath="$XDCPATH$" iar.tools.configuro -c "$TOOLKIT_DIR$" --cc "$COMPILER_PATH$" --device "$DEVICE$" --compileOptions $COMPILER_ARGS_ROOT_QUOTED$ --linkOptions $LINKER_ARGS_QUOTED$ --profile release --projFile "$PROJ_PATH$" --cfgArgs NO_ROM=0 -o $PROJ_DIR$\..\config\configPkg $EXAMPLE_BLE_ROOT$\tirtos\app_ble.cfg</prebuild>
715+
<postbuild></postbuild>
717716
</data>
718717
</settings>
719718
<settings>
@@ -842,6 +841,7 @@
842841
<state>--keep __vector_table</state>
843842
<state>-f $PROJ_DIR$/../config/configPkg/linker.cmd</state>
844843
<state>-f $PROJ_DIR$/../config/lib_linker.cmd</state>
844+
<state>--diag_suppress=Lt009</state>
845845
</option>
846846
<option>
847847
<name>IlinkLowLevelInterfaceSlave</name>
@@ -1093,10 +1093,10 @@
10931093
<name>$PROJ_DIR$\..\..\..\src\app\longrange_central_menu.h</name>
10941094
</file>
10951095
<file>
1096-
<name>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\ble5stack\source\ti\ble5stack\common\cc26xx\menu\two_btn_menu.c</name>
1096+
<name>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\ble5stack\common\cc26xx\menu\two_btn_menu.c</name>
10971097
</file>
10981098
<file>
1099-
<name>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\ble5stack\source\ti\ble5stack\common\cc26xx\menu\two_btn_menu.h</name>
1099+
<name>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\ble5stack\common\cc26xx\menu\two_btn_menu.h</name>
11001100
</file>
11011101
<file>
11021102
<name>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\ble5stack\common\cc26xx\util.c</name>

0 commit comments

Comments
 (0)