Upstream/Z-Stack-firmware
1
0
Fork 0
mirror of https://github.com/Koenkk/Z-Stack-firmware.git synced 2024-11-29 13:25:21 +01:00
Code Issues Projects Releases Wiki Activity

Improve broadcast message handling. https://github.com/Koenkk/zigbee2mqtt/issues/1094

Browse Source
This commit is contained in:
Koen Kanters 2019-02-15 20:18:40 +01:00
parent 917b525d04
commit 2768d9e0b5
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
coordinator/CC2531/bin/CC2531ZNP-Prod_20190215.zip
View File

Binary file not shown.

1
coordinator/CHANGELOG.md
View File

@ -1,2 +1,3 @@
# 20190215
- Re-flash firmware without having to repair devices.
- Fixed error 17 when executing many group commands at once.

21
coordinator/firmware.patch
View File

@ -96,10 +96,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..326889b
index 0000000..a22da72
--- /dev/null
+++ b/Projects/zstack/ZNP/CC253x/Source/preinclude.h
@@ -0,0 +1,69 @@
@@ -0,0 +1,84 @@
+// Shared accross all firmwares
+#define ASSERT_RESET
+
@ -117,6 +117,22 @@ index 0000000..326889b
+// If MULTICAST is not disabled, the group adress is not included in the APS header
+#define MULTICAST_ENABLED FALSE
+
+
+/**
+ * Reduce BCAST_DELIVERY_TIME and increase MAX_BCAST time.
+ * BCAST_DELIVERY_TIME is the length of time a broadcast message is kept in the broadcast table
+ * MAX_BCAST is the max number of messages that are in the broadcast table
+ * If e.g. BCAST_DELIVERY_TIME = 1 second and MAX_BCAST = 10; 10 broadcast messages per second can be send.
+ *
+ * Zigbee2mqtt has a fixed delay of 170ms between each command.
+ * Therefore a BCAST_DELIVERY_TIME = 20 (= 2 seconds) and MAX_BCAST = 12 allows us to send
+ * 2 / 12 = 1 group command per 166ms, which is just below the zigbee2mqtt delay.
+ * Therefore the broadcast table will never get full.
+ */
+#define BCAST_DELIVERY_TIME 20
+#undef MAX_BCAST // avoids incompatible redefinition of macro warning
+#define MAX_BCAST 12
+
+#if defined FIRMWARE_CC2531_DEFAULT
+ #define CC2531ZNP
+ #define NWK_MAX_DEVICE_LIST 15
@ -161,7 +177,6 @@ index 0000000..326889b
+ #define CONCENTRATOR_ROUTE_CACHE 1
+ #define MTO_RREQ_LIMIT_TIME 5000
+ #define LINK_DOWN_TRIGGER 6
+ #define BCAST_DELIVERY_TIME 100
+ #define DEF_NWK_RADIUS 10
+ #define NWK_ROUTE_AGE_LIMIT 10
+ #define DEFAULT_ROUTE_REQUEST_RADIUS 20