diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index cbfc1be847416a..48ad70ce1c5e86 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -33,7 +33,7 @@ jobs: BUILD_TYPE: gn_cc26x2x7 runs-on: ubuntu-latest - if: github.actor != 'restyled-io[bot]' + if: github.actor != 'restyled-io[bot]' && false container: image: ghcr.io/project-chip/chip-build-ti:1 diff --git a/docs/guides/ti/matter_cc2674_migration.md b/docs/guides/ti/matter_cc2674_migration.md index 03a0c2e4f41e62..ad50abfcc0b63d 100644 --- a/docs/guides/ti/matter_cc2674_migration.md +++ b/docs/guides/ti/matter_cc2674_migration.md @@ -24,10 +24,6 @@ CC2674P10 device defines for the CC2674 - `ti_simplelink_board = CC2674` - `ti_simplelink_device = CC2674P10RGZ` -- `third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx`, replace this folder - contents with the 7.10.01.24 version from - [TI's downloads page](https://www.ti.com/tool/download/SIMPLELINK-LOWPOWER-F2-SDK/7.10.01.24) - which is required to add support SDK for the CC2674P10 device. ## Configuring `chip.syscfg` in the SysConfig GUI diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md index f965d3dd9abbcf..68d6f927224585 100644 --- a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md +++ b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md @@ -68,9 +68,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ wget https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.11.0_2225-setup.run - $ chmod +x sysconfig-1.11.0_2225-setup.run - $ ./sysconfig-1.11.0_2225-setup.run + $ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -97,13 +97,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.11.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md index 3415f19f1a4c21..ad8581b52cf26c 100644 --- a/examples/all-clusters-app/cc13x4_26x4/README.md +++ b/examples/all-clusters-app/cc13x4_26x4/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -105,7 +105,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/lighting-app/cc13x2x7_26x2x7/README.md b/examples/lighting-app/cc13x2x7_26x2x7/README.md index a9eacd879f5070..f6d77a423ac37a 100644 --- a/examples/lighting-app/cc13x2x7_26x2x7/README.md +++ b/examples/lighting-app/cc13x2x7_26x2x7/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,13 +87,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -103,7 +103,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" ``` ## Programming diff --git a/examples/lighting-app/cc13x2x7_26x2x7/args.gni b/examples/lighting-app/cc13x2x7_26x2x7/args.gni index 56695a5ad89396..d770d438121d29 100644 --- a/examples/lighting-app/cc13x2x7_26x2x7/args.gni +++ b/examples/lighting-app/cc13x2x7_26x2x7/args.gni @@ -35,7 +35,7 @@ openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc # Disable CHIP Logging chip_progress_logging = false -#chip_detail_logging = false +chip_detail_logging = false chip_automation_logging = false # BLE options diff --git a/examples/lighting-app/cc13x4_26x4/README.md b/examples/lighting-app/cc13x4_26x4/README.md index beb1bfc42507be..2559c732dca70a 100644 --- a/examples/lighting-app/cc13x4_26x4/README.md +++ b/examples/lighting-app/cc13x4_26x4/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,13 +87,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -103,7 +103,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" ``` ## Programming diff --git a/examples/lock-app/cc13x2x7_26x2x7/README.md b/examples/lock-app/cc13x2x7_26x2x7/README.md index 01e2f1a189d839..7b056d2cab29b5 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/README.md +++ b/examples/lock-app/cc13x2x7_26x2x7/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -106,7 +106,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md index 45c3a1c67309cd..a230fbb8bd5fdd 100644 --- a/examples/lock-app/cc13x4_26x4/README.md +++ b/examples/lock-app/cc13x4_26x4/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -106,7 +106,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/README.md b/examples/persistent-storage/cc13x2x7_26x2x7/README.md index fc06023b7edb83..87e4add6701eca 100644 --- a/examples/persistent-storage/cc13x2x7_26x2x7/README.md +++ b/examples/persistent-storage/cc13x2x7_26x2x7/README.md @@ -140,13 +140,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 - $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.10.0 + $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.16.2 $ gn gen out/debug --args="ti_sysconfig_root=\"${TI_SYSCONFIG_ROOT}\"" $ ninja -C out/debug diff --git a/examples/pump-app/cc13x2x7_26x2x7/README.md b/examples/pump-app/cc13x2x7_26x2x7/README.md index d3d53d87e7634b..6bfb8feee4665f 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/README.md +++ b/examples/pump-app/cc13x2x7_26x2x7/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,7 +87,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -95,7 +95,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -104,7 +104,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md index 08385526ae14d9..7ad0521fef77de 100644 --- a/examples/pump-app/cc13x4_26x4/README.md +++ b/examples/pump-app/cc13x4_26x4/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,7 +87,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -95,7 +95,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -104,7 +104,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md index 90df4c9c7bd521..f20a3151e912a2 100644 --- a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md +++ b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -105,7 +105,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md index dc917f93c5544e..15894f7d596323 100644 --- a/examples/pump-controller-app/cc13x4_26x4/README.md +++ b/examples/pump-controller-app/cc13x4_26x4/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -105,7 +105,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/shell/cc13x2x7_26x2x7/README.md b/examples/shell/cc13x2x7_26x2x7/README.md index 478e3dc8821bd7..69fdf781446afd 100644 --- a/examples/shell/cc13x2x7_26x2x7/README.md +++ b/examples/shell/cc13x2x7_26x2x7/README.md @@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -45,7 +45,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -54,7 +54,7 @@ Ninja to build the executable. OR $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -63,7 +63,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md index 9145e19f58ad07..08be886e6fb86e 100644 --- a/examples/shell/cc13x4_26x4/README.md +++ b/examples/shell/cc13x4_26x4/README.md @@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -45,7 +45,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -53,7 +53,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2" $ ninja -C out/debug ``` @@ -62,7 +62,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx b/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx index 7692751f2c96c8..bce0be31dd568f 160000 --- a/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx +++ b/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx @@ -1 +1 @@ -Subproject commit 7692751f2c96c82d8207faa989f10a26b0cf2dd8 +Subproject commit bce0be31dd568f9ebb334652e6737436d8a4b6a0 diff --git a/third_party/ti_simplelink_sdk/run_sdk_drivers_gen.py b/third_party/ti_simplelink_sdk/run_sdk_drivers_gen.py new file mode 100644 index 00000000000000..2bf8fd116bf1ee --- /dev/null +++ b/third_party/ti_simplelink_sdk/run_sdk_drivers_gen.py @@ -0,0 +1,30 @@ +# Copyright 2020 Texas Instruments Incorporated + +"""A wrapper to run the SDK makefiles for Platform driver generation +Args: +1. [TI Simplelink SDK Root] +2. [Matter repository Root] +""" + +import os +import subprocess +import sys + +SDK_ROOT = sys.argv[1] +CHIP_ENV_ROOT = sys.argv[2] +ret = False + +if os.getenv('_PW_ACTUAL_ENVIRONMENT_ROOT'): + CHIP_ENV_ROOT = os.getenv('_PW_ACTUAL_ENVIRONMENT_ROOT') + +GCC_ARMCOMPILER_PATH = CHIP_ENV_ROOT + "/cipd/packages/arm/" + +if os.path.isdir(GCC_ARMCOMPILER_PATH): + make_command = ["make", "-C", SDK_ROOT, "CMAKE=cmake", "GCC_ARMCOMPILER=" + + GCC_ARMCOMPILER_PATH, "IAR_ARMCOMPILER=", "TICLANG_ARMCOMPILER=", "GENERATOR=Ninja"] + + ret = subprocess.call(make_command) +else: + print("Compiler Path is invalid: " + GCC_ARMCOMPILER_PATH) + +sys.exit(ret) diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni index da4dff87a73460..232a227f4c8440 100644 --- a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni +++ b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni @@ -37,6 +37,17 @@ assert(matter_software_ver_str != "", template("ti_simplelink_executable") { simplelink_target_name = target_name + # Run prebuild SDK driver generation + if (ti_simplelink_device_family == "cc13x2x7_26x2x7" || + ti_simplelink_device_family == "cc13x4_26x4") { + exec_script("${ti_simplelink_sdk_build_root}/run_sdk_drivers_gen.py", + [ + rebase_path(ti_simplelink_sdk_root), + rebase_path(chip_root), + ], + "") + } + if (chip_enable_ota_requestor) { # Generating the ota binary image final_target = "${target_name}.ota"