diff --git a/LICENSE b/LICENSE index 971caa5..2052862 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Koen Kanters +Copyright (c) 2018-2021 Koen Kanters Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 53c35d6..e92f115 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,2 @@ # Z-Stack-firmware -This reposistory contains: -- Compiled Z-Stack firmwares (`.hex` files) - - If you want to use these to flash to your CC253X (using the [Flash Programmer (not v2)](http://www.ti.com/tool/FLASH-PROGRAMMER) for example). - - If you want to use these to flash to your CC2652R (using the [Flash Programmer v2](http://www.ti.com/tool/FLASH-PROGRAMMER) for example). -- Instructions on how to compile them +This repository contains compilation instructions and compiled Z-Stack firmwares for the Texas Instruments CC2530, CC2531, CC2538, CC1352P, CC2652R and CC2652RB. diff --git a/coordinator/README.md b/coordinator/README.md index 7c30f41..925722c 100644 --- a/coordinator/README.md +++ b/coordinator/README.md @@ -1,5 +1,5 @@ # Z-Stack coordinator firmwares -This repository contains various Z-Stack coordinator firmwares. +This directory contains various Z-Stack coordinator firmwares. ## Overiew @@ -70,7 +70,7 @@ This repository contains various Z-Stack coordinator firmwares. - + @@ -82,11 +82,11 @@ This repository contains various Z-Stack coordinator firmwares.
Z-Stack_3.x.0CC26X2R1, CC1352P_2CC2652R, CC2652RB, CC1352P-2 3.0 50 100/200
-### I'm a Zigbee2MQTT user, which one should I use? +### I'm using a CC2530 or CC2531, which firmware should I use? This depends: -- Zigbee 3.0 coordinators are only recommended for CC26X2R1 and CC1352P_2 (other devices might not be powerful enough) -- If you have a network of 1 - 30 devices, the Z-Stack_Home_1.2 **default** firmware is recommended. -- If you have a network of 30+ devices, the Z-Stack_Home_1.2 **source routing** firmware is recommended. +- Zigbee 3.0 firmwares are **not** recommended for the CC2530 and CC2531 (since those are not powerful enough) +- If you have a network of 1 - 15 devices, the Z-Stack_Home_1.2 **default** firmware is recommended. +- If you have a network of 15+ devices, the Z-Stack_Home_1.2 **source routing** firmware is recommended. - Note that the **source routing** firmware only supports 5 direct children, therefore you need to have routers in range of the coordinator. ### Legend diff --git a/coordinator/Z-Stack_3.x.0/CHANGELOG.md b/coordinator/Z-Stack_3.x.0/CHANGELOG.md index c04eedf..96f2dbe 100644 --- a/coordinator/Z-Stack_3.x.0/CHANGELOG.md +++ b/coordinator/Z-Stack_3.x.0/CHANGELOG.md @@ -1,6 +1,6 @@ # 20210120 - 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 +- Change default CC2652R/CC2652RB/CC1352P-2/CC2652P transmit power from 0dBm to 5dBm - Potential fix for Hue end devices disconnecting - SimpleLink SDK 4.40.00.44 ([changelog](http://software-dl.ti.com/simplelink/esd/simplelink_cc13x2_26x2_sdk/4.40.00.44/exports/changelog.html)) diff --git a/coordinator/Z-Stack_3.x.0/COMPILE.md b/coordinator/Z-Stack_3.x.0/COMPILE.md index e116af7..ff6b4b7 100644 --- a/coordinator/Z-Stack_3.x.0/COMPILE.md +++ b/coordinator/Z-Stack_3.x.0/COMPILE.md @@ -18,3 +18,7 @@ 1. Build the 3 projects; right click -> *Build project*. - **Important:** by default the **launchpad** variant of the CC1352P2_CC2652P (= `znp_CC1352P_2_LAUNCHXL_tirtos_ccs`) is build. To build the **other** variant comment `#define LAUNCHPAD_CONFIG 1` in `preinclude.h` (located under `Stack/Config/`), don't forget to save. 1. Once finished, the firmware can be found under `znp_[CC26X2R1/CC1352P_2/CC2652RB]_LAUNCHXL_tirtos_ccs/default/znp_[CC26X2R1/CC2652RB/CC1352P_2]_LAUNCHXL_tirtos_ccs.hex` + - `znp_CC26X2R1_LAUNCHXL_tirtos_ccs.hex` -> CC2652R + - `znp_CC2652RB_LAUNCHXL_tirtos_ccs.hex` -> CC2652RB + - `znp_CC1352P_2_LAUNCHXL_tirtos_ccs.hex` -> CC1352P-2 and CC2652P + diff --git a/coordinator/Z-Stack_3.x.0/bin/CC26X2R1_20210120.zip b/coordinator/Z-Stack_3.x.0/bin/CC2652R_20210120.zip similarity index 99% rename from coordinator/Z-Stack_3.x.0/bin/CC26X2R1_20210120.zip rename to coordinator/Z-Stack_3.x.0/bin/CC2652R_20210120.zip index 57d8dc8..1a4d71d 100644 Binary files a/coordinator/Z-Stack_3.x.0/bin/CC26X2R1_20210120.zip and b/coordinator/Z-Stack_3.x.0/bin/CC2652R_20210120.zip differ diff --git a/coordinator/Z-Stack_3.x.0/bin/README.md b/coordinator/Z-Stack_3.x.0/bin/README.md index 0b58eb3..a5b4cce 100644 --- a/coordinator/Z-Stack_3.x.0/bin/README.md +++ b/coordinator/Z-Stack_3.x.0/bin/README.md @@ -1,5 +1,7 @@ # Tested adapters +**WARNING:** Make sure you flash the correct firmware! Flashing the **wrong** firmware might lock your bootloader preventing future flashing. If you are a Zigbee2MQTT user and don't know what to pick click the **Coordinator firmware** link of your adapter on: https://www.zigbee2mqtt.io/information/supported_adapters.html. + @@ -16,7 +18,7 @@ - + @@ -34,7 +36,7 @@ - + diff --git a/router/CC2530/README.md b/router/CC2530/README.md deleted file mode 100644 index ff25f21..0000000 --- a/router/CC2530/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# CC2530 router firmware -Currently no compilation instructions are available for this firmware. - -Credits for this firmware go to [ptvoinfo](https://github.com/ptvoinfo) \ No newline at end of file diff --git a/router/CC2530_CC2591/README.md b/router/CC2530_CC2591/README.md deleted file mode 100644 index 102a5de..0000000 --- a/router/CC2530_CC2591/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# CC2530_CC2591 router firmware -Currently no compilation instructions are available for this firmware. - -Credits for this firmware go to [ptvoinfo](https://github.com/ptvoinfo) \ No newline at end of file diff --git a/router/CC2530_CC2592/README.md b/router/CC2530_CC2592/README.md deleted file mode 100644 index 03f8a39..0000000 --- a/router/CC2530_CC2592/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# CC2530_CC2592 router firmware -Currently no compilation instructions are available for this firmware. - -Credits for this firmware go to [ptvoinfo](https://github.com/ptvoinfo) \ No newline at end of file diff --git a/router/CC2531/README.md b/router/CC2531/README.md deleted file mode 100644 index 10a1a81..0000000 --- a/router/CC2531/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# CC2531 router firmware -Currently no compilation instructions are available for this firmware. - -Credits for this firmware go to [ptvoinfo](https://github.com/ptvoinfo) \ No newline at end of file diff --git a/router/README.md b/router/Z-Stack_Home_1.2/README.md similarity index 62% rename from router/README.md rename to router/Z-Stack_Home_1.2/README.md index 07f6324..b23935b 100644 --- a/router/README.md +++ b/router/Z-Stack_Home_1.2/README.md @@ -1,19 +1,22 @@ -# Buttons +# Z-Stack_Home 1.2 router firmware +Firmwares have been taken from: https://ptvo.info/ , no sources and compilation instructions are available. Credits go to [ptvoinfo](https://github.com/ptvoinfo). -* S1 button: only changes the state of the green LED. +## Buttons + +* S1 button: only changes the state of the green LED. * S2 button: repairs CC2531 (see below) -# Lights +## Lights * Short fast blinks (one per second) – the router is connecting to a network. * Short long blinks (one per 4 seconds) – normal operations. * Three short blinks – the router cannot send a report to a coordinator. -# Pairing +## Pairing Flash firmware and permit joining to a network on your coordinator. -# Re-pairing +## Re-pairing * CC2530, CC2531: Power on, wait 2 seconds, power off, repeat this cycle three times. * CC2531: Power on, press and hold down the S2 button for 5 seconds. diff --git a/router/CC2530_CC2591/bin/CC2530_CC2591_router_2020_09_29.zip b/router/Z-Stack_Home_1.2/bin/CC2530_CC2591_router_2020_09_29.zip similarity index 100% rename from router/CC2530_CC2591/bin/CC2530_CC2591_router_2020_09_29.zip rename to router/Z-Stack_Home_1.2/bin/CC2530_CC2591_router_2020_09_29.zip diff --git a/router/CC2530_CC2592/bin/CC2530_CC2592_router_2020_09_29.zip b/router/Z-Stack_Home_1.2/bin/CC2530_CC2592_router_2020_09_29.zip similarity index 100% rename from router/CC2530_CC2592/bin/CC2530_CC2592_router_2020_09_29.zip rename to router/Z-Stack_Home_1.2/bin/CC2530_CC2592_router_2020_09_29.zip diff --git a/router/CC2530/bin/CC2530_router_2020_09_29.zip b/router/Z-Stack_Home_1.2/bin/CC2530_router_2020_09_29.zip similarity index 100% rename from router/CC2530/bin/CC2530_router_2020_09_29.zip rename to router/Z-Stack_Home_1.2/bin/CC2530_router_2020_09_29.zip diff --git a/router/CC2531/bin/CC2531_router_2020_09_29.zip b/router/Z-Stack_Home_1.2/bin/CC2531_router_2020_09_29.zip similarity index 100% rename from router/CC2531/bin/CC2531_router_2020_09_29.zip rename to router/Z-Stack_Home_1.2/bin/CC2531_router_2020_09_29.zip
TI LAUNCHXL-CC26xR1 CC2652RCC26X2R1_*.zip
CC2652R_*.zip
 DIO_13 No N/A
Electrolama zzh CC2652RCC26X2R1_*.zipCC2652R_*.zip DIO_13 No N/A