diff --git a/coordinator/CC2531/bin/CC2531ZNP-Prod_20190222.zip b/coordinator/CC2531/bin/CC2531ZNP-Prod_20190222.zip deleted file mode 100644 index 5621235..0000000 Binary files a/coordinator/CC2531/bin/CC2531ZNP-Prod_20190222.zip and /dev/null differ diff --git a/coordinator/CC2531/bin/CC2531ZNP-Prod_20190223.zip b/coordinator/CC2531/bin/CC2531ZNP-Prod_20190223.zip new file mode 100644 index 0000000..64ecbfe Binary files /dev/null and b/coordinator/CC2531/bin/CC2531ZNP-Prod_20190223.zip differ diff --git a/coordinator/CHANGELOG.md b/coordinator/CHANGELOG.md index be0fabe..c64f08e 100644 --- a/coordinator/CHANGELOG.md +++ b/coordinator/CHANGELOG.md @@ -1,3 +1,8 @@ +# 20190223 +- Reduced memory footprint +- Increased number of routes to remember to 40 +- Disabled route expiry + # 20190222 - Decreased binding and group table size to 1, allows for more memory allocated to the heap. It's not used by Zigbee2mqtt anyway. - Reverted size of data buffers to default, a buffer full error is now properly handled by Zigbee2mqtt. diff --git a/coordinator/firmware.patch b/coordinator/firmware.patch index 7ee5da2..5f892aa 100644 --- a/coordinator/firmware.patch +++ b/coordinator/firmware.patch @@ -34,11 +34,11 @@ index 35aae57..176a2ae 100644 diff --git a/Components/mt/revision_info.h b/Components/mt/revision_info.h new file mode 100644 -index 0000000..82ad6bc +index 0000000..4edc622 --- /dev/null +++ b/Components/mt/revision_info.h @@ -0,0 +1 @@ -+#define CODE_REVISION_NUMBER 20190222 ++#define CODE_REVISION_NUMBER 20190223 \ No newline at end of file diff --git a/Components/stack/af/AF.c b/Components/stack/af/AF.c index c6183b6..2b885b6 100644 @@ -117,10 +117,10 @@ index 7c6c77e..b49a5ca 100644 znpCfg1 = P2_0; diff --git a/Projects/zstack/ZNP/CC253x/Source/preinclude.h b/Projects/zstack/ZNP/CC253x/Source/preinclude.h new file mode 100644 -index 0000000..5ec46d5 +index 0000000..7db1502 --- /dev/null +++ b/Projects/zstack/ZNP/CC253x/Source/preinclude.h -@@ -0,0 +1,90 @@ +@@ -0,0 +1,82 @@ +// Shared accross all firmwares +#define ASSERT_RESET + @@ -160,10 +160,14 @@ index 0000000..5ec46d5 +#undef MAX_BCAST // avoids incompatible redefinition of macro warning +#define MAX_BCAST 12 + ++// See swra635.pdf ++#define HAL_LCD FALSE ++#define HAL_ADC FALSE ++ +#if defined FIRMWARE_CC2531_DEFAULT + #define CC2531ZNP + #define NWK_MAX_DEVICE_LIST 15 -+ #define MAXMEMHEAP 3117 ++ #define MAXMEMHEAP 3029 + #define OPTIMIZE_LARGE_NETWORK + +#elif defined FIRMWARE_CC2531_MAX_DEVICES @@ -173,8 +177,6 @@ index 0000000..5ec46d5 + #define MAX_NEIGHBOR_ENTRIES 1 + +#elif defined FIRMWARE_CC2530_DEFAULT -+ #define HAL_LCD FALSE -+ #define HAL_ADC FALSE + #define HAL_UART_DMA_RX_MAX 128 + #define NWK_MAX_DEVICE_LIST 15 + #define MAXMEMHEAP 2997 @@ -188,8 +190,6 @@ index 0000000..5ec46d5 + #define MAXMEMHEAP 2995 + #define ENABLE_MT_SYS_RESET_SHUTDOWN + #define ZTOOL_P1 -+ #define HAL_LCD FALSE -+ #define HAL_ADC FALSE + #define HAL_UART_DMA_RX_MAX 128 + #define HAL_PA_LNA + #define OPTIMIZE_LARGE_NETWORK @@ -197,19 +197,11 @@ index 0000000..5ec46d5 +#endif + +#if defined OPTIMIZE_LARGE_NETWORK -+ #define CONCENTRATOR_ENABLE 1 ++ #define CONCENTRATOR_ENABLE TRUE ++ #define CONCENTRATOR_ROUTE_CACHE TRUE + #define CONCENTRATOR_DISCOVERY_TIME 120 -+ #define MAX_RTG_SRC_ENTRIES 25 -+ #define SRC_RTG_EXPIRY_TIME 5 -+ #define CONCENTRATOR_ROUTE_CACHE 1 -+ #define MTO_RREQ_LIMIT_TIME 5000 -+ #define LINK_DOWN_TRIGGER 6 -+ #define DEF_NWK_RADIUS 10 -+ #define NWK_ROUTE_AGE_LIMIT 10 -+ #define DEFAULT_ROUTE_REQUEST_RADIUS 20 -+ #define ROUTE_DISCOVERY_TIME 8 -+ #define NWK_LINK_STATUS_PERIOD 20 -+ #define MAX_NEIGHBOR_ENTRIES 16 ++ #define MAX_RTG_SRC_ENTRIES 40 ++ #define SRC_RTG_EXPIRY_TIME 0 +#endif \ No newline at end of file diff --git a/Projects/zstack/ZNP/Source/znp.cfg b/Projects/zstack/ZNP/Source/znp.cfg