SPP projects building in CCS

Author: Sean Lyons

README.md

@@ -15,7 +15,7 @@
 These examples and demos are for **TI SimpleLink CC26x2 SDK 2.10.00.44**
 
 This repository contains *Bluetooth®* 5 sample applications for
-Texas Instruments' SimpleLink CC2640R2 SDK. These examples have not been
+Texas Instruments' SimpleLink CC26x2 SDK. These examples have not been
 validated as production-ready.
 
 **Do not** use GitHub's bug tracking feature for support. For inquiries, see the
@@ -36,7 +36,19 @@ For examples for other SDK versions and platforms, see table below.
     </tr>
     <tr>
       <td>
-        <a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-1.60">TI SimpleLink CC26x2 SDK 1.60.00.43(current)</a>
+        <a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-2.10">TI SimpleLink CC26x2 SDK 2.10.00.44(current)</a>
+      </td>
+      <td>
+        <ul>
+          <li><a href="#full-duplex-bidirectional-audio-demo">Full Duplex Bidirectional Audio Demo (Central/Peripheral)</li>
+          <li><a href="#i2s-echo">I2S Echo</li>
+          <li><a href="#serial-port-profile-spp">Serial Port Profile</li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <a href = "https://github.com/ti-simplelink/ble_examples/tree/simplelink_sdk-1.60">TI SimpleLink CC26x2 SDK 1.60.00.43</a>
       </td>
       <td>
         <ul>
@@ -204,11 +216,7 @@ environment variables.
 
 Similar to the SimpleLink CC26x2 SDK, the examples in this repository support
 the CCS and IAR toolchains. Please pay careful attention to versions of these
-tools, the supported version are listed below. Using a non supported version is
-untested and may result in unexpected behavior.
-
-* CCS v7.04.00 with TI ARM Compiler v16.09.06LTS
-* IAR for ARM v8.11.4
+tools, please refer to the release notes for supported versions.
 
 For more information on toolchain setup, please refer to our
 [FAQ page](docs/faq.md).

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/peripheral_bidirectional_audio/src/app/peripheral_bidirectional_audio.c

@@ -475,7 +475,7 @@ static void PeripheralAudio_init(void)
     uint16_t paramUpdateDecision = DEFAULT_PARAM_UPDATE_REQ_DECISION;
 
     // Pass all parameter update requests to the app for it to decide
-    GAP_SetParamValue(GAP_PARAM_LINK_UPDATE_DECISION, &paramUpdateDecision);
+    GAP_SetParamValue(GAP_PARAM_LINK_UPDATE_DECISION, paramUpdateDecision);
   }
 
   // Setup the GAP Bond Manager. For more information see the GAP Bond Manager

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/peripheral_bidirectional_audio/tirtos/ble_debug.cfg

@@ -39,9 +39,6 @@
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- ******************************************************************************
- Release Name: simplelink_cc26x2_sdk_1_60_00_40
- Release Date: 2018-01-04 19:48:37
  *****************************************************************************/
 
 
@@ -103,7 +100,7 @@ Defaults.common$.namedModule = true;
 /* Compile out all Assert's */
 //Defaults.common$.diags_ASSERT = Diags.ALWAYS_OFF;
 
-/* Allow Mod_create() and Mod_construct() but not delete() or destruct() */
+/* Allow Mod_create() and Mod_construct() as well as delete() and destruct() */
 Defaults.common$.memoryPolicy = Types.DELETE_POLICY;
 
 

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/peripheral_bidirectional_audio/tirtos/ble_release.cfg

@@ -39,9 +39,6 @@
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- ******************************************************************************
- Release Name: simplelink_cc26x2_sdk_1_60_00_40
- Release Date: 2018-01-04 19:48:37
  *****************************************************************************/
 
 

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/peripheral_bidirectional_audio/tirtos/ccs/ble5_peripheral_bidirectional_audio_cc26x2r1lp_stack_library.projectspec

@@ -22,7 +22,7 @@
     >
 
         <!-- Project properties -->
