Z-Stack_3.x.0_20220103

coordinator/Z-Stack_3.x.0/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 20220103
+- Fix Touchlink crash
+ 
 # 20211217
 - SimpleLink SDK 5.30.01.01 ([changelog](https://software-dl.ti.com/simplelink/esd/simplelink_cc13xx_cc26xx_sdk/5.30.01.01/exports/changelog.html))
 - Increase memory heap

coordinator/Z-Stack_3.x.0/firmware.patch

@@ -1,4 +1,4 @@
-From 4020572e2d11875bab0ba410b0727e8d08078c16 Mon Sep 17 00:00:00 2001
+From a2bda9f1dc7d8200a577d320fd3812ab4d8f5466 Mon Sep 17 00:00:00 2001
 From: Koen Kanters <koenkanters94@gmail.com>
 Date: Tue, 7 Dec 2021 20:41:07 +0100
 Subject: [PATCH 1/1] Own changes
@@ -12,6 +12,7 @@ Subject: [PATCH 1/1] Own changes
  .../Stack/Config/znp_cnf.opts                 |   2 +
  .../Stack/af/af.c                             |  18 +-
  .../Stack/nwk/nwk_globals.c                   |   8 +-
+ .../Stack/nwk/stub_aps.c                      |   1 +
  .../Stack/sys/zglobals.c                      |   6 +-
  .../Stack/zdo/zd_app.c                        |  30 +-
  .../Stack/zdo/zd_object.c                     |  14 +
@@ -32,6 +33,7 @@ Subject: [PATCH 1/1] Own changes
  .../Stack/Config/znp_cnf.opts                 |   2 +
  .../Stack/af/af.c                             |  18 +-
  .../Stack/nwk/nwk_globals.c                   |   8 +-
+ .../Stack/nwk/stub_aps.c                      |   1 +
  .../Stack/sys/zglobals.c                      |   6 +-
  .../Stack/zdo/zd_app.c                        |  30 +-
  .../Stack/zdo/zd_object.c                     |  14 +
@@ -48,6 +50,7 @@ Subject: [PATCH 1/1] Own changes
  .../Stack/Config/znp_cnf.opts                 |   2 +
  znp_LP_CC2652RB_tirtos_ccs/Stack/af/af.c      |  18 +-
  .../Stack/nwk/nwk_globals.c                   |   8 +-
+ .../Stack/nwk/stub_aps.c                      |   1 +
  .../Stack/sys/zglobals.c                      |   6 +-
  znp_LP_CC2652RB_tirtos_ccs/Stack/zdo/zd_app.c |  30 +-
  .../Stack/zdo/zd_object.c                     |  14 +
@@ -56,7 +59,7 @@ Subject: [PATCH 1/1] Own changes
  znp_LP_CC2652RB_tirtos_ccs/app.cfg            |   4 +-
  znp_LP_CC2652RB_tirtos_ccs/cc13x2_cc26x2.cmd  |   6 +-
  znp_LP_CC2652RB_tirtos_ccs/znp.syscfg         |   6 +-
- 52 files changed, 1705 insertions(+), 87 deletions(-)
+ 55 files changed, 1708 insertions(+), 87 deletions(-)
  create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h
  mode change 100644 => 100755 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/af/af.c
  mode change 100644 => 100755 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
@@ -244,14 +247,14 @@ index 90d6d4a..a687b10 100644
   * @fn      MT_UtilAssocFindDevice
   *
 diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
-index 63c143b..44ddc34 100644
+index 63c143b..eb36d1c 100644
 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
 +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
 @@ -43,15 +43,21 @@
  #include "zcomdef.h"
  #include "mt_version.h"
  
-+#define CODE_REVISION_NUMBER 20211217
++#define CODE_REVISION_NUMBER 20220103
 +
  /******************************************************************************
   * CONSTANTS
@@ -441,6 +444,18 @@ index b761da1..bc406ff
  
  // 1-255 (0 -> 256) X RTG_TIMER_INTERVAL
  // A known shortcoming is that when a message is enqueued as "hold" for a
+diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c
+index a7378c7..527e0af 100644
+--- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c
++++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c
+@@ -451,6 +451,7 @@ static ZStatus_t StubAPS_SetNewChannel( uint8_t channel )
+     ZMacSetReq( ZMacRxOnIdle, &rxOnIdle );
+ 
+     channelChangeInProgress = FALSE;
++    nwk_setStateIdle( FALSE );
+ 
+     return ( ZSuccess );
+   }
 diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
 index aafb10d..8d56d78 100644
 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
@@ -1754,14 +1769,14 @@ index 90d6d4a..a687b10 100644
   * @fn      MT_UtilAssocFindDevice
   *
 diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
-index 63c143b..44ddc34 100644
+index 63c143b..eb36d1c 100644
 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
 +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
 @@ -43,15 +43,21 @@
  #include "zcomdef.h"
  #include "mt_version.h"
  
-+#define CODE_REVISION_NUMBER 20211217
++#define CODE_REVISION_NUMBER 20220103
 +
  /******************************************************************************
   * CONSTANTS
@@ -1929,6 +1944,18 @@ index b761da1..bc406ff 100644
  
  // 1-255 (0 -> 256) X RTG_TIMER_INTERVAL
  // A known shortcoming is that when a message is enqueued as "hold" for a
+diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c
+index a7378c7..527e0af 100644
+--- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c
++++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/stub_aps.c
+@@ -451,6 +451,7 @@ static ZStatus_t StubAPS_SetNewChannel( uint8_t channel )
+     ZMacSetReq( ZMacRxOnIdle, &rxOnIdle );
+ 
+     channelChangeInProgress = FALSE;
++    nwk_setStateIdle( FALSE );
+ 
+     return ( ZSuccess );
+   }
 diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
 index aafb10d..8d56d78 100644
 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
@@ -2358,14 +2385,14 @@ index 90d6d4a..a687b10 100644
   * @fn      MT_UtilAssocFindDevice
   *
 diff --git a/znp_LP_CC2652RB_tirtos_ccs/Application/mt/mt_version.c b/znp_LP_CC2652RB_tirtos_ccs/Application/mt/mt_version.c
-index 63c143b..44ddc34 100644
+index 63c143b..eb36d1c 100644
 --- a/znp_LP_CC2652RB_tirtos_ccs/Application/mt/mt_version.c
 +++ b/znp_LP_CC2652RB_tirtos_ccs/Application/mt/mt_version.c
 @@ -43,15 +43,21 @@
  #include "zcomdef.h"
  #include "mt_version.h"
  
-+#define CODE_REVISION_NUMBER 20211217
++#define CODE_REVISION_NUMBER 20220103
 +
  /******************************************************************************
   * CONSTANTS
@@ -2533,6 +2560,18 @@ index b761da1..bc406ff 100644
  
  // 1-255 (0 -> 256) X RTG_TIMER_INTERVAL
  // A known shortcoming is that when a message is enqueued as "hold" for a
+diff --git a/znp_LP_CC2652RB_tirtos_ccs/Stack/nwk/stub_aps.c b/znp_LP_CC2652RB_tirtos_ccs/Stack/nwk/stub_aps.c
+index a7378c7..527e0af 100644
+--- a/znp_LP_CC2652RB_tirtos_ccs/Stack/nwk/stub_aps.c
++++ b/znp_LP_CC2652RB_tirtos_ccs/Stack/nwk/stub_aps.c
+@@ -451,6 +451,7 @@ static ZStatus_t StubAPS_SetNewChannel( uint8_t channel )
+     ZMacSetReq( ZMacRxOnIdle, &rxOnIdle );
+ 
+     channelChangeInProgress = FALSE;
++    nwk_setStateIdle( FALSE );
+ 
+     return ( ZSuccess );
+   }
 diff --git a/znp_LP_CC2652RB_tirtos_ccs/Stack/sys/zglobals.c b/znp_LP_CC2652RB_tirtos_ccs/Stack/sys/zglobals.c
 index aafb10d..8d56d78 100644
 --- a/znp_LP_CC2652RB_tirtos_ccs/Stack/sys/zglobals.c