From 8c369ed2e84e17613044bcfecc0459fedde81292 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Sun, 29 Aug 2021 01:22:33 +0200 Subject: [PATCH] Uplift of zutil and updated documentation --- build.gradle | 2 +- plugins/hal-zigbee/README.md | 29 ++++++++++++------- .../zigbee/ZigbeeAttributeUpdateDaemon.java | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 54ade6c3..3d2d970c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ subprojects { apply plugin: 'java-library' dependencies { - implementation 'se.koc:zutil:1.0.300' + implementation 'se.koc:zutil:1.0.302' //implementation 'se.koc:zutil:1.0.0-SNAPSHOT' testImplementation 'junit:junit:4.12' diff --git a/plugins/hal-zigbee/README.md b/plugins/hal-zigbee/README.md index 5b97a6b0..cd1ec522 100644 --- a/plugins/hal-zigbee/README.md +++ b/plugins/hal-zigbee/README.md @@ -2,8 +2,13 @@ |Config Parameter |Value |Description | |-----------------|-----------------------------|------------| -|zwave.com_port |Name or location of com port |The port where radio dongle is connected| -|zigbee.pan_id |Integer |The PAN ID for the radio module| +|hal_zigbee.com_port |Name or location of com port |The port where radio dongle is connected| +|hal_zigbee.dongle= |CC2531 or CONBEE or XBEE |Configure the dongle type| +|hal_zigbee.network.channel |Integer || +|hal_zigbee.network.panid |Integer || +|hal_zigbee.network.epanid |HEX || +|hal_zigbee.network.nwkey |HEX || +|hal_zigbee.network.linkkey |HEX || # Hardware @@ -17,20 +22,25 @@ You need to buy the following items: https://www.aliexpress.com/item/4001095299084.html ## Flashing Dongle -Instructions are originally from: https://www.zigbee2mqtt.io/information/flashing_the_cc2531.html +These instructions are a modified version of from: https://www.zigbee2mqtt.io/information/flashing_the_cc2531.html + +### Firmware +You first need to download the firmware that should be flashed to the stick. There are multiple sources where firmware can be downloaded at: +* Download firmware from GitHub [CC2531_DEFAULT_xxxxxxx.zip](https://github.com/Koenkk/Z-Stack-firmware/raw/master/coordinator/Z-Stack_Home_1.2/bin/default/CC2531_DEFAULT_20201127.zip) (If link is dead try latest version [here](https://github.com/Koenkk/Z-Stack-firmware/tree/master/coordinator/Z-Stack_Home_1.2/bin/default)). + More information about available firmware can be found [here](https://github.com/Koenkk/Z-Stack-firmware/tree/master/coordinator). +* Download official Z-STACK software (We do not actually need the software just the firmware binary that is included in the installation) from https://www.ti.com/tool/Z-STACK (You will need to create an account to download) ### Windows 1. Download and install the "SmartRF Flash Programmer" **(Not v2)** application from https://www.ti.com/tool/FLASH-PROGRAMMER -2. Download Z-STACK software (We do not actually need the software just the firmware binary that is included in the installation) from https://www.ti.com/tool/Z-STACK (You will need to create an account to download) -3. Connect CC debugger to the CC2531 USB sniffer. -4. Connect **BOTH** the CC2531 USB sniffer and the CC debugger to your PC using USB. +2. Connect CC debugger to the CC2531 USB sniffer. +3. Connect **BOTH** the CC2531 USB sniffer and the CC debugger to your PC using USB. * If the light on the CC debugger is RED press set reset button on the CC debugger. The light on the CC debugger should now turn GREEN. If not use [CC debugger user guide](http://www.ti.com/lit/ug/swru197h/swru197h.pdf) to troubleshoot your problem. -6. Start SmartRF Flash Programmer, with the properties below: +4. Start SmartRF Flash Programmer, with the properties below: * Flash image: Locate the binary at \Projects\zstack\ZNP\CC253x\dev\ (Make sure to select the .hex file and not the .bin file). * Uncheck "Retain IEEE address when reprogramming the chip". -7. Press "Perform Action" to start flashing. +5. Press "Perform Action" to start flashing. ### Linux or MacOS @@ -51,8 +61,7 @@ Instructions are originally from: https://www.zigbee2mqtt.io/information/flashin 3. Connect **BOTH** the CC2531 USB sniffer and the CC debugger to your PC using USB. * If the light on the CC debugger is RED press set reset button on the CC debugger. The light on the CC debugger should now turn GREEN. If not use [CC debugger user guide](http://www.ti.com/lit/ug/swru197h/swru197h.pdf) to troubleshoot your problem. -4. Download the firmware [CC2531_DEFAULT_xxxxxxx.zip](https://github.com/Koenkk/Z-Stack-firmware/raw/master/coordinator/Z-Stack_Home_1.2/bin/default/CC2531_DEFAULT_20201127.zip) (If link is dead try latest version [here](https://github.com/Koenkk/Z-Stack-firmware/tree/master/coordinator/Z-Stack_Home_1.2/bin/default)) -5. Flash your firmware: +4. Flash your firmware: sudo ./cc-tool -e -w CC2531ZNP-Prod.hex diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeAttributeUpdateDaemon.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeAttributeUpdateDaemon.java index 38b16c58..c19f2579 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeAttributeUpdateDaemon.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeAttributeUpdateDaemon.java @@ -45,7 +45,7 @@ public class ZigbeeAttributeUpdateDaemon implements HalDaemon, Runnable { @Override public void initiate(ScheduledExecutorService executor) { - executor.scheduleAtFixedRate(this, 0, 10, TimeUnit.MINUTES); + executor.scheduleAtFixedRate(this, 10, 10, TimeUnit.MINUTES); } @Override