-        <property name="products" value="com.ti.rtsc.XDCtools:3.50.04.43;com.ti.SIMPLELINK_CC26X2_SDK:2.10.00.44"/>
+        <property name="products" value="com.ti.rtsc.XDCtools:3.50.05.12;com.ti.SIMPLELINK_CC26X2_SDK:2.10.00.44"/>
         <property name="target" value="ti.targets.arm.elf.M4F"/>
         <property name="platform" value="ti.platforms.simplelink:CC2642R1F"/>
         <property name="buildProfile" value="release"/>

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/spp_ble_client/src/app/spp_ble_client.c

@@ -356,7 +356,9 @@ static void SPPBLEClient_pairStateCb(uint16_t currentConnHandle, uint8_t state,
 
 void SPPBLEClient_startDiscHandler(UArg a0);
 static void SPPBLEClient_keyChangeHandler(uint8 keys);
+#if defined(BLE_V42_FEATURES) && (BLE_V42_FEATURES & PRIVACY_1_2_CFG)
 static void SPPBLEClient_clockHandler(UArg arg);
+#endif //defined(BLE_V42_FEATURES) && (BLE_V42_FEATURES & PRIVACY_1_2_CFG)
 
 static uint8_t SPPBLEClient_enqueueMsg(uint8_t event, uint8_t status,
                                         uint8_t *pData);
@@ -438,9 +440,9 @@ void SPPBLEClient_blinkLed(uint8_t led, uint8_t nBlinks)
 
   for (i=0; i<nBlinks; i++)
   {
-    PIN_setOutputValue(hGpioPin, led, Board_LED_ON);
+    PIN_setOutputValue(hGpioPin, led, 1);
     delay_ms(BLINK_DURATION);
-    PIN_setOutputValue(hGpioPin, led, Board_LED_OFF);
+    PIN_setOutputValue(hGpioPin, led, 0);
     delay_ms(BLINK_DURATION);
   }
 }
@@ -2063,6 +2065,7 @@ void SPPBLEClient_enqueueUARTMsg(uint8_t event, uint8_t *data, uint8_t len)
   }
 }
 
