Skip to content

Commit

Permalink
Restructure
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed Jan 26, 2021
1 parent 9f296cd commit 49ade7c
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 36 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
12 changes: 6 additions & 6 deletions coordinator/README.md
Original file line number Diff line number Diff line change
@@ -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
<table>
Expand Down Expand Up @@ -70,7 +70,7 @@ This repository contains various Z-Stack coordinator firmwares.
</tr>
<tr>
<td rowspan="2">Z-Stack_3.x.0</td>
<td>CC26X2R1, CC1352P_2</td>
<td>CC2652R, CC2652RB, CC1352P-2</td>
<td>3.0</td>
<td>50</td>
<td>100/200</td>
Expand All @@ -82,11 +82,11 @@ This repository contains various Z-Stack coordinator firmwares.
</tr>
</table>

### 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
Expand Down
2 changes: 1 addition & 1 deletion coordinator/Z-Stack_3.x.0/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))

Expand Down
4 changes: 4 additions & 0 deletions coordinator/Z-Stack_3.x.0/COMPILE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Binary file not shown.
6 changes: 4 additions & 2 deletions coordinator/Z-Stack_3.x.0/bin/README.md
Original file line number Diff line number Diff line change
@@ -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.

<table>
<thead>
<tr>
Expand All @@ -16,7 +18,7 @@
<tr>
<td>TI LAUNCHXL-CC26xR1</td>
<td>CC2652R</td>
<td>CC26X2R1_*.zip<br></td>
<td>CC2652R_*.zip<br></td>
<td>DIO_13</td>
<td>No</td>
<td>N/A</td>
Expand All @@ -34,7 +36,7 @@
<tr>
<td>Electrolama zzh</td>
<td>CC2652R</td>
<td>CC26X2R1_*.zip</td>
<td>CC2652R_*.zip</td>
<td>DIO_13</td>
<td>No</td>
<td>N/A</td>
Expand Down
4 changes: 0 additions & 4 deletions router/CC2530/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions router/CC2530_CC2591/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions router/CC2530_CC2592/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions router/CC2531/README.md

This file was deleted.

13 changes: 8 additions & 5 deletions router/README.md → router/Z-Stack_Home_1.2/README.md
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 49ade7c

Please sign in to comment.