Jose/ZigUP
1
0
Fork 0
mirror of https://github.com/formtapez/ZigUP.git synced 2025-02-23 09:34:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Jose:1.0.0
Branches Tags
Jose:master
Jose:1.1.3 Jose:1.1.2 Jose:1.1.1 Jose:1.1.0 Jose:1.0.0
...
compare: Jose:1.1.2
Branches Tags
Jose:master
Jose:1.1.3 Jose:1.1.2 Jose:1.1.1 Jose:1.1.0 Jose:1.0.0

4 Commits
1.0.0 ... 1.1.2

Author SHA1 Message Date
formtapez
ec3112c493 integrated EndDevice-only configuration 2019-06-22 21:48:49 +02:00
formtapez
e9137a22bd zigbee channel 2019-05-25 16:13:35 +02:00
formtapez
af81a533f8 added BOM 2019-05-19 14:31:24 +02:00
formtapez
f0578e3864 Fixed LED-Control 2019-05-18 23:24:50 +02:00
6 changed files with 2568 additions and 776 deletions
Expand all files Collapse all files

56
README.md Normal file → Executable file
View File

@@ -1,12 +1,13 @@
# ZigUP
CC2530 based multi-purpose ZigBee Relais, Switch, Sensor and Router
![Image of ZigUP board](Pictures/top2.jpg)
![Image of ZigUP board](https://github.com/formtapez/ZigUP/raw/master/Pictures/top2.jpg)
[Bottom side](https://raw.githubusercontent.com/formtapez/ZigUP/master/Pictures/bottom.jpg)
# Features
* Small enough to fit under a normal lightswitch in an european flush-mounted box ("Unterputzdose" - That´s the UP in ZigUP)
* integrated ZigBee Router (extends the range of all your other devices)
* [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 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
@@ -19,14 +20,14 @@ CC2530 based multi-purpose ZigBee Relais, Switch, Sensor and Router
# Connection diagrams
![Power and Light connections](Pictures/connection_Light.png)
![Switch connections](Pictures/connection_Switch.png)
![S0 connections](Pictures/connection_S0.png)
![DHT22 connections](Pictures/connection_DHT22.png)
![DS18B20 connections](Pictures/connection_DS18B20.png)
![ADC connections](Pictures/connection_ADC.png)
![LED connections](Pictures/connection_LED.png)
![WS2812B connections](Pictures/connection_WS2812B.png)
![Power and Light connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_Light.png)
![Switch connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_Switch.png)
![S0 connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_S0.png)
![DHT22 connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_DHT22.png)
![DS18B20 connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_DS18B20.png)
![ADC connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_ADC.png)
![LED connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_LED.png)
![WS2812B connections](https://github.com/formtapez/ZigUP/raw/master/Pictures/connection_WS2812B.png)
# Compilation
@@ -34,9 +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 use all 2.4 GHz channels:
>-DDEFAULT_CHANLIST=0x07FFF800
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
@@ -45,8 +46,33 @@ CC2530 based multi-purpose ZigBee Relais, Switch, Sensor and Router
4. Load HEX-File and perform "Erase, program and verify" action
# Packet Sniffing using CC Debugger
As an alternative usage of this board, it can be used as a ZigBee packet-sniffer in combination with the CC Debugger.
1. Get **PACKET-SNIFFER v2.18.1 (not SNIFFER-2 v1.x!)** from https://www.ti.com/tool/PACKET-SNIFFER
2. Connect CC Debugger to the Debug-Port of ZigUP with an 1:1 cable.
3. Select protocol "IEEE 802.15.4/ZigBee" and click "Start"
4. Change radio channel and click "Start"
5. Re-flash ZigUP firmware when you are done. Because it was replaced by a sniffer-firmware.
5. Re-flash ZigUP firmware when you are done, because it was replaced by a sniffer-firmware.
# Bill of Materials (BOM)
Qty | Value | Package | Parts | URL (exemplary supplier)
:--:|:----- |:------- |:------|:------------------------
5 | 100 | R0805 | R1, R3, R5, R9, R10 | https://uk.farnell.com/multicomp/mcwr08x1000ftl/res-100r-1-0-125w-0805-thick-film/dp/2447552
1 | 1k | R0805 | R8 | https://uk.farnell.com/multicomp/mcsr08x102-jtl/res-1k-5-0-125w-0805-ceramic/dp/2074338
3 | 10k | R0805 | R2, R4, R6 | https://uk.farnell.com/multicomp/mcwr08x1002ftl/res-10k-1-0-125w-0805-thick-film/dp/2447553
1 | 27k | R0805 | R7 | https://uk.farnell.com/multicomp/mcwr08x2702ftl/res-27k-1-0-125w-thick-film/dp/2447620
2 | 100n | C0805 | C4, C5 | https://uk.farnell.com/multicomp/mcu0805r104kct/cap-0-1-f-50v-10-x7r-0805/dp/9406387
3 | 10µ | C0805 | C1, C3, C6 | https://uk.farnell.com/murata/grm21br61e106ma73l/cap-10-f-25v-20-x5r-0805/dp/2611941
1 | 220µ/6V3/EEEFK0J221P | PANASONIC_D | C2 | https://uk.farnell.com/panasonic/eeefk0j221p/cap-220-f-6-3v-radial-smd/dp/1850086
8 | 4148 | 1206 | D1 - D8 | https://uk.farnell.com/taiwan-semiconductor/ts4148-rxg/diode-small-signal-75v-0-15a-1206/dp/2708388
2 | IRFML8244 | SOT23 | T1, T2 | https://uk.farnell.com/infineon/irfml8244trpbf/mosfet-n-ch-25v-5-7a-sot23/dp/1857298
1 | IRM-02-3.3 | IRM-02 | IC1 | https://uk.farnell.com/mean-well/irm-02-3-3/power-supply-ac-dc-3-3v-0-6a/dp/2815480
1 | CC2530 | E18-MS1-PCB | IC2 | https://www.aliexpress.com/item/-/32803052003.html
1 | DSP2A-L2-DC3V | DSP2A-L2 | K1 | https://uk.farnell.com/panasonic-electric-works/dsp2a-l2-dc3v/relay-dpst-no-250vac-30vdc-5a/dp/2095635
1 | MST 2.5A 250V | MST | F1 | https://uk.farnell.com/multicomp/mst-2-5a-250v/fuse-radial-slow-blow-2-5a/dp/1566104
1 | Phoenix 1792876 | PTS-3 | X1 | https://uk.farnell.com/phoenix-contact/1792876/terminal-block-wire-to-brd-3pos/dp/2072378
2 | TE 1-2834021-4 | MSC4 | X2, X3 | https://uk.farnell.com/te-connectivity/1-2834021-4/tb-wire-to-board-4pos-26-20awg/dp/2610379
1 | DEBUG | MA05-2 | X4 | https://uk.farnell.com/amphenol-icc-fci/67997-210hlf/connector-header-10pos-2row-2/dp/2886080
1 | PCB | FR4 | all | Use [Gerber files](https://github.com/formtapez/ZigUP/tree/master/Layout/Gerber) or [contact me](mailto:ZigUP@posthub.de) if you need a bare PCB

737
src/ZigUP/CC2530DB/ZigUP.ewd
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="iso-8859-1"?>
<project>
<fileVersion>3</fileVersion>
<fileVersion>2</fileVersion>
<configuration>
<name>RouterEB</name>
<toolchain>
@@ -11,7 +12,7 @@
<name>C-SPY</name>
<archiveVersion>2</archiveVersion>
<data>
<version>9</version>
<version>8</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -154,10 +155,6 @@
<name>Exclude Getchar Breakpoint</name>
<state>0</state>
</option>
<option>
<name>DebuggerPCIsReadOnly</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@@ -244,7 +241,7 @@
</option>
<option>
<name>ChipconFlashLockInfo</name>
<state>Page size info is missing</state>
<state>&lt;page size info. missing&gt;</state>
</option>
<option>
<name>ChipconBootLock</name>
@@ -400,56 +397,6 @@
</option>
</data>
</settings>
<settings>
<name>JLINK_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>0</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>JLinkDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>JLinkSuppressDownload</name>
<state>0</state>
</option>
<option>
<name>JLinkVerifyDownload</name>
<state>0</state>
</option>
<option>
<name>JLinkConnectionType</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>JLinkSerialNumber</name>
<state></state>
</option>
<option>
<name>JLinkSpeed</name>
<state>0</state>
</option>
<option>
<name>JLinkFrequency</name>
<state></state>
</option>
<option>
<name>JLinkPowerSupply</name>
<state>0</state>
</option>
<option>
<name>JLinkUseLog</name>
<state>0</state>
</option>
<option>
<name>JLinkLogBrowse</name>
<state>$PROJ_DIR$\jlinkcomm.log</state>
</option>
</data>
</settings>
<settings>
<name>NS_ID</name>
<archiveVersion>1</archiveVersion>
@@ -471,19 +418,6 @@
</option>
</data>
</settings>
<settings>
<name>NULINK_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>0</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>NuLinkDriverMandatory</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
<name>ROM_ID</name>
<archiveVersion>1</archiveVersion>
@@ -708,9 +642,662 @@
</settings>
<debuggerPlugins>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
<file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
<loadFlag>1</loadFlag>
</plugin>
<plugin>
<file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
<loadFlag>1</loadFlag>
</plugin>
<plugin>
<file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
</debuggerPlugins>
</configuration>
<configuration>
<name>EndDeviceEB</name>
<toolchain>
<name>8051</name>
</toolchain>
<debug>1</debug>
<settings>
<name>C-SPY</name>
<archiveVersion>2</archiveVersion>
<data>
<version>8</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>CInput</name>
<state>1</state>
</option>
<option>
<name>MacOverride</name>
<state>0</state>
</option>
<option>
<name>MacFile</name>
<state></state>
</option>
<option>
<name>GoToEnable</name>
<state>1</state>
</option>
<option>
<name>GoToName</name>
<state>main</state>
</option>
<option>
<name>MemOverride</name>
<state>1</state>
</option>
<option>
<name>OCProcessor</name>
<state>1</state>
</option>
<option>
<name>d24BitData</name>
<state>1</state>
</option>
<option>
<name>Debugger code model</name>
<state>1</state>
</option>
<option>
<name>OCNrOfVirtualRegisters</name>
<state>1</state>
</option>
<option>
<name>Sim extended stack</name>
<state>1</state>
</option>
<option>
<name>Debugger DPTR Settings</name>
<state>1</state>
</option>
<option>
<name>Debugger Code Banking</name>
<state>1</state>
</option>
<option>
<name>DebuggerMandatory</name>
<state>1</state>
</option>
<option>
<name>DynDriver</name>
<state>CHIPCON_ID</state>
</option>
<option>
<name>Debugger Extra Options Check</name>
<state>0</state>
</option>
<option>
<name>Debugger Extra Options Edit</name>
<state></state>
</option>
<option>
<name>Debugger data model</name>
<state>1</state>
</option>
<option>
<name>OCImagesSuppressCheck1</name>
<state>0</state>
</option>
<option>
<name>OCImagesPath1</name>
<state></state>
</option>
<option>
<name>OCImagesSuppressCheck2</name>
<state>0</state>
</option>
<option>
<name>OCImagesPath2</name>
<state></state>
</option>
<option>
<name>OCImagesSuppressCheck3</name>
<state>0</state>
</option>
<option>
<name>OCImagesPath3</name>
<state></state>
</option>
<option>
<name>DdfFile slave</name>
<state>1</state>
</option>
<option>
<name>DdfFile master</name>
<state>$TOOLKIT_DIR$\config\devices\Texas Instruments\ioCC2530F256.ddf</state>
</option>
<option>
<name>OCImagesOffset1</name>
<state></state>
</option>
<option>
<name>OCImagesOffset2</name>
<state></state>
</option>
<option>
<name>OCImagesOffset3</name>
<state></state>
</option>
<option>
<name>OCImagesUse1</name>
<state>0</state>
</option>
<option>
<name>OCImagesUse2</name>
<state>0</state>
</option>
<option>
<name>OCImagesUse3</name>
<state>0</state>
</option>
<option>
<name>Exclude Exit Breakpoint</name>
<state>1</state>
</option>
<option>
<name>Exclude Putchar Breakpoint</name>
<state>0</state>
</option>
<option>
<name>Exclude Getchar Breakpoint</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>_3RD_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>0</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>Third-Party Driver Mandatory</name>
<state>1</state>
</option>
<option>
<name>Third-Party Driver File Name Edit</name>
<state>ThirdPartyDriver.dll</state>
</option>
<option>
<name>Third-Party Driver LogFile Check</name>
<state>0</state>
</option>
<option>
<name>Third-Party Driver LogFile Edit</name>
<state>cspycomm.log</state>
</option>
</data>
</settings>
<settings>
<name>CHIPCON_ID</name>
<archiveVersion>2</archiveVersion>
<data>
<version>4</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>ChipconDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>ChipconEraseFlash</name>
<state>1</state>
</option>
<option>
<name>ChipconRetainMemory</name>
<state>1</state>
</option>
<option>
<name>ChipconSuppressDownload</name>
<state>0</state>
</option>
<option>
<name>ChipconVerifyDownload</name>
<state>1</state>
</option>
<option>
<name>ChipconVerifyRadio</name>
<state>0</state>
</option>
<option>
<name>ChipconReduceSpeed</name>
<state>0</state>
</option>
<option>
<name>ChipconStackOverflow</name>
<state>1</state>
</option>
<option>
<name>ChipconNoBanks</name>
<version>0</version>
<state>2</state>
</option>
<option>
<name>ChipconLogFileCheck</name>
<state>0</state>
</option>
<option>
<name>ChipconLogComFile</name>
<state>communication.log</state>
</option>
<option>
<name>ChipconFlashLock</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>ChipconFlashLockInfo</name>
<state>&lt;page size info. missing&gt;</state>
</option>
<option>
<name>ChipconBootLock</name>
<state>0</state>
</option>
<option>
<name>ChipconDebugLock</name>
<state>0</state>
</option>
<option>
<name>ChipconLockFlash</name>
<state>0</state>
</option>
<option>
<name>ChipconLockLabel</name>
<state>0</state>
</option>
<option>
<name>ChipconRetainPagesCtrl</name>
<state>0</state>
</option>
<option>
<name>ChipconRetainPages</name>
<state></state>
</option>
<option>
<name>ChipconFlashPages</name>
<state></state>
</option>
<option>
<name>ChipconFlashRadio</name>
<state>0</state>
</option>
<option>
<name>USB Communication ID Selection method</name>
<state>0</state>
</option>
<option>
<name>USB Communication ID</name>
<state>0000</state>
</option>
</data>
</settings>
<settings>
<name>FS2_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>0</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>Fs2DriverMandatory</name>
<state>1</state>
</option>
<option>
<name>Configuration</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>Has program RAM</name>
<state>0</state>
</option>
<option>
<name>Program RAM areas</name>
<state>0x8000-0x87FF,0xC000-0xC7FF</state>
</option>
<option>
<name>Has program Flash</name>
<state>0</state>
</option>
<option>
<name>Program Flash cfg entry</name>
<state>nRF24LU1</state>
</option>
<option>
<name>Program Flash areas</name>
<state>0x0000-0x7FFF</state>
</option>
<option>
<name>FS2SuppressDownload</name>
<state>0</state>
</option>
<option>
<name>FS2VerifyDownload</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>INFINEON_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>2</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>InfineonDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>InfineonEraseFlash</name>
<state>0</state>
</option>
<option>
<name>InfineonSuppressDownload</name>
<state>0</state>
</option>
<option>
<name>InfineonVerifyDownload</name>
<state>0</state>
</option>
<option>
<name>InfServerAddr</name>
<state>localhost</state>
</option>
<option>
<name>InfKey1</name>
<state>0</state>
</option>
<option>
<name>InfKey2</name>
<state>0</state>
</option>
<option>
<name>InfKey3</name>
<state>0</state>
</option>
<option>
<name>InfKey4</name>
<state>0</state>
</option>
<option>
<name>InfConnection</name>
<state>0</state>
</option>
<option>
<name>InfineonSwBp</name>
<state>0</state>
</option>
<option>
<name>InfServerName2</name>
<version>0</version>
<state>3</state>
</option>
<option>
<name>InfineonHasCodeInXRAM</name>
<state>0</state>
</option>
<option>
<name>Infineon code in XRAM area</name>
<state>0xF000-0xF5FF</state>
</option>
</data>
</settings>
<settings>
<name>NS_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>0</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>NsDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>NSSuppressDownload</name>
<state>0</state>
</option>
<option>
<name>NSVerifyDownload</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ROM_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>2</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>RomDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>SuppressLoad</name>
<state>0</state>
</option>
<option>
<name>VerifyDownload</name>
<state>0</state>
</option>
<option>
<name>AllComm</name>
<state>1</state>
</option>
<option>
<name>Port</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>Baud</name>
<version>0</version>
<state>6</state>
</option>
<option>
<name>Parity</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>DataBits</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>StopBits</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>Handshake</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>DoLogfile</name>
<state>0</state>
</option>
<option>
<name>LogFile</name>
<state>cspycomm.log</state>
</option>
<option>
<name>ToggleDTR</name>
<state>0</state>
</option>
<option>
<name>ToggleRTS</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>AD2_ID</name>
<archiveVersion>2</archiveVersion>
<data>
<version>6</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>CygnalDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>CygnVerifyDownload</name>
<state>0</state>
</option>
<option>
<name>Port</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>Baud</name>
<version>0</version>
<state>6</state>
</option>
<option>
<name>CygnComm</name>
<state>1</state>
</option>
<option>
<name>ADuC8xx</name>
<state>1</state>
</option>
<option>
<name>ADuCpuClockFrequency</name>
<state>12582912</state>
</option>
<option>
<name>OverrideCpuClkFreq</name>
<state>0</state>
</option>
<option>
<name>AD2EraseDataFlash</name>
<state>1</state>
</option>
<option>
<name>Debug Interface</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>CYGNAL_ID</name>
<archiveVersion>2</archiveVersion>
<data>
<version>2</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>CygnalDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>CygnSuppressLoad</name>
<state>0</state>
</option>
<option>
<name>CygnVerifyDownload</name>
<state>0</state>
</option>
<option>
<name>CygnProtocol</name>
<state>0</state>
</option>
<option>
<name>Port</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>Baud</name>
<version>0</version>
<state>3</state>
</option>
<option>
<name>CygnComm</name>
<state>1</state>
</option>
<option>
<name>drv_silabs_page_size</name>
<state>0</state>
</option>
<option>
<name>SilabsUsb</name>
<state>0</state>
</option>
<option>
<name>SilabsPowerTarget</name>
<state>0</state>
</option>
<option>
<name>SilabsMulDevices</name>
<state>0</state>
</option>
<option>
<name>SilabsDevBefore</name>
<state>0</state>
</option>
<option>
<name>SilabsDevAfter</name>
<state>0</state>
</option>
<option>
<name>SilabsRegBefore</name>
<state>0</state>
</option>
<option>
<name>SilabsRegAfter</name>
<state>0</state>
</option>
<option>
<name>SilabsBankedXDATA</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>SIM_ID</name>
<archiveVersion>1</archiveVersion>
<data>
<version>2</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>SimDriverMandatory</name>
<state>1</state>
</option>
<option>
<name>SimEnablePSP</name>
<state>0</state>
</option>
<option>
<name>SimPspOverrideConfig</name>
<state>0</state>
</option>
<option>
<name>SimPspConfigFile</name>
<state>###Uninitialized###</state>
</option>
</data>
</settings>
<debuggerPlugins>
<plugin>
<file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
<loadFlag>1</loadFlag>
@@ -720,8 +1307,8 @@
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
<loadFlag>0</loadFlag>
<file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
<loadFlag>1</loadFlag>
</plugin>
<plugin>
<file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
@@ -730,3 +1317,5 @@
</debuggerPlugins>
</configuration>
</project>

1177
src/ZigUP/CC2530DB/ZigUP.ewp
View File

File diff suppressed because it is too large Load Diff

6
src/ZigUP/CC2530DB/ZigUP.eww
View File

@@ -11,6 +11,12 @@
<project>ZigUP</project>
<configuration>RouterEB</configuration>
</member>
<member>
<project>ZigUP</project>
<configuration>EndDeviceEB</configuration>
</member>
</batchDefinition>
</batchBuild>
</workspace>

4
src/ZigUP/Source/zcl_zigup.h
View File

@@ -46,10 +46,6 @@ extern uint8 zclZigUP_IdentifyCommissionState;
// OnOff attributes
extern uint8 zclZigUP_OnOff;
void FactoryReset(void);
void Relais(uint8 state);
void LED(uint8 state);
void zclZigUP_Reporting(uint16 REPORT_REASON);
static void zclZigUP_BasicResetCB( void );

20
src/ZigUP/Source/zcl_zigup_data.c
View File

@@ -32,8 +32,8 @@
const uint8 zclZigUP_HWRevision = ZIGUP_HWVERSION;
const uint8 zclZigUP_ZCLVersion = ZIGUP_ZCLVERSION;
const uint8 zclZigUP_ManufacturerName[] = { 9, 'f','o','r','m','t','a','p','e','z' };
const uint8 zclZigUP_ModelId[] = { 9, 'Z','i','g','B','e','e',' ','U','P' };
const uint8 zclZigUP_DateCode[] = { 16, '2','0','1','9','0','4','0','6',' ',' ',' ',' ',' ',' ',' ',' ' };
const uint8 zclZigUP_ModelId[] = { 5, 'Z','i','g','U','P' };
const uint8 zclZigUP_DateCode[] = { 16, '2','0','1','9','0','6','2','2',' ',' ',' ',' ',' ',' ',' ',' ' };
const uint8 zclZigUP_PowerSource = POWER_SOURCE_MAINS_1_PHASE;
uint8 zclZigUP_LocationDescription[17] = { 16, ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ' };
@@ -196,9 +196,20 @@ CONST zclAttrRec_t zclZigUP_Attrs[] =
(ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE),
(void *)&zclZigUP_OnOff // TODO
}
}
},
// *** Door lock Cluster Attributes (for LED) ***
{
ZCL_CLUSTER_ID_CLOSURES_DOOR_LOCK,
{ // Attribute record
ATTRID_CLOSURES_LOCK_STATE,
ZCL_DATATYPE_ENUM8,
(ACCESS_CONTROL_READ | ACCESS_REPORTABLE),
(void *)&STATE_LED
}
}
};
uint8 CONST zclZigUP_NumAttributes = ( sizeof(zclZigUP_Attrs) / sizeof(zclZigUP_Attrs[0]) );
@@ -214,7 +225,8 @@ const cId_t zclZigUP_InClusterList[] =
ZCL_CLUSTER_ID_GEN_GROUPS,
ZCL_CLUSTER_ID_GEN_SCENES,
ZCL_CLUSTER_ID_GEN_ON_OFF,
ZCL_CLUSTER_ID_LIGHTING_COLOR_CONTROL
ZCL_CLUSTER_ID_LIGHTING_COLOR_CONTROL,
ZCL_CLUSTER_ID_CLOSURES_DOOR_LOCK
};
#define ZCLZIGUP_MAX_INCLUSTERS (sizeof(zclZigUP_InClusterList) / sizeof(zclZigUP_InClusterList[0]))