+#if defined(BLE_V42_FEATURES) && (BLE_V42_FEATURES & PRIVACY_1_2_CFG)
 /*********************************************************************
  * @fn      SPPBLEClient_clockHandler
  *
@@ -2089,6 +2092,7 @@ void SPPBLEClient_clockHandler(UArg arg)
       break;
   }
 }
+#endif //defined(BLE_V42_FEATURES) && (BLE_V42_FEATURES & PRIVACY_1_2_CFG)
 
 /*********************************************************************
  * @fn      SPPBLEClient_enqueueMsg

examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/spp_ble_client/tirtos/ccs/ble5_spp_ble_client_cc26x2r1lp_app.projectspec

@@ -18,7 +18,7 @@
 
         <!-- Project properties -->
         <property name="type" value="rtsc"/>
-        <property name="products" value="com.ti.SIMPLELINK_CC26X2_SDK:1.60.00.43"/>
+        <property name="products" value="com.ti.SIMPLELINK_CC26X2_SDK:2.10.00.44"/>
         <property name="xdcToolsVersion" value="3.50.05.12"/>
         <property name="target" value="ti.targets.arm.elf.M4F"/>
         <property name="platform" value="ti.platforms.simplelink:CC2642R1F"/>
@@ -53,8 +53,8 @@
             -I${SRC_COMMON_DIR}/heapmgr
             -I${SRC_COMMON_DIR}/icall/src/inc
             -I${SRC_COMMON_DIR}/osal/src/inc
-            -I${SRC_BLE_DIR}/profiles/serial_port
-            -I${SRC_BLE_DIR}/sdi/src/inc
+            -I${BLE_GITHUB_ROOT}/source/ti/ble5stack/profiles/serial_port
+            -I${BLE_GITHUB_ROOT}/source/ti/ble5stack/sdi/src/
             -I${SRC_COMMON_DIR}/services/src/saddr
             -I${SRC_COMMON_DIR}/services/src/sdata
             -I${SRC_BLE_DIR}/npi/src
@@ -108,23 +108,22 @@
             -I${SRC_COMMON_DIR}/heapmgr
             -I${SRC_COMMON_DIR}/icall/src/inc
             -I${SRC_COMMON_DIR}/osal/src/inc
-            -I${EXAMPLE_BLE_ROOT}/../../../../../source/ti/ble5stack/profiles/serial_port
+            -I${BLE_GITHUB_ROOT}/source/ti/ble5stack/profiles/serial_port
+            -I${BLE_GITHUB_ROOT}/source/ti/ble5stack/sdi/src/
             -I${SRC_COMMON_DIR}/services/src/saddr
             -I${SRC_COMMON_DIR}/services/src/sdata
             -I${SRC_BLE_DIR}/npi/src
-            -I${EXAMPLE_BLE_ROOT}/../../../../../source/ti/ble5stack/sdi/src/
-            -I${SRC_BLE_DIR}/../../../source/ti/devices/cc13x2_cc26x2"
+            -I${SRC_COMMON_DIR}/services/src/nv
+            -I${SRC_COMMON_DIR}/services/src/nv/cc26xx
+            -I${SRC_BLE_DIR}/../../../source/ti/devices/cc13x2_cc26x2_v1"
             linkerBuildOptions="
-            -l${WORKSPACE_LOC}/ble5_spp_ble_client_cc26x2r1lp_stack_library/FlashROM_Library/ble_r2.symbols
-            -l${SRC_BLE_DIR}/../../../source/ti/devices/cc13x2_cc26x2/driverlib/bin/ccs/driverlib.lib
-            -l${SRC_BLE_DIR}/../../../kernel/tirtos/packages/ti/dpl/lib/dpl_cc26x2.aem4f
-            -l${SRC_BLE_DIR}/../../../source/ti/drivers/lib/drivers_cc26x2.aem4f
-            -l${SRC_BLE_DIR}/../../../source/ti/drivers/rf/lib/rf_multiMode_cc26x2.aem4f
+            -l${SRC_BLE_DIR}/../../../source/ti/devices/cc13x2_cc26x2_v1/driverlib/bin/ccs/driverlib.lib
+            -l${SRC_BLE_DIR}/../../../kernel/tirtos/packages/ti/dpl/lib/dpl_cc26x2_v1.aem4f
+            -l${SRC_BLE_DIR}/../../../source/ti/drivers/lib/drivers_cc26x2_v1.aem4f
+            -l${SRC_BLE_DIR}/../../../source/ti/drivers/rf/lib/rf_multiMode_cc26x2_v1.aem4f
             -l${SRC_BLE_DIR}/../../../source/ti/display/lib/display.aem4f
-            -l${SRC_BLE_DIR}/../../../source/ti/mw/lcd/lib/lcd.aem4f
-            -l${SRC_BLE_DIR}/../../../source/ti/grlib/lib/grlib.aem4f
-            -l${SRC_BLE_DIR}/../../../source/ti/drivers/pdm/lib/pdm_cc26x2.aem4f
-
+            -l${SRC_BLE_DIR}/../../../source/ti/grlib/lib/ccs/m4f/grlib.a
+            -l${SRC_BLE_DIR}/../../../source/ti/drivers/pdm/lib/pdm_cc26x2_v1.aem4f
             -l${WORKSPACE_LOC}/ble5_spp_ble_client_cc26x2r1lp_stack_library/FlashROM_Library/lib_linker.cmd
             -l${WORKSPACE_LOC}/ble5_spp_ble_client_cc26x2r1lp_stack_library/FlashROM_Library/ble5_spp_ble_client_cc26x2r1lp_stack_library.lib
             -l${SRC_BLE_DIR}/common/cc26xx/ccs/cc13x2_cc26x2_app.cmd
@@ -139,8 +138,9 @@
 
 
         <pathVariable name="EXAMPLE_BLE_ROOT" path="../.." scope="project"/>
-        <pathVariable name="SRC_BLE_DIR" path="C:/ti/simplelink_cc26x2_sdk_1_60_00_43/source/ti/ble5stack" scope="project"/>
-        <pathVariable name="SRC_COMMON_DIR" path="${SRC_BLE_DIR}/../../../source/ti/ble5stack" scope="project"/>
+        <pathVariable name="SRC_BLE_DIR" path="${COM_TI_SIMPLELINK_CC26X2_SDK_INSTALL_DIR}/source/ti/ble5stack" scope="project"/>
+        <pathVariable name="SRC_COMMON_DIR" path="${COM_TI_SIMPLELINK_CC26X2_SDK_INSTALL_DIR}/source/ti/ble5stack" scope="project"/>
+        <pathVariable name="BLE_GITHUB_ROOT" path="../../../../../../.." scope="project"/>
 
         <!-- Application Folder -->
         <file path="SRC_BLE_DIR/common/cc26xx/board_key.c" openOnCreation="" excludeFromBuild="false" action="copy" targetDirectory="Application" createVirtualFolders="true" applicableConfigurations="FlashROM_Release, FlashROM_Debug"/>
@@ -155,8 +155,8 @@
         <file path="SRC_BLE_DIR/common/cc26xx/ecc/ECCROMCC26XX.h" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/ECC" createVirtualFolders="true" applicableConfigurations="FlashROM_Release, FlashROM_Debug"/>
 
         <!-- Drivers/TRNG Folder -->
-        <file path="SRC_COMMON_DIR/hal/src/target/_common/TRNGCC26XX.c" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/TRNG" createVirtualFolders="true" applicableConfigurations="FlashROM_Release"/>
-        <file path="SRC_COMMON_DIR/hal/src/target/_common/TRNGCC26XX.h" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/TRNG" createVirtualFolders="true" applicableConfigurations="FlashROM_Release"/>
+        <file path="SRC_COMMON_DIR/hal/src/target/_common/TRNGCC26XX.c" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/TRNG" createVirtualFolders="true" applicableConfigurations="FlashROM_Release, FlashROM_Debug"/>
+        <file path="SRC_COMMON_DIR/hal/src/target/_common/TRNGCC26XX.h" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/TRNG" createVirtualFolders="true" applicableConfigurations="FlashROM_Release, FlashROM_Debug"/>
 
         <!-- Drivers/NV Folder -->
         <file path="SRC_BLE_DIR/services/src/nv/cc26xx/nvoctp.c" openOnCreation="" excludeFromBuild="false" action="link" targetDirectory="Drivers/nv" createVirtualFolders="true" applicableConfigurations="FlashROM_Release, FlashROM_Debug"/>
@@ -208,6 +208,6 @@
         <file path="EXAMPLE_BLE_ROOT/tirtos/ccs/defines/ble5_spp_ble_client_cc26x2r1lp_app_FlashROM_Debug.opt" openOnCreation="" excludeFromBuild="false" action="copy" targetDirectory="TOOLS/defines" createVirtualFolders="true" applicableConfigurations="FlashROM_Debug"/>
         <file path="EXAMPLE_BLE_ROOT/tirtos/ble_release.cfg" openOnCreation="" excludeFromBuild="false" action="copy" targetDirectory="TOOLS" createVirtualFolders="true" applicableConfigurations="FlashROM_Release"/>
         <file path="EXAMPLE_BLE_ROOT/tirtos/ble_debug.cfg" openOnCreation="" excludeFromBuild="false" action="copy" targetDirectory="TOOLS" createVirtualFolders="true" applicableConfigurations="FlashROM_Debug"/>
-        <file path="SRC_BLE_DIR/common/cc26xx/ccs/cc13x2_cc26x2_v1_app.cmd" openOnCreation="" excludeFromBuild="true" action="link" targetDirectory="TOOLS" createVirtualFolders="true" applicableConfigurations="FlashROM_Release"/>
+        <file path="SRC_BLE_DIR/common/cc26xx/ccs/cc13x2_cc26x2_app.cmd" openOnCreation="" excludeFromBuild="true" action="link" targetDirectory="TOOLS" createVirtualFolders="true" applicableConfigurations="FlashROM_Release, FlashROM_Debug"/>
     </project>
 </projectSpec>