From a1a8f1f7c181b7f6368e82ca5fd448e6b5f01460 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Fri, 17 Apr 2020 17:50:22 +0200 Subject: [PATCH] Own changes --- .../Application/mt/mt_sys.c | 4 +- .../Application/mt/mt_version.c | 2 +- .../Application/mt/revision_info.h | 4 ++ .../Stack/Config/preinclude.h | 38 +++++++++++++++++++ .../Stack/Config/znp_cnf.opts | 2 + .../Stack/af/af.c | 14 +++++-- .../Stack/sys/zglobals.c | 6 ++- .../Stack/zdo/zd_app.c | 30 +++++++++------ .../cc13x2lp.cmd | 6 +-- znp_CC1352P_2_LAUNCHXL_tirtos_ccs/znp.syscfg | 5 ++- .../Application/mt/mt_sys.c | 4 +- .../Application/mt/mt_version.c | 2 +- .../Application/mt/revision_info.h | 4 ++ .../Stack/Config/preinclude.h | 38 +++++++++++++++++++ .../Stack/Config/znp_cnf.opts | 2 + .../Stack/af/af.c | 14 +++++-- .../Stack/sys/zglobals.c | 6 ++- .../Stack/zdo/zd_app.c | 30 +++++++++------ znp_CC2652RB_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd | 12 ++---- znp_CC2652RB_LAUNCHXL_tirtos_ccs/znp.syscfg | 5 ++- .../Application/mt/mt_sys.c | 4 +- .../Application/mt/mt_version.c | 2 +- .../Application/mt/revision_info.h | 4 ++ .../Stack/Config/preinclude.h | 38 +++++++++++++++++++ .../Stack/Config/znp_cnf.opts | 2 + .../Stack/af/af.c | 14 +++++-- .../Stack/sys/zglobals.c | 6 ++- .../Stack/zdo/zd_app.c | 30 +++++++++------ znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd | 6 +-- znp_CC26X2R1_LAUNCHXL_tirtos_ccs/znp.syscfg | 5 ++- 30 files changed, 258 insertions(+), 81 deletions(-) create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h create mode 100644 znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h create mode 100644 znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h create mode 100644 znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h create mode 100644 znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h create mode 100644 znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c index ee5ee10..7d8d058 100644 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c @@ -510,8 +510,8 @@ static void MT_SysVersion(void) uint8_t *pBuf = &verStr[sizeof(MTVersionString)]; #if (defined MAKE_CRC_SHDW) || (defined FAKE_CRC_SHDW) //built for bootloader uint32_t sblSig; - uint32_t sblRev; #endif + uint32_t sblRev; OsalPort_memcpy(verStr, (uint8_t *)MTVersionString, sizeof(MTVersionString)); @@ -1327,7 +1327,7 @@ static void MT_SysNvWrite(uint8_t *pBuf) else { /* Attempt to write data (existing) to the specified item */ - error = pZStackCfg->nvFps.writeItemEx( nvId, dataOfs, dataLen, pBuf ); + error = pZStackCfg->nvFps.writeItem( nvId, dataLen, pBuf ); } } 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 dbe48fb..f8402cd 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 @@ -69,7 +69,7 @@ *****************************************************************************/ const uint8_t MTVersionString[] = { 2, /* Transport protocol revision */ - 0, /* Product ID */ + 1, /* Product ID */ 2, /* Software major release number */ 7, /* Software minor release number */ 1, /* Software maintenance release number */ diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h new file mode 100644 index 0000000..04a07a3 --- /dev/null +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h @@ -0,0 +1,4 @@ +#ifndef APPLICATION_MT_REVISION_INFO_H_ +#define APPLICATION_MT_REVISION_INFO_H_ +#define CODE_REVISION_NUMBER 20200417 +#endif \ No newline at end of file diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h new file mode 100644 index 0000000..d81062f --- /dev/null +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h @@ -0,0 +1,38 @@ +#define INCLUDE_REVISION_INFORMATION +#define MT_SYS_KEY_MANAGEMENT 1 +#define FEATURE_NVEXID 1 + +// Save memory +#undef NWK_MAX_BINDING_ENTRIES +#define NWK_MAX_BINDING_ENTRIES 1 +#undef APS_MAX_GROUPS +#define APS_MAX_GROUPS 1 + +// Increase NV pages to 3 to allow for bigger device tables +#undef NVOCMP_NVPAGES +#define NVOCMP_NVPAGES 3 + +// Disabling MULTICAST is required in order for proper group support. +// If MULTICAST is not disabled, the group adress is not included in the APS header +#define MULTICAST_ENABLED FALSE + +// Increase the max number of boardcasts, the default broadcast delivery time is 3 seconds +// with the value below this will allow for 1 broadcast every 0.15 second +#define MAX_BCAST 30 + +/** + * Enable MTO routing + */ +#define CONCENTRATOR_ENABLE TRUE +#define CONCENTRATOR_DISCOVERY_TIME 120 +#define CONCENTRATOR_ROUTE_CACHE TRUE +#define MAX_RTG_SRC_ENTRIES 200 +#define SRC_RTG_EXPIRY_TIME 255 + +/** + * Scale other device tables appropriately + */ +#define NWK_MAX_DEVICE_LIST 50 +#define ZDSECMGR_TC_DEVICE_MAX 200 +#define MAX_NEIGHBOR_ENTRIES 20 +#define MAX_RTG_ENTRIES 100 \ No newline at end of file diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts index d809fb2..abb769e 100644 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts @@ -93,3 +93,5 @@ /* BDB interface */ -DMT_APP_CNF_FUNC + +--preinclude=preinclude.h \ No newline at end of file diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/af/af.c b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/af/af.c index bacef22..0193f78 100644 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/af/af.c +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/af/af.c @@ -406,10 +406,18 @@ void afIncomingData( aps_FrameFormat_t *aff, zAddrType_t *SrcAddress, uint16_t S #if !defined ( APS_NO_GROUPS ) // Find the first endpoint for this group grpEp = aps_FindGroupForEndpoint( aff->GroupID, APS_GROUPS_FIND_FIRST ); - if ( grpEp == APS_GROUPS_EP_NOT_FOUND ) - return; // No endpoint found + if ( grpEp == APS_GROUPS_EP_NOT_FOUND ) { + // No endpoint found, default to endpoint 1. + // In the original source code there is a return here. + // This prevent the messags from being forwarded. + // For our use-case we want to capture all messages. + // Even if the coordinator is not in the group. + epDesc = afFindEndPointDesc( 1 ); + } + else { + epDesc = afFindEndPointDesc( grpEp ); + } - epDesc = afFindEndPointDesc( grpEp ); if ( epDesc == NULL ) return; // Endpoint descriptor not found 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 117be3d..2cd470c 100644 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c @@ -110,7 +110,7 @@ uint8_t zgSecurePermitJoin = TRUE; // TC Link Key. In this scenario, if this flag is TRUE, the Trust Center will // encrypt the outgoing NWK Key with the default TC Link Key (ZigbeeAlliance09). // If this flag is FALSE (default), the Trust Center will not send the NWK Key at all. -uint8_t zgAllowRejoinsWithWellKnownKey = FALSE; +uint8_t zgAllowRejoinsWithWellKnownKey = TRUE; // https://e2e.ti.com/support/wireless-connectivity/zigbee-and-thread/f/158/p/882650/3265311#3265311 //allowInstallCodes uint8_t zgAllowInstallCodes = ZG_IC_SUPPORTED_NOT_REQUIRED; @@ -204,7 +204,9 @@ uint8_t zgEndDeviceConfiguration = END_DEV_CONFIGURATION; // // NOTICE: Before enabling Child Aging make sure to review all the related // definitions in this file, especially zgNwkParentInformation. -uint8_t zgChildAgingEnable = TRUE; + +// Disable child aging, otherwise Xiaomi devices are being kicked off the network. +uint8_t zgChildAgingEnable = FALSE; //========== 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 969c516..cfe9f56 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 @@ -422,12 +422,11 @@ uint32_t ZDApp_event_loop( uint8_t task_id, uint32_t events ) ZDApp_ChangeState( DEV_ROUTER ); } - if ( zgChildAgingEnable == TRUE ) - { - // Once the device has changed its state to a ROUTER set the timer to send - // Parent annce - ZDApp_SetParentAnnceTimer(); - } + // As we cannot enable child aging as Xiaomi devices will drop off + // but we stil want to have the parent announces we always enable it here. + // Otherwise some end devices could be unreachable when they changed parent + // while the coordinator was powered off. + ZDApp_SetParentAnnceTimer(); } else { @@ -905,12 +904,11 @@ void ZDApp_NetworkStartEvt( void ) bdb_reportCommissioningState(BDB_INITIALIZATION,TRUE); } - if ( zgChildAgingEnable == TRUE ) - { - // Once the device has changed its state to a COORDINATOR set the timer to send - // Parent annce - ZDApp_SetParentAnnceTimer(); - } + // As we cannot enable child aging as Xiaomi devices will drop off + // but we stil want to have the parent announces we always enable it here. + // Otherwise some end devices could be unreachable when they changed parent + // while the coordinator was powered off. + ZDApp_SetParentAnnceTimer(); } else { @@ -3184,6 +3182,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 30e5847..016187a 100755 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/cc13x2lp.cmd +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/cc13x2lp.cmd @@ -70,9 +70,9 @@ /* must be located at the beginning of the application. */ #define FLASH_BASE 0x00000000 -#define FLASH_SIZE 0x52000 -#define FLASH_NV_BASE 0x52000 -#define FLASH_NV_SIZE 0x4000 +#define FLASH_SIZE 0x50000 +#define FLASH_NV_BASE 0x50000 +#define FLASH_NV_SIZE 0x6000 #define FLASH_LAST_BASE 0x56000 #define FLASH_LAST_SIZE 0x2000 diff --git a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/znp.syscfg b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/znp.syscfg index 925448d..c80d40b 100644 --- a/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/znp.syscfg +++ b/znp_CC1352P_2_LAUNCHXL_tirtos_ccs/znp.syscfg @@ -52,6 +52,7 @@ CCFG.enableBootloaderBackdoor = true; CCFG.dioBootloaderBackdoor = 15; CCFG.levelBootloaderBackdoor = "Active low"; CCFG.forceVddr = true; +CCFG.enableDCDC = false; CCFG.ccfgTemplate.$name = "ti_devices_CCFGTemplate0"; rfdesign.rfDesign = "LAUNCHXL-CC1352P-2"; @@ -72,8 +73,8 @@ ECJPAKE1.$name = "CONFIG_ECJPAKE_0"; NVS1.$name = "CONFIG_NVSINTERNAL"; NVS1.internalFlash.$name = "ti_drivers_nvs_NVSCC26XX0"; -NVS1.internalFlash.regionBase = 0x52000; -NVS1.internalFlash.regionSize = 0x4000; +NVS1.internalFlash.regionBase = 0x50000; +NVS1.internalFlash.regionSize = 0x6000; NVS2.$name = "CONFIG_NVSEXTERNAL"; NVS2.nvsType = "External"; diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c index ee5ee10..7d8d058 100644 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c @@ -510,8 +510,8 @@ static void MT_SysVersion(void) uint8_t *pBuf = &verStr[sizeof(MTVersionString)]; #if (defined MAKE_CRC_SHDW) || (defined FAKE_CRC_SHDW) //built for bootloader uint32_t sblSig; - uint32_t sblRev; #endif + uint32_t sblRev; OsalPort_memcpy(verStr, (uint8_t *)MTVersionString, sizeof(MTVersionString)); @@ -1327,7 +1327,7 @@ static void MT_SysNvWrite(uint8_t *pBuf) else { /* Attempt to write data (existing) to the specified item */ - error = pZStackCfg->nvFps.writeItemEx( nvId, dataOfs, dataLen, pBuf ); + error = pZStackCfg->nvFps.writeItem( nvId, dataLen, pBuf ); } } 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 dbe48fb..f8402cd 100644 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c @@ -69,7 +69,7 @@ *****************************************************************************/ const uint8_t MTVersionString[] = { 2, /* Transport protocol revision */ - 0, /* Product ID */ + 1, /* Product ID */ 2, /* Software major release number */ 7, /* Software minor release number */ 1, /* Software maintenance release number */ diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h new file mode 100644 index 0000000..04a07a3 --- /dev/null +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h @@ -0,0 +1,4 @@ +#ifndef APPLICATION_MT_REVISION_INFO_H_ +#define APPLICATION_MT_REVISION_INFO_H_ +#define CODE_REVISION_NUMBER 20200417 +#endif \ No newline at end of file diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h new file mode 100644 index 0000000..d81062f --- /dev/null +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h @@ -0,0 +1,38 @@ +#define INCLUDE_REVISION_INFORMATION +#define MT_SYS_KEY_MANAGEMENT 1 +#define FEATURE_NVEXID 1 + +// Save memory +#undef NWK_MAX_BINDING_ENTRIES +#define NWK_MAX_BINDING_ENTRIES 1 +#undef APS_MAX_GROUPS +#define APS_MAX_GROUPS 1 + +// Increase NV pages to 3 to allow for bigger device tables +#undef NVOCMP_NVPAGES +#define NVOCMP_NVPAGES 3 + +// Disabling MULTICAST is required in order for proper group support. +// If MULTICAST is not disabled, the group adress is not included in the APS header +#define MULTICAST_ENABLED FALSE + +// Increase the max number of boardcasts, the default broadcast delivery time is 3 seconds +// with the value below this will allow for 1 broadcast every 0.15 second +#define MAX_BCAST 30 + +/** + * Enable MTO routing + */ +#define CONCENTRATOR_ENABLE TRUE +#define CONCENTRATOR_DISCOVERY_TIME 120 +#define CONCENTRATOR_ROUTE_CACHE TRUE +#define MAX_RTG_SRC_ENTRIES 200 +#define SRC_RTG_EXPIRY_TIME 255 + +/** + * Scale other device tables appropriately + */ +#define NWK_MAX_DEVICE_LIST 50 +#define ZDSECMGR_TC_DEVICE_MAX 200 +#define MAX_NEIGHBOR_ENTRIES 20 +#define MAX_RTG_ENTRIES 100 \ No newline at end of file diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts index d809fb2..abb769e 100644 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts @@ -93,3 +93,5 @@ /* BDB interface */ -DMT_APP_CNF_FUNC + +--preinclude=preinclude.h \ No newline at end of file diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/af/af.c b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/af/af.c index bacef22..0193f78 100644 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/af/af.c +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/af/af.c @@ -406,10 +406,18 @@ void afIncomingData( aps_FrameFormat_t *aff, zAddrType_t *SrcAddress, uint16_t S #if !defined ( APS_NO_GROUPS ) // Find the first endpoint for this group grpEp = aps_FindGroupForEndpoint( aff->GroupID, APS_GROUPS_FIND_FIRST ); - if ( grpEp == APS_GROUPS_EP_NOT_FOUND ) - return; // No endpoint found + if ( grpEp == APS_GROUPS_EP_NOT_FOUND ) { + // No endpoint found, default to endpoint 1. + // In the original source code there is a return here. + // This prevent the messags from being forwarded. + // For our use-case we want to capture all messages. + // Even if the coordinator is not in the group. + epDesc = afFindEndPointDesc( 1 ); + } + else { + epDesc = afFindEndPointDesc( grpEp ); + } - epDesc = afFindEndPointDesc( grpEp ); if ( epDesc == NULL ) return; // Endpoint descriptor not found diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c index 117be3d..2cd470c 100644 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c @@ -110,7 +110,7 @@ uint8_t zgSecurePermitJoin = TRUE; // TC Link Key. In this scenario, if this flag is TRUE, the Trust Center will // encrypt the outgoing NWK Key with the default TC Link Key (ZigbeeAlliance09). // If this flag is FALSE (default), the Trust Center will not send the NWK Key at all. -uint8_t zgAllowRejoinsWithWellKnownKey = FALSE; +uint8_t zgAllowRejoinsWithWellKnownKey = TRUE; // https://e2e.ti.com/support/wireless-connectivity/zigbee-and-thread/f/158/p/882650/3265311#3265311 //allowInstallCodes uint8_t zgAllowInstallCodes = ZG_IC_SUPPORTED_NOT_REQUIRED; @@ -204,7 +204,9 @@ uint8_t zgEndDeviceConfiguration = END_DEV_CONFIGURATION; // // NOTICE: Before enabling Child Aging make sure to review all the related // definitions in this file, especially zgNwkParentInformation. -uint8_t zgChildAgingEnable = TRUE; + +// Disable child aging, otherwise Xiaomi devices are being kicked off the network. +uint8_t zgChildAgingEnable = FALSE; //========== 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 969c516..cfe9f56 100644 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c @@ -422,12 +422,11 @@ uint32_t ZDApp_event_loop( uint8_t task_id, uint32_t events ) ZDApp_ChangeState( DEV_ROUTER ); } - if ( zgChildAgingEnable == TRUE ) - { - // Once the device has changed its state to a ROUTER set the timer to send - // Parent annce - ZDApp_SetParentAnnceTimer(); - } + // As we cannot enable child aging as Xiaomi devices will drop off + // but we stil want to have the parent announces we always enable it here. + // Otherwise some end devices could be unreachable when they changed parent + // while the coordinator was powered off. + ZDApp_SetParentAnnceTimer(); } else { @@ -905,12 +904,11 @@ void ZDApp_NetworkStartEvt( void ) bdb_reportCommissioningState(BDB_INITIALIZATION,TRUE); } - if ( zgChildAgingEnable == TRUE ) - { - // Once the device has changed its state to a COORDINATOR set the timer to send - // Parent annce - ZDApp_SetParentAnnceTimer(); - } + // As we cannot enable child aging as Xiaomi devices will drop off + // but we stil want to have the parent announces we always enable it here. + // Otherwise some end devices could be unreachable when they changed parent + // while the coordinator was powered off. + ZDApp_SetParentAnnceTimer(); } else { @@ -3184,6 +3182,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 2991774..1329f45 100755 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd @@ -70,15 +70,9 @@ /* must be located at the beginning of the application. */ #define FLASH_BASE 0x00000000 -#ifdef ONE_PAGE_NV -#define FLASH_SIZE 0x54000 -#define FLASH_NV_BASE 0x54000 -#define FLASH_NV_SIZE 0x2000 -#else -#define FLASH_SIZE 0x52000 -#define FLASH_NV_BASE 0x52000 -#define FLASH_NV_SIZE 0x4000 -#endif +#define FLASH_SIZE 0x50000 +#define FLASH_NV_BASE 0x50000 +#define FLASH_NV_SIZE 0x6000 #define FLASH_LAST_BASE 0x56000 #define FLASH_LAST_SIZE 0x2000 diff --git a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/znp.syscfg b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/znp.syscfg index d149bd9..2ec0b92 100644 --- a/znp_CC2652RB_LAUNCHXL_tirtos_ccs/znp.syscfg +++ b/znp_CC2652RB_LAUNCHXL_tirtos_ccs/znp.syscfg @@ -50,6 +50,7 @@ CCFG.enableBootloaderBackdoor = true; CCFG.dioBootloaderBackdoor = 13; CCFG.levelBootloaderBackdoor = "Active low"; CCFG.srcClkLF = "Derived from HF XOSC"; +CCFG.enableDCDC = false; CCFG.ccfgTemplate.$name = "ti_devices_CCFGTemplate0"; AESCBC1.$name = "CONFIG_AESCBC_0"; @@ -68,8 +69,8 @@ ECJPAKE1.$name = "CONFIG_ECJPAKE_0"; NVS1.$name = "CONFIG_NVSINTERNAL"; NVS1.internalFlash.$name = "ti_drivers_nvs_NVSCC26XX0"; -NVS1.internalFlash.regionBase = 0x52000; -NVS1.internalFlash.regionSize = 0x4000; +NVS1.internalFlash.regionBase = 0x50000; +NVS1.internalFlash.regionSize = 0x6000; NVS2.$name = "CONFIG_NVSEXTERNAL"; NVS2.nvsType = "External"; diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c index ee5ee10..7d8d058 100644 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_sys.c @@ -510,8 +510,8 @@ static void MT_SysVersion(void) uint8_t *pBuf = &verStr[sizeof(MTVersionString)]; #if (defined MAKE_CRC_SHDW) || (defined FAKE_CRC_SHDW) //built for bootloader uint32_t sblSig; - uint32_t sblRev; #endif + uint32_t sblRev; OsalPort_memcpy(verStr, (uint8_t *)MTVersionString, sizeof(MTVersionString)); @@ -1327,7 +1327,7 @@ static void MT_SysNvWrite(uint8_t *pBuf) else { /* Attempt to write data (existing) to the specified item */ - error = pZStackCfg->nvFps.writeItemEx( nvId, dataOfs, dataLen, pBuf ); + error = pZStackCfg->nvFps.writeItem( nvId, dataLen, pBuf ); } } 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 dbe48fb..f8402cd 100644 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/mt_version.c @@ -69,7 +69,7 @@ *****************************************************************************/ const uint8_t MTVersionString[] = { 2, /* Transport protocol revision */ - 0, /* Product ID */ + 1, /* Product ID */ 2, /* Software major release number */ 7, /* Software minor release number */ 1, /* Software maintenance release number */ diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h new file mode 100644 index 0000000..04a07a3 --- /dev/null +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Application/mt/revision_info.h @@ -0,0 +1,4 @@ +#ifndef APPLICATION_MT_REVISION_INFO_H_ +#define APPLICATION_MT_REVISION_INFO_H_ +#define CODE_REVISION_NUMBER 20200417 +#endif \ No newline at end of file diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h new file mode 100644 index 0000000..d81062f --- /dev/null +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/preinclude.h @@ -0,0 +1,38 @@ +#define INCLUDE_REVISION_INFORMATION +#define MT_SYS_KEY_MANAGEMENT 1 +#define FEATURE_NVEXID 1 + +// Save memory +#undef NWK_MAX_BINDING_ENTRIES +#define NWK_MAX_BINDING_ENTRIES 1 +#undef APS_MAX_GROUPS +#define APS_MAX_GROUPS 1 + +// Increase NV pages to 3 to allow for bigger device tables +#undef NVOCMP_NVPAGES +#define NVOCMP_NVPAGES 3 + +// Disabling MULTICAST is required in order for proper group support. +// If MULTICAST is not disabled, the group adress is not included in the APS header +#define MULTICAST_ENABLED FALSE + +// Increase the max number of boardcasts, the default broadcast delivery time is 3 seconds +// with the value below this will allow for 1 broadcast every 0.15 second +#define MAX_BCAST 30 + +/** + * Enable MTO routing + */ +#define CONCENTRATOR_ENABLE TRUE +#define CONCENTRATOR_DISCOVERY_TIME 120 +#define CONCENTRATOR_ROUTE_CACHE TRUE +#define MAX_RTG_SRC_ENTRIES 200 +#define SRC_RTG_EXPIRY_TIME 255 + +/** + * Scale other device tables appropriately + */ +#define NWK_MAX_DEVICE_LIST 50 +#define ZDSECMGR_TC_DEVICE_MAX 200 +#define MAX_NEIGHBOR_ENTRIES 20 +#define MAX_RTG_ENTRIES 100 \ No newline at end of file diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts index d809fb2..abb769e 100644 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/Config/znp_cnf.opts @@ -93,3 +93,5 @@ /* BDB interface */ -DMT_APP_CNF_FUNC + +--preinclude=preinclude.h \ No newline at end of file diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/af/af.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/af/af.c index bacef22..0193f78 100644 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/af/af.c +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/af/af.c @@ -406,10 +406,18 @@ void afIncomingData( aps_FrameFormat_t *aff, zAddrType_t *SrcAddress, uint16_t S #if !defined ( APS_NO_GROUPS ) // Find the first endpoint for this group grpEp = aps_FindGroupForEndpoint( aff->GroupID, APS_GROUPS_FIND_FIRST ); - if ( grpEp == APS_GROUPS_EP_NOT_FOUND ) - return; // No endpoint found + if ( grpEp == APS_GROUPS_EP_NOT_FOUND ) { + // No endpoint found, default to endpoint 1. + // In the original source code there is a return here. + // This prevent the messags from being forwarded. + // For our use-case we want to capture all messages. + // Even if the coordinator is not in the group. + epDesc = afFindEndPointDesc( 1 ); + } + else { + epDesc = afFindEndPointDesc( grpEp ); + } - epDesc = afFindEndPointDesc( grpEp ); if ( epDesc == NULL ) return; // Endpoint descriptor not found diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c index 117be3d..2cd470c 100644 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/sys/zglobals.c @@ -110,7 +110,7 @@ uint8_t zgSecurePermitJoin = TRUE; // TC Link Key. In this scenario, if this flag is TRUE, the Trust Center will // encrypt the outgoing NWK Key with the default TC Link Key (ZigbeeAlliance09). // If this flag is FALSE (default), the Trust Center will not send the NWK Key at all. -uint8_t zgAllowRejoinsWithWellKnownKey = FALSE; +uint8_t zgAllowRejoinsWithWellKnownKey = TRUE; // https://e2e.ti.com/support/wireless-connectivity/zigbee-and-thread/f/158/p/882650/3265311#3265311 //allowInstallCodes uint8_t zgAllowInstallCodes = ZG_IC_SUPPORTED_NOT_REQUIRED; @@ -204,7 +204,9 @@ uint8_t zgEndDeviceConfiguration = END_DEV_CONFIGURATION; // // NOTICE: Before enabling Child Aging make sure to review all the related // definitions in this file, especially zgNwkParentInformation. -uint8_t zgChildAgingEnable = TRUE; + +// Disable child aging, otherwise Xiaomi devices are being kicked off the network. +uint8_t zgChildAgingEnable = FALSE; //========== 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 969c516..cfe9f56 100644 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/Stack/zdo/zd_app.c @@ -422,12 +422,11 @@ uint32_t ZDApp_event_loop( uint8_t task_id, uint32_t events ) ZDApp_ChangeState( DEV_ROUTER ); } - if ( zgChildAgingEnable == TRUE ) - { - // Once the device has changed its state to a ROUTER set the timer to send - // Parent annce - ZDApp_SetParentAnnceTimer(); - } + // As we cannot enable child aging as Xiaomi devices will drop off + // but we stil want to have the parent announces we always enable it here. + // Otherwise some end devices could be unreachable when they changed parent + // while the coordinator was powered off. + ZDApp_SetParentAnnceTimer(); } else { @@ -905,12 +904,11 @@ void ZDApp_NetworkStartEvt( void ) bdb_reportCommissioningState(BDB_INITIALIZATION,TRUE); } - if ( zgChildAgingEnable == TRUE ) - { - // Once the device has changed its state to a COORDINATOR set the timer to send - // Parent annce - ZDApp_SetParentAnnceTimer(); - } + // As we cannot enable child aging as Xiaomi devices will drop off + // but we stil want to have the parent announces we always enable it here. + // Otherwise some end devices could be unreachable when they changed parent + // while the coordinator was powered off. + ZDApp_SetParentAnnceTimer(); } else { @@ -3184,6 +3182,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 464e39c..1329f45 100755 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/cc26x2lp.cmd @@ -70,9 +70,9 @@ /* must be located at the beginning of the application. */ #define FLASH_BASE 0x00000000 -#define FLASH_SIZE 0x52000 -#define FLASH_NV_BASE 0x52000 -#define FLASH_NV_SIZE 0x4000 +#define FLASH_SIZE 0x50000 +#define FLASH_NV_BASE 0x50000 +#define FLASH_NV_SIZE 0x6000 #define FLASH_LAST_BASE 0x56000 #define FLASH_LAST_SIZE 0x2000 diff --git a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/znp.syscfg b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/znp.syscfg index 86c093b..d007d4c 100644 --- a/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/znp.syscfg +++ b/znp_CC26X2R1_LAUNCHXL_tirtos_ccs/znp.syscfg @@ -49,6 +49,7 @@ CCFG.enableBootloader = true; CCFG.enableBootloaderBackdoor = true; CCFG.dioBootloaderBackdoor = 13; CCFG.levelBootloaderBackdoor = "Active low"; +CCFG.enableDCDC = false; CCFG.ccfgTemplate.$name = "ti_devices_CCFGTemplate0"; AESCBC1.$name = "CONFIG_AESCBC_0"; @@ -67,8 +68,8 @@ ECJPAKE1.$name = "CONFIG_ECJPAKE_0"; NVS1.$name = "CONFIG_NVSINTERNAL"; NVS1.internalFlash.$name = "ti_drivers_nvs_NVSCC26XX0"; -NVS1.internalFlash.regionBase = 0x52000; -NVS1.internalFlash.regionSize = 0x4000; +NVS1.internalFlash.regionBase = 0x50000; +NVS1.internalFlash.regionSize = 0x6000; NVS2.$name = "CONFIG_NVSEXTERNAL"; NVS2.nvsType = "External"; -- 2.24.1 (Apple Git-126)