From ec3112c4933cfd9b377bc32b3dd97cde0bd6086c Mon Sep 17 00:00:00 2001 From: formtapez Date: Sat, 22 Jun 2019 21:48:49 +0200 Subject: [PATCH] integrated EndDevice-only configuration --- README.md | 7 +- src/ZigUP/CC2530DB/ZigUP.ewd | 2047 +++++++++++++++++++---------- src/ZigUP/CC2530DB/ZigUP.ewp | 1177 ++++++++++++++++- src/ZigUP/CC2530DB/ZigUP.eww | 6 + src/ZigUP/Source/zcl_zigup_data.c | 2 +- 5 files changed, 2499 insertions(+), 740 deletions(-) diff --git a/README.md b/README.md index e8c5bc4..d799d55 100755 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ CC2530 based multi-purpose ZigBee Relais, Switch, Sensor and Router # Features * [Small enough to fit under a normal lightswitch](https://raw.githubusercontent.com/formtapez/ZigUP/master/Pictures/size.jpg) in an european flush-mounted box ("Unterputzdose" - That´s the UP in ZigUP) -* integrated ZigBee Router (extends the range of all your other devices) +* integrated optional ZigBee Router functionality (extends the range of all your other devices) * Powerful bistable relais for up to 10 amps load * 2 Inputs for switches/buttons: * Input "KEY" directly toggles the relais and outputs a ZigBee message @@ -35,8 +35,9 @@ CC2530 based multi-purpose ZigBee Relais, Switch, Sensor and Router 2. Get **IAR Embedded Workbench for 8051** from https://www.iar.com/iar-embedded-workbench (you can use the free trial version for one month) 3. Clone ZigUP source to **\Projects\zstack\HomeAutomation\ZigUP\\** 4. Start **\ZigUP\CC2530DB\ZigUP.eww** to load project in IAR -5. Edit **\Projects\zstack\Tools\CC2530DB\f8wConfig.cfg** to select the ZigBee channel your coordinator is using. -6. Compile +5. Choose between **Router** and **EndDevice** configuration +6. Edit **\Projects\zstack\Tools\CC2530DB\f8wConfig.cfg** to select the ZigBee channel your coordinator is using. +7. Compile # Flashing with CC Debugger 1. Get **SmartRF Flash Programmer v1.12.8 (not v2.x!)** from https://www.ti.com/tool/flash-programmer diff --git a/src/ZigUP/CC2530DB/ZigUP.ewd b/src/ZigUP/CC2530DB/ZigUP.ewd index 6a3e0f6..dbc370b 100755 --- a/src/ZigUP/CC2530DB/ZigUP.ewd +++ b/src/ZigUP/CC2530DB/ZigUP.ewd @@ -1,732 +1,1321 @@ - + + - 3 - - RouterEB - - 8051 - + 2 + + RouterEB + + 8051 + + 1 + + C-SPY + 2 + + 8 + 1 1 - - C-SPY - 2 - - 9 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - _3RD_ID - 1 - - 0 - 1 - 1 - - - - - - - - CHIPCON_ID - 2 - - 4 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - FS2_ID - 1 - - 0 - 1 - 1 - - - - - - - - - - - - - INFINEON_ID - 1 - - 2 - 1 - 1 - - - - - - - - - - - - - - - - - - JLINK_ID - 1 - - 0 - 1 - 1 - - - - - - - - - - - - - - NS_ID - 1 - - 0 - 1 - 1 - - - - - - - NULINK_ID - 1 - - 0 - 1 - 1 - - - - - ROM_ID - 1 - - 2 - 1 - 1 - - - - - - - - - - - - - - - - - - AD2_ID - 2 - - 6 - 1 - 1 - - - - - - - - - - - - - - CYGNAL_ID - 2 - - 2 - 1 - 1 - - - - - - - - - - - - - - - - - - - - SIM_ID - 1 - - 2 - 1 - 1 - - - - - - - - - $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin - 0 - - - $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin - 1 - - - $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin - 0 - - - $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin - 0 - - - $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin - 0 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _3RD_ID + 1 + + 0 + 1 + 1 + + + + + + + + CHIPCON_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + FS2_ID + 1 + + 0 + 1 + 1 + + + + + + + + + + + + + INFINEON_ID + 1 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + NS_ID + 1 + + 0 + 1 + 1 + + + + + + + ROM_ID + 1 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + AD2_ID + 2 + + 6 + 1 + 1 + + + + + + + + + + + + + + CYGNAL_ID + 2 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + + + SIM_ID + 1 + + 2 + 1 + 1 + + + + + + + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + + EndDeviceEB + + 8051 + + 1 + + C-SPY + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _3RD_ID + 1 + + 0 + 1 + 1 + + + + + + + + CHIPCON_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + FS2_ID + 1 + + 0 + 1 + 1 + + + + + + + + + + + + + INFINEON_ID + 1 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + NS_ID + 1 + + 0 + 1 + 1 + + + + + + + ROM_ID + 1 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + AD2_ID + 2 + + 6 + 1 + 1 + + + + + + + + + + + + + + CYGNAL_ID + 2 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + + + SIM_ID + 1 + + 2 + 1 + 1 + + + + + + + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + + diff --git a/src/ZigUP/CC2530DB/ZigUP.ewp b/src/ZigUP/CC2530DB/ZigUP.ewp index 6d87317..2ea2ecf 100755 --- a/src/ZigUP/CC2530DB/ZigUP.ewp +++ b/src/ZigUP/CC2530DB/ZigUP.ewp @@ -799,7 +799,7 @@