mirror of
https://github.com/Koenkk/Z-Stack-firmware.git
synced 2025-02-06 04:11:20 +01:00
Z-Stack_3.x.0 20210107 firmware
This commit is contained in:
parent
80d6d8f640
commit
45784fe32b
@ -1,7 +1,7 @@
|
||||
# 20201113
|
||||
- Optimize network parameters according to https://www.ti.com/lit/an/swra650b/swra650b.pdf
|
||||
- Change default CC2652R/CC2652RB transmit power from 0dBm to 5dBm
|
||||
- Change default CC1352P/CC2652P transmit power from 0dBm to 20dBm
|
||||
# 20210107
|
||||
- Optimize network parameters (according to https://www.ti.com/lit/an/swra650b/swra650b.pdf)
|
||||
- Change default CC2652R/CC2652RB/CC1352P/CC2652P transmit power from 0dBm to 5dBm
|
||||
- Potential fix for Hue end devices disconnecting
|
||||
|
||||
# 20201026
|
||||
- SimpleLink SDK 4.30.00.54 ([changelog](http://software-dl.ti.com/simplelink/esd/simplelink_cc13x2_26x2_sdk/4.30.00.54/exports/changelog.html))
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
coordinator/Z-Stack_3.x.0/bin/CC2652RB_20210107.zip
Normal file
BIN
coordinator/Z-Stack_3.x.0/bin/CC2652RB_20210107.zip
Normal file
Binary file not shown.
Binary file not shown.
BIN
coordinator/Z-Stack_3.x.0/bin/CC26X2R1_20210107.zip
Normal file
BIN
coordinator/Z-Stack_3.x.0/bin/CC26X2R1_20210107.zip
Normal file
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
From 0366f33f4ce1f2132741a1a3aaec780fdd25c31e Mon Sep 17 00:00:00 2001
|
||||
From 6894f2affad32a180ea298c04579287532c1f618 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kanters <koenkanters94@gmail.com>
|
||||
Date: Fri, 13 Nov 2020 14:36:02 +0100
|
||||
Subject: [PATCH 1/1] Own changes
|
||||
@ -10,14 +10,15 @@ Subject: [PATCH 1/1] Own changes
|
||||
.../Stack/Config/preinclude.h | 65 +
|
||||
.../Stack/Config/znp_cnf.opts | 2 +
|
||||
.../Stack/af/af.c | 18 +-
|
||||
.../Stack/nwk/nwk_globals.c | 8 +-
|
||||
.../Stack/sys/zglobals.c | 6 +-
|
||||
.../Stack/zdo/zd_app.c | 22 +-
|
||||
.../Stack/zdo/zd_app.c | 30 +-
|
||||
.../cc13x2lp.cmd | 6 +-
|
||||
.../syscfg/ti_devices_config.c | 103 ++
|
||||
.../syscfg/ti_drivers_config.c | 1050 +++++++++++++++++
|
||||
.../syscfg/ti_drivers_config.h | 283 +++++
|
||||
.../syscfg/ti_radio_config.c | 379 ++++++
|
||||
.../syscfg/ti_radio_config.h | 79 ++
|
||||
.../syscfg/ti_radio_config.c | 339 ++++++
|
||||
.../syscfg/ti_radio_config.h | 77 ++
|
||||
.../syscfg/ti_utils_build_linker.cmd.genlibs | 35 +
|
||||
.../syscfg/ti_zstack_config.h | 215 ++++
|
||||
.../Application/mt/mt.h | 2 +
|
||||
@ -26,8 +27,9 @@ Subject: [PATCH 1/1] Own changes
|
||||
.../Stack/Config/preinclude.h | 52 +
|
||||
.../Stack/Config/znp_cnf.opts | 2 +
|
||||
.../Stack/af/af.c | 18 +-
|
||||
.../Stack/nwk/nwk_globals.c | 8 +-
|
||||
.../Stack/sys/zglobals.c | 6 +-
|
||||
.../Stack/zdo/zd_app.c | 22 +-
|
||||
.../Stack/zdo/zd_app.c | 30 +-
|
||||
znp_CC2652RB_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd | 12 +-
|
||||
znp_CC2652RB_LAUNCHXL_tirtos_ccs/znp.syscfg | 31 +-
|
||||
.../Application/mt/mt.h | 2 +
|
||||
@ -36,11 +38,12 @@ Subject: [PATCH 1/1] Own changes
|
||||
.../Stack/Config/preinclude.h | 52 +
|
||||
.../Stack/Config/znp_cnf.opts | 2 +
|
||||
.../Stack/af/af.c | 18 +-
|
||||
.../Stack/nwk/nwk_globals.c | 8 +-
|
||||
.../Stack/sys/zglobals.c | 6 +-
|
||||
.../Stack/zdo/zd_app.c | 22 +-
|
||||
.../Stack/zdo/zd_app.c | 30 +-
|
||||
znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd | 6 +-
|
||||
znp_CC26X2R1_LAUNCHXL_tirtos_ccs/znp.syscfg | 31 +-
|
||||
36 files changed, 2665 insertions(+), 100 deletions(-)
|
||||
39 files changed, 2659 insertions(+), 112 deletions(-)
|
||||
create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h
|
||||
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
|
||||
@ -155,14 +158,14 @@ index 90d6d4a..4d50083 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..9c8295c 100644
|
||||
index 63c143b..2b821f4 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 20201113
|
||||
+#define CODE_REVISION_NUMBER 20210107
|
||||
+
|
||||
/******************************************************************************
|
||||
* CONSTANTS
|
||||
@ -300,6 +303,25 @@ index 3a7afa3..e3a2706 100644
|
||||
{
|
||||
// Save original endpoint
|
||||
uint8_t endpoint = aff->DstEndPoint;
|
||||
diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
index 62c0605..f9be30a 100644
|
||||
--- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
+++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
@@ -65,10 +65,10 @@
|
||||
* CONSTANTS
|
||||
*/
|
||||
// Maximums for the data buffer queue
|
||||
-#define NWK_MAX_DATABUFS_WAITING 8 // Waiting to be sent to MAC
|
||||
-#define NWK_MAX_DATABUFS_SCHEDULED 5 // Timed messages to be sent
|
||||
-#define NWK_MAX_DATABUFS_CONFIRMED 5 // Held after MAC confirms
|
||||
-#define NWK_MAX_DATABUFS_TOTAL 12 // Total number of buffers
|
||||
+#define NWK_MAX_DATABUFS_WAITING 16 // Waiting to be sent to MAC
|
||||
+#define NWK_MAX_DATABUFS_SCHEDULED 10 // Timed messages to be sent
|
||||
+#define NWK_MAX_DATABUFS_CONFIRMED 10 // Held after MAC confirms
|
||||
+#define NWK_MAX_DATABUFS_TOTAL 24 // Total number of buffers
|
||||
|
||||
// 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/sys/zglobals.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
|
||||
index e716024..f8d8404 100644
|
||||
--- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
|
||||
@ -325,7 +347,7 @@ index e716024..f8d8404 100644
|
||||
//========== TouchLink NWK configuration ===============
|
||||
// Values used by Router when starts a network as initiator
|
||||
diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
index 17ac2f5..9c0021b 100644
|
||||
index 17ac2f5..aca29b0 100644
|
||||
--- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
+++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
@@ -419,12 +419,11 @@ uint32_t ZDApp_event_loop( uint8_t task_id, uint32_t events )
|
||||
@ -364,6 +386,21 @@ index 17ac2f5..9c0021b 100644
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3133,6 +3131,14 @@ void ZDO_NetworkStatusCB( uint16_t nwkDstAddr, uint8_t statusCode, uint16_t dstA
|
||||
// Routing error for dstAddr, this is informational and a Route
|
||||
// Request should happen automatically.
|
||||
}
|
||||
+
|
||||
+ if ( (nwkDstAddr == NLME_GetShortAddr())
|
||||
+ && (statusCode == NWKSTAT_SOURCE_ROUTE_FAILURE) )
|
||||
+ {
|
||||
+ // Received a source route failure, remove route and rediscover.
|
||||
+ RTG_RemoveRtgEntry( dstAddr, 0 );
|
||||
+ NLME_RouteDiscoveryRequest( dstAddr, 0, 30 );
|
||||
+ }
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/cc13x2lp.cmd b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/cc13x2lp.cmd
|
||||
index 2b5d2ae..c12e296 100755
|
||||
--- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/cc13x2lp.cmd
|
||||
@ -1837,10 +1874,10 @@ index 0000000..abf128f
|
||||
+#endif /* include guard */
|
||||
diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_radio_config.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_radio_config.c
|
||||
new file mode 100644
|
||||
index 0000000..34ea7bd
|
||||
index 0000000..098f101
|
||||
--- /dev/null
|
||||
+++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_radio_config.c
|
||||
@@ -0,0 +1,379 @@
|
||||
@@ -0,0 +1,339 @@
|
||||
+/*
|
||||
+ * ======== ti_radio_config.c ========
|
||||
+ * Configured RadioConfig module definitions
|
||||
@ -1961,7 +1998,7 @@ index 0000000..34ea7bd
|
||||
+
|
||||
+// PARAMETER SUMMARY
|
||||
+// Channel - Frequency (MHz): 2405
|
||||
+// TX Power (dBm): 20
|
||||
+// TX Power (dBm): 5
|
||||
+
|
||||
+// TI-RTOS RF Mode Object
|
||||
+RF_Mode RF_prop_ieee154 =
|
||||
@ -1983,46 +2020,6 @@ index 0000000..34ea7bd
|
||||
+ (uint32_t)0xFFFFFFFF
|
||||
+};
|
||||
+
|
||||
+// Overrides for CMD_RADIO_SETUP_PA
|
||||
+uint32_t pOverrides_ieee154TxStd[] =
|
||||
+{
|
||||
+ // override_txstd_placeholder.json
|
||||
+ // TX Standard power override
|
||||
+ TX_STD_POWER_OVERRIDE(0x7217),
|
||||
+ // The ANADIV radio parameter based on LO divider and front end settings
|
||||
+ (uint32_t)0x05320703,
|
||||
+ // override_txstd_settings.json
|
||||
+ // Set RTIM offset to default for standard PA
|
||||
+ (uint32_t)0x00008783,
|
||||
+ // Set synth mux to default value for standard PA
|
||||
+ (uint32_t)0x050206C3,
|
||||
+ // Set TXRX pin to 0 in RX and high impedance in idle/TX.
|
||||
+ HW_REG_OVERRIDE(0x60A8,0x0401),
|
||||
+ // Tx: Set DCDC settings IPEAK=3, dither = off
|
||||
+ (uint32_t)0x00F388D3,
|
||||
+ (uint32_t)0xFFFFFFFF
|
||||
+};
|
||||
+
|
||||
+// Overrides for CMD_RADIO_SETUP_PA
|
||||
+uint32_t pOverrides_ieee154Tx20[] =
|
||||
+{
|
||||
+ // override_tx20_placeholder.json
|
||||
+ // TX HighPA power override
|
||||
+ TX20_POWER_OVERRIDE(0x003F75F5),
|
||||
+ // The ANADIV radio parameter based on LO divider and front end settings
|
||||
+ (uint32_t)0x01C20703,
|
||||
+ // override_tx20_settings.json
|
||||
+ // Set RTIM offset to 3 for high power PA
|
||||
+ (uint32_t)0x00038783,
|
||||
+ // Set synth mux for high power PA
|
||||
+ (uint32_t)0x010206C3,
|
||||
+ // Set TXRX pin to 0 in RX/TX and high impedance in idle.
|
||||
+ HW_REG_OVERRIDE(0x60A8,0x0001),
|
||||
+ // Tx: Set DCDC settings IPEAK=7, dither = off
|
||||
+ (uint32_t)0x00F788D3,
|
||||
+ (uint32_t)0xFFFFFFFF
|
||||
+};
|
||||
+
|
||||
+
|
||||
+
|
||||
+// CMD_RADIO_SETUP_PA
|
||||
@ -2045,10 +2042,10 @@ index 0000000..34ea7bd
|
||||
+ .config.biasMode = 0x1,
|
||||
+ .config.analogCfgMode = 0x0,
|
||||
+ .config.bNoFsPowerUp = 0x0,
|
||||
+ .txPower = 0xFFFF,
|
||||
+ .txPower = 0x7217,
|
||||
+ .pRegOverride = pOverrides_ieee154,
|
||||
+ .pRegOverrideTxStd = pOverrides_ieee154TxStd,
|
||||
+ .pRegOverrideTx20 = pOverrides_ieee154Tx20
|
||||
+ .pRegOverrideTxStd = 0,
|
||||
+ .pRegOverrideTx20 = 0
|
||||
+};
|
||||
+
|
||||
+// CMD_FS
|
||||
@ -2222,10 +2219,10 @@ index 0000000..34ea7bd
|
||||
+
|
||||
diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_radio_config.h b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_radio_config.h
|
||||
new file mode 100644
|
||||
index 0000000..4d1697c
|
||||
index 0000000..d234031
|
||||
--- /dev/null
|
||||
+++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_radio_config.h
|
||||
@@ -0,0 +1,79 @@
|
||||
@@ -0,0 +1,77 @@
|
||||
+/*
|
||||
+ * ======== ti_radio_config.h ========
|
||||
+ * Configured RadioConfig module definitions
|
||||
@ -2284,9 +2281,9 @@ index 0000000..4d1697c
|
||||
+//*********************************************************************************
|
||||
+
|
||||
+// PA table usage
|
||||
+#define TX_POWER_TABLE_SIZE_ieee154 TXPOWERTABLE_2400_PA5_20_SIZE
|
||||
+#define TX_POWER_TABLE_SIZE_ieee154 TXPOWERTABLE_2400_PA5_SIZE
|
||||
+
|
||||
+#define txPowerTable_ieee154 txPowerTable_2400_pa5_20
|
||||
+#define txPowerTable_ieee154 txPowerTable_2400_pa5
|
||||
+
|
||||
+// TI-RTOS RF Mode object
|
||||
+extern RF_Mode RF_prop_ieee154;
|
||||
@ -2301,8 +2298,6 @@ index 0000000..4d1697c
|
||||
+
|
||||
+// RF Core API overrides
|
||||
+extern uint32_t pOverrides_ieee154[];
|
||||
+extern uint32_t pOverrides_ieee154TxStd[];
|
||||
+extern uint32_t pOverrides_ieee154Tx20[];
|
||||
+
|
||||
+#endif // _TI_RADIO_CONFIG_H_
|
||||
diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_utils_build_linker.cmd.genlibs b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_utils_build_linker.cmd.genlibs
|
||||
@ -2348,7 +2343,7 @@ index 0000000..fa697e6
|
||||
+
|
||||
diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_zstack_config.h b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_zstack_config.h
|
||||
new file mode 100644
|
||||
index 0000000..22ca879
|
||||
index 0000000..89dad74
|
||||
--- /dev/null
|
||||
+++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/syscfg/ti_zstack_config.h
|
||||
@@ -0,0 +1,215 @@
|
||||
@ -2505,7 +2500,7 @@ index 0000000..22ca879
|
||||
+
|
||||
+/* The number of milliseconds to wait between data request polls to the coordinator. */
|
||||
+#ifndef TXPOWER
|
||||
+#define TXPOWER 20
|
||||
+#define TXPOWER 5
|
||||
+#endif
|
||||
+
|
||||
+/****************************************
|
||||
@ -2670,14 +2665,14 @@ index 90d6d4a..4d50083 100644
|
||||
* @fn MT_UtilAssocFindDevice
|
||||
*
|
||||
diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
|
||||
index 63c143b..9c8295c 100644
|
||||
index 63c143b..2b821f4 100644
|
||||
--- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
|
||||
+++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c
|
||||
@@ -43,15 +43,21 @@
|
||||
#include "zcomdef.h"
|
||||
#include "mt_version.h"
|
||||
|
||||
+#define CODE_REVISION_NUMBER 20201113
|
||||
+#define CODE_REVISION_NUMBER 20210107
|
||||
+
|
||||
/******************************************************************************
|
||||
* CONSTANTS
|
||||
@ -2802,6 +2797,25 @@ index 3a7afa3..e3a2706 100644
|
||||
{
|
||||
// Save original endpoint
|
||||
uint8_t endpoint = aff->DstEndPoint;
|
||||
diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
index 62c0605..f9be30a 100644
|
||||
--- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
+++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
@@ -65,10 +65,10 @@
|
||||
* CONSTANTS
|
||||
*/
|
||||
// Maximums for the data buffer queue
|
||||
-#define NWK_MAX_DATABUFS_WAITING 8 // Waiting to be sent to MAC
|
||||
-#define NWK_MAX_DATABUFS_SCHEDULED 5 // Timed messages to be sent
|
||||
-#define NWK_MAX_DATABUFS_CONFIRMED 5 // Held after MAC confirms
|
||||
-#define NWK_MAX_DATABUFS_TOTAL 12 // Total number of buffers
|
||||
+#define NWK_MAX_DATABUFS_WAITING 16 // Waiting to be sent to MAC
|
||||
+#define NWK_MAX_DATABUFS_SCHEDULED 10 // Timed messages to be sent
|
||||
+#define NWK_MAX_DATABUFS_CONFIRMED 10 // Held after MAC confirms
|
||||
+#define NWK_MAX_DATABUFS_TOTAL 24 // Total number of buffers
|
||||
|
||||
// 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_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
|
||||
index e716024..f8d8404 100644
|
||||
--- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
|
||||
@ -2827,7 +2841,7 @@ index e716024..f8d8404 100644
|
||||
//========== TouchLink NWK configuration ===============
|
||||
// Values used by Router when starts a network as initiator
|
||||
diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
index 17ac2f5..9c0021b 100644
|
||||
index 17ac2f5..aca29b0 100644
|
||||
--- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
+++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
@@ -419,12 +419,11 @@ uint32_t ZDApp_event_loop( uint8_t task_id, uint32_t events )
|
||||
@ -2866,6 +2880,21 @@ index 17ac2f5..9c0021b 100644
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3133,6 +3131,14 @@ void ZDO_NetworkStatusCB( uint16_t nwkDstAddr, uint8_t statusCode, uint16_t dstA
|
||||
// Routing error for dstAddr, this is informational and a Route
|
||||
// Request should happen automatically.
|
||||
}
|
||||
+
|
||||
+ if ( (nwkDstAddr == NLME_GetShortAddr())
|
||||
+ && (statusCode == NWKSTAT_SOURCE_ROUTE_FAILURE) )
|
||||
+ {
|
||||
+ // Received a source route failure, remove route and rediscover.
|
||||
+ RTG_RemoveRtgEntry( dstAddr, 0 );
|
||||
+ NLME_RouteDiscoveryRequest( dstAddr, 0, 30 );
|
||||
+ }
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd
|
||||
index 2b19342..b448752 100755
|
||||
--- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd
|
||||
@ -3048,14 +3077,14 @@ index 90d6d4a..4d50083 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..9c8295c 100644
|
||||
index 63c143b..2b821f4 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 20201113
|
||||
+#define CODE_REVISION_NUMBER 20210107
|
||||
+
|
||||
/******************************************************************************
|
||||
* CONSTANTS
|
||||
@ -3180,6 +3209,25 @@ index 3a7afa3..e3a2706 100644
|
||||
{
|
||||
// Save original endpoint
|
||||
uint8_t endpoint = aff->DstEndPoint;
|
||||
diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
index 62c0605..f9be30a 100644
|
||||
--- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
+++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/nwk/nwk_globals.c
|
||||
@@ -65,10 +65,10 @@
|
||||
* CONSTANTS
|
||||
*/
|
||||
// Maximums for the data buffer queue
|
||||
-#define NWK_MAX_DATABUFS_WAITING 8 // Waiting to be sent to MAC
|
||||
-#define NWK_MAX_DATABUFS_SCHEDULED 5 // Timed messages to be sent
|
||||
-#define NWK_MAX_DATABUFS_CONFIRMED 5 // Held after MAC confirms
|
||||
-#define NWK_MAX_DATABUFS_TOTAL 12 // Total number of buffers
|
||||
+#define NWK_MAX_DATABUFS_WAITING 16 // Waiting to be sent to MAC
|
||||
+#define NWK_MAX_DATABUFS_SCHEDULED 10 // Timed messages to be sent
|
||||
+#define NWK_MAX_DATABUFS_CONFIRMED 10 // Held after MAC confirms
|
||||
+#define NWK_MAX_DATABUFS_TOTAL 24 // Total number of buffers
|
||||
|
||||
// 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/sys/zglobals.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
|
||||
index e716024..f8d8404 100644
|
||||
--- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c
|
||||
@ -3205,7 +3253,7 @@ index e716024..f8d8404 100644
|
||||
//========== TouchLink NWK configuration ===============
|
||||
// Values used by Router when starts a network as initiator
|
||||
diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
index 17ac2f5..9c0021b 100644
|
||||
index 17ac2f5..aca29b0 100644
|
||||
--- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
+++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c
|
||||
@@ -419,12 +419,11 @@ uint32_t ZDApp_event_loop( uint8_t task_id, uint32_t events )
|
||||
@ -3244,6 +3292,21 @@ index 17ac2f5..9c0021b 100644
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3133,6 +3131,14 @@ void ZDO_NetworkStatusCB( uint16_t nwkDstAddr, uint8_t statusCode, uint16_t dstA
|
||||
// Routing error for dstAddr, this is informational and a Route
|
||||
// Request should happen automatically.
|
||||
}
|
||||
+
|
||||
+ if ( (nwkDstAddr == NLME_GetShortAddr())
|
||||
+ && (statusCode == NWKSTAT_SOURCE_ROUTE_FAILURE) )
|
||||
+ {
|
||||
+ // Received a source route failure, remove route and rediscover.
|
||||
+ RTG_RemoveRtgEntry( dstAddr, 0 );
|
||||
+ NLME_RouteDiscoveryRequest( dstAddr, 0, 30 );
|
||||
+ }
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd
|
||||
index e3fea91..b448752 100755
|
||||
--- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd
|
||||
|
Loading…
Reference in New Issue
Block a user