From a5d8ec74b562e624b70b7bb15f9a6a835df80fc9 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Fri, 13 Nov 2020 14:37:32 +0100 Subject: [PATCH] Fix compile instructions. --- coordinator/Z-Stack_3.x.0/COMPILE.md | 11 +- coordinator/Z-Stack_3.x.0/firmware.patch | 719 +++++------------------ 2 files changed, 146 insertions(+), 584 deletions(-) diff --git a/coordinator/Z-Stack_3.x.0/COMPILE.md b/coordinator/Z-Stack_3.x.0/COMPILE.md index ab85072..56b3f18 100644 --- a/coordinator/Z-Stack_3.x.0/COMPILE.md +++ b/coordinator/Z-Stack_3.x.0/COMPILE.md @@ -10,6 +10,11 @@ 1. In Code Composer Studio, expand the 3 projects and for each open `znp.syscfg`, change `Minimal Poll Period (ms)` to `1000`, change it back to `100` immediately and save the file. 1. Go to your CCS workspace and copy `firmware.patch` to the root. 1. Open Git Bash, go to your CCS root and apply the patch using `git apply firmware.patch --ignore-space-change`. -1. Build both projects; right click -> *Build project*. -1. Once finished, the firmware can be found under `znp_[CC26X2R1/CC1352P_2/CC2652RB]_LAUNCHXL_tirtos_ccs/default/znp_[CC26X2R1/CC1352P_2]_LAUNCHXL_tirtos_ccs.hex` - - Note: by default the **launchpad** variant of the CC1352P2_CC2652P (= `znp_CC1352P_2_LAUNCHXL_tirtos_ccs.hex`) is build. To build the **other** variant comment `#define LAUNCHPAD_CONFIG 1` in `preinclude.h`. \ No newline at end of file +1. **Only** for `znp_CC1352P_2_LAUNCHXL_tirtos_css`: + - Right click on `znp.syscfg` -> *Delete* + - Right click on `znp_CC1352P_2_LAUNCHXL_tirtos_css` -> *Properties*. + - Go to *CCS Build* - *ARM Linker* - *File Search Path* -> Under *Include library file or command file as input (--library, -l)* change `${PROJECT_BUILD_DIR}/syscfg/ti_utils_build_linker.cmd.genlibs` to `${PROJECT_ROOT}/syscfg/ti_utils_build_linker.cmd.genlibs` + - Go to *CCS Build* - *ARM Compiler* - *Include Options* -> Under *Add dir to #include search path (--include_path, -l)* add `${PROJECT_ROOT}/syscfg` as the **last** entry. +1. Build the 3 projects; right click -> *Build project*. + - **Important:** by default the **launchpad** variant of the CC1352P2_CC2652P (= `znp_CC1352P_2_LAUNCHXL_tirtos_ccs`) is build. To build the **other** variant comment `#define LAUNCHPAD_CONFIG 1` in `preinclude.h`. +1. Once finished, the firmware can be found under `znp_[CC26X2R1/CC1352P_2/CC2652RB]_LAUNCHXL_tirtos_ccs/default/znp_[CC26X2R1/CC2652RB/CC1352P_2]_LAUNCHXL_tirtos_ccs.hex` \ No newline at end of file diff --git a/coordinator/Z-Stack_3.x.0/firmware.patch b/coordinator/Z-Stack_3.x.0/firmware.patch index 4b5cfe2..ec1dd8a 100644 --- a/coordinator/Z-Stack_3.x.0/firmware.patch +++ b/coordinator/Z-Stack_3.x.0/firmware.patch @@ -1,14 +1,13 @@ -From 5be34b6a8651e24211b623a040c6563fed00d3b6 Mon Sep 17 00:00:00 2001 +From be86effce181ab253c7a6238cf7eda62ca2e86ce Mon Sep 17 00:00:00 2001 From: Koen Kanters -Date: Mon, 31 Aug 2020 16:45:20 +0200 +Date: Fri, 13 Nov 2020 14:36:02 +0100 Subject: [PATCH 1/1] Own changes --- - znp_CC1352P_2_LAUNCHXL_tirtos_ccs/.cproject | 330 +++++- .../Application/mt/mt.h | 2 + .../Application/mt/mt_util.c | 64 + .../Application/mt/mt_version.c | 8 +- - .../Stack/Config/preinclude.h | 59 + + .../Stack/Config/preinclude.h | 65 + .../Stack/Config/znp_cnf.opts | 2 + .../Stack/af/af.c | 18 +- .../Stack/sys/zglobals.c | 6 +- @@ -21,11 +20,10 @@ Subject: [PATCH 1/1] Own changes .../syscfg/ti_radio_config.h | 77 ++ .../syscfg/ti_utils_build_linker.cmd.genlibs | 35 + .../syscfg/ti_zstack_config.h | 215 ++++ - znp_CC1352P_2_LAUNCHXL_tirtos_ccs/znp.syscfg | 30 +- .../Application/mt/mt.h | 2 + .../Application/mt/mt_util.c | 64 + .../Application/mt/mt_version.c | 8 +- - .../Stack/Config/preinclude.h | 46 + + .../Stack/Config/preinclude.h | 52 + .../Stack/Config/znp_cnf.opts | 2 + .../Stack/af/af.c | 18 +- .../Stack/sys/zglobals.c | 6 +- @@ -35,16 +33,16 @@ Subject: [PATCH 1/1] Own changes .../Application/mt/mt.h | 2 + .../Application/mt/mt_util.c | 64 + .../Application/mt/mt_version.c | 8 +- - .../Stack/Config/preinclude.h | 46 + + .../Stack/Config/preinclude.h | 52 + .../Stack/Config/znp_cnf.opts | 2 + .../Stack/af/af.c | 18 +- .../Stack/sys/zglobals.c | 6 +- .../Stack/zdo/zd_app.c | 22 +- znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd | 6 +- znp_CC26X2R1_LAUNCHXL_tirtos_ccs/znp.syscfg | 30 +- - 38 files changed, 2902 insertions(+), 161 deletions(-) + 36 files changed, 2621 insertions(+), 100 deletions(-) create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h - create mode 100755 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_devices_config.c + create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_devices_config.c create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_drivers_config.c create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_drivers_config.h create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_radio_config.c @@ -54,410 +52,6 @@ Subject: [PATCH 1/1] Own changes create mode 100644 znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h create mode 100644 znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h -diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/.cproject b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/.cproject -index f031f65..dcb8fd9 100644 ---- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/.cproject -+++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/.cproject -@@ -30,18 +30,18 @@ - - - --