mirror of
https://github.com/Utyff/Zintercom.git
synced 2026-01-13 01:37:43 +03:00
Compare commits
48 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
5b2db2f803 | ||
|
|
07114547b4 | ||
|
|
abc32f88fa | ||
|
|
eb86a39868 | ||
|
|
8995c3bd33 | ||
|
|
c4e44672ad | ||
|
256055d1fb | ||
|
|
afdc4348c4 | ||
|
|
2707f5c987 | ||
|
|
1fd4c7b2fa | ||
|
|
b786d8bfdd | ||
|
|
4fbab14965 | ||
|
|
17ee0a7588 | ||
|
|
6fe29470ec | ||
|
|
07f7ac2147 | ||
|
|
b2ac615230 | ||
|
|
d5e35b9e49 | ||
|
|
921e8c1309 | ||
|
|
23e04d3571 | ||
|
|
e98969e3c5 | ||
|
|
a3ec8d06b0 | ||
|
|
66869f7d0c | ||
|
|
db6995dc7b | ||
|
7994aead0c | ||
|
|
5de49cbeae | ||
|
|
6255791281 | ||
|
|
a872b42ff1 | ||
|
|
b2d9a718a4 | ||
|
|
21106958c5 | ||
|
|
e58b8a0f97 | ||
|
|
0439847dd5 | ||
|
|
a34f4319d9 | ||
|
|
c9ff7819b2 | ||
|
|
e63e1cbd92 | ||
|
|
06b4283fd7 | ||
|
|
fda52cd269 | ||
|
|
c833dc48ab | ||
|
|
bc3f698efc | ||
|
|
29ff218b19 | ||
|
|
44087fceb9 | ||
|
|
a4fe271d30 | ||
|
|
deafb7667e | ||
|
|
29c71487ea | ||
|
5e02f3c97a | ||
|
|
2b89cbc188 | ||
|
|
23626a37d1 | ||
|
|
468d299e9e | ||
|
|
afc1124b64 |
14
.github/FUNDING.yml
vendored
Normal file
14
.github/FUNDING.yml
vendored
Normal file
@@ -0,0 +1,14 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
github: xyzroe
|
||||
patreon: # Replace with a single Patreon username
|
||||
open_collective: # Replace with a single Open Collective username
|
||||
ko_fi: # Replace with a single Ko-fi username
|
||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
liberapay: # Replace with a single Liberapay username
|
||||
issuehunt: # Replace with a single IssueHunt username
|
||||
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||
polar: # Replace with a single Polar username
|
||||
buy_me_a_coffee: xyzroe
|
||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||
@@ -142,11 +142,11 @@
|
||||
<option>
|
||||
<name>Input variant</name>
|
||||
<version>2</version>
|
||||
<state>0</state>
|
||||
<state>5</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>Input description</name>
|
||||
<state>Automatic choice of formatter.</state>
|
||||
<state>No float.</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>Output variant</name>
|
||||
@@ -1284,11 +1284,11 @@
|
||||
<option>
|
||||
<name>Input variant</name>
|
||||
<version>2</version>
|
||||
<state>0</state>
|
||||
<state>5</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>Input description</name>
|
||||
<state>Automatic choice of formatter.</state>
|
||||
<state>No float.</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>Output variant</name>
|
||||
@@ -1604,7 +1604,7 @@
|
||||
<option>
|
||||
<name>Compiler Extra Options Edit</name>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
|
||||
</option>
|
||||
<option>
|
||||
@@ -3704,7 +3704,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OGChipConfigPath</name>
|
||||
<state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC2530F256.i51</state>
|
||||
<state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC25xx\3x\CC2530F256.i51</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
@@ -3887,7 +3887,7 @@
|
||||
<option>
|
||||
<name>Compiler Extra Options Edit</name>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
|
||||
</option>
|
||||
<option>
|
||||
@@ -5989,7 +5989,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OGChipConfigPath</name>
|
||||
<state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC2530F256.i51</state>
|
||||
<state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC25xx\3x\CC2530F256.i51</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
@@ -6174,7 +6174,7 @@
|
||||
<option>
|
||||
<name>Compiler Extra Options Edit</name>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
|
||||
</option>
|
||||
<option>
|
||||
@@ -8276,7 +8276,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OGChipConfigPath</name>
|
||||
<state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC2530F256.i51</state>
|
||||
<state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC25xx\3x\CC2530F256.i51</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
@@ -8461,7 +8461,7 @@
|
||||
<option>
|
||||
<name>Compiler Extra Options Edit</name>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
|
||||
<state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
|
||||
</option>
|
||||
<option>
|
||||
@@ -9687,7 +9687,7 @@
|
||||
<name>$PROJ_DIR$\..\..\..\Tools\CC2530DB\f8w2530.xcl</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</name>
|
||||
<name>$PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wCoord.cfg</name>
|
||||
|
||||
36
README-RGB.md
Normal file
36
README-RGB.md
Normal file
@@ -0,0 +1,36 @@
|
||||
# Zintercom
|
||||
|
||||
## Firmware options
|
||||
Each firmware version has 6 variants.
|
||||
For different zigbee modules and power supply.
|
||||
|
||||
- EndDevice - for battery power
|
||||
- Router - for external power
|
||||
|
||||
|
||||
- PA1 - for E18-MS1PA1 module
|
||||
- PA2 - for E18-MS1PA2 module
|
||||
- no suffix - for E18-MS1 module
|
||||
|
||||
## Using battery as power supply
|
||||
The firmware for the battery has the following differences.
|
||||
- The device is mostly asleep.
|
||||
- Wakes up once every 30 minutes (parameter - time_report) and sends a report.
|
||||
- Zigbee commands are only executed when the device wakes up.
|
||||
- RGB lights up for 2 seconds after changing the mode with the button.
|
||||
- When the "no sound" mode is turned on, the constant consumption is 3 mA. In this mode AAA batteries will last 1-2 months.
|
||||
|
||||
## RGB Software
|
||||
Release 2.0.0 support new RGB hardware and legacy hardware with one Led.
|
||||
|
||||
## RGB Hardware
|
||||
Schematics and PCB - https://oshwlab.com/Utyf/zcom
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
### Files to reproduce
|
||||
* [Gerbers](https://github.com/diyruz/Zintercom/tree/master/hardware)
|
||||
* [Firmware](https://github.com/diyruz/Zintercom/releases)
|
||||
120
README.md
120
README.md
@@ -1,45 +1,137 @@
|
||||
# Zintercom
|
||||
## Zigbee Intercom Automator
|
||||
[](https://github.com/xyzroe/Zintercom/releases)
|
||||
[](https://github.com/xyzroe/Zintercom/latest)
|
||||
[](LICENSE.txt)
|
||||
|
||||
## How to compile
|
||||
Follow this article https://zigdevwiki.github.io/Begin/IAR_install/
|
||||
|
||||
##### Zigbee Intercom Automator
|
||||
This device is designed to control the matrix intercom using Zigbee.
|
||||
|
||||
Using zigbee2mqtt you can:
|
||||
1. Receive a notification when the intercom rings. (also support **direct bind**)
|
||||
2. Mute the sound on the intercom handset.
|
||||
3. Automatically or manually open the door or hang up when the intercom rings.
|
||||
|
||||
There are 4 work modes:
|
||||
1. `Never` - ordinary work mode, use a handset to control
|
||||
2. `Once` - one-time open door when intercom rings
|
||||
3. `Always` - open door when intercom rings
|
||||
4. `Drop` - hangs up all intercom rings, right after the start
|
||||
|
||||
You can change the operating mode using z2m or by short press the button. (< 1000ms)
|
||||
After pressing the button, the LED will flash at 4 Hz.
|
||||
The number of flashes indicates the current operating mode.
|
||||
|
||||
You can control sound mode using z2m or by long-press the button. (1000ms < X < 5000ms)
|
||||
After pressing the button, the LED will flash at 1.5 Hz.
|
||||
One flash - OFF, two flashes - ON.
|
||||
|
||||
## Hardware v2.0
|
||||
New version of the board with RGB led support.
|
||||
All known bugs and shortcomings have been fixed.
|
||||
Thanks [@Utyff](https://github.com/Utyff)
|
||||
### [More info](https://github.com/diyruz/Zintercom/blob/master/README-RGB.md)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## Important info
|
||||
#### 1
|
||||
In Gerber PCB v1.0 committed on Apr 14, there are some errors in the silkscreen layers:
|
||||
1. 'Line-' and 'Phone-' are reversed.
|
||||
2. '+' and '-' are also reversed.
|
||||
|
||||
Just plug by swapping.
|
||||
|
||||
#### 2
|
||||
The problem of cross-calls to other apartments:
|
||||
it was revealed that the intercom circuit is closed through the reverse diode of the u2 transistor (thanks to @Alex_AW)
|
||||
to prevent it, you need to add a diode according to the diagram:
|
||||
|
||||
|
||||
#### 3
|
||||
If you want to use the battery version without a handset, do not turn off the sound in z2m, but use an external resistor to emulate the intercom handset, according to the diagram:
|
||||
|
||||
|
||||
|
||||
### How to join
|
||||
Reset to FN by reboot device 5 times with interval less than 10 seconds.
|
||||
Reset to FN by press and hold BTN for 5 seconds.
|
||||
Reset to FN by reboot the device 5 times with intervals of less than 10 seconds.
|
||||
Reset to FN by pressing and holding BTN for 5 seconds.
|
||||
|
||||
LED will flash during reset.
|
||||
|
||||
|
||||
|
||||
|
||||
### How to add device into zigbe2mqtt
|
||||
Use [external converters](https://www.zigbee2mqtt.io/information/configuration.html#external-converters-configuration) feature
|
||||
|
||||
Converter file located [here](./converters/DIY_Zintercom.js)
|
||||
Converter file located [here](https://github.com/diyruz/Zintercom/blob/master/converters/DIYRuZ_Zintercom.js)
|
||||
|
||||
<img src="./images/z2m_dashboard.png" width="45%">
|
||||
|
||||
<img src="./images/z2m_exposes.png" width="90%">
|
||||
|
||||
|
||||
### Schematic
|
||||
|
||||
<img src="./hardware/Schematic_Zintercom.png" width="90%">
|
||||
|
||||
|
||||
|
||||
### PCB size
|
||||
|
||||
`57.5mm x 27.3mm`
|
||||
<img src="./images/dimensions.png" width="60%">
|
||||
|
||||
|
||||
|
||||
### DC Power
|
||||
|
||||
5-10 V
|
||||
|
||||
Support `router` and `end device` modes.
|
||||
Install `E18-MS1PA1`, `E18-MS1PA2` or `E18-MS1-PCB`.
|
||||
<img src="./images/front_side.png" width="70%">
|
||||
<img src="./images/back_DC_5-9V.png" width="35%">
|
||||
<img src="./images/back_microUSB.png" width="35%">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
### Battery Power
|
||||
|
||||
2 * AAA batteries
|
||||
|
||||
Support only `end device` mode.
|
||||
Install `E18-MS1-PCB` only!
|
||||
<img src="./images/back_2xAAA.png" width="35%">
|
||||
<img src="./images/back_CR2032.png" width="35%">
|
||||
|
||||
Do not turn off `sound` because it turns U2 forever, which will drain the battery much faster.
|
||||
|
||||
Since the device is in sleep mode, it cannot receive commands.
|
||||
But you can set the button mode or at the time of the call.
|
||||
|
||||
If any commands are in the coordinator's queue, they will be executed after a button is pressed or a call is received.
|
||||
|
||||
|
||||
|
||||
##### The mode set by the Zigbee command `overwrites` the mode set by the button.
|
||||
|
||||
### Binding
|
||||
The device supports the direct binding of an incoming call to the onOff cluster.
|
||||
|
||||
For example, you can turn on the light while a call comes to the intercom, for notification in mute mode.
|
||||
|
||||
|
||||
### Files to reproduce
|
||||
* [Gerbers and BOM](https://github.com/diyruz/Zintercom/tree/master/hardware) by [xyzroe](https://t.me/xyzroe)
|
||||
* [Firmware](https://github.com/diyruz/Zintercom/releases) by [xyzroe](https://t.me/xyzroe)
|
||||
* [Case stl](https://www.thingiverse.com/thing:4866356) by [dreamertwo](https://t.me/dreamertwo)
|
||||
|
||||
|
||||
|
||||
### Like ♥️?
|
||||
[](https://www.buymeacoffee.com/xyzroe)
|
||||
|
||||
|
||||
### Inspired by
|
||||
The original scheme of the intercom opener by [Alexander Vaidurov](https://easyeda.com/Alex_AW/domofon-with-battery)
|
||||
Various hardware solutions by [Jager](https://modkam.ru)
|
||||
Firmware for different Zigbee devices by [Anonymous](https://github.com/nurikk/)
|
||||
|
||||
@@ -61,30 +61,44 @@
|
||||
#define HAL_LED_BLINK_DELAY() st( { volatile uint32 i; for (i=0; i<0x5800; i++) { }; } )
|
||||
|
||||
#if defined(HAL_BOARD_TARGET)
|
||||
//led
|
||||
#define LED1_BV BV(4)
|
||||
#define LED1_SBIT P0_4
|
||||
#define LED1_DDR P0DIR
|
||||
// blue
|
||||
#define LED1_BV BV(7)
|
||||
#define LED1_SBIT P1_7
|
||||
#define LED1_DDR P1DIR
|
||||
#define LED1_POLARITY ACTIVE_HIGH
|
||||
//catch
|
||||
#define LED2_BV BV(1)
|
||||
#define LED2_SBIT P0_1
|
||||
#define LED2_DDR P0DIR
|
||||
// green
|
||||
#define LED2_BV BV(6)
|
||||
#define LED2_SBIT P1_6
|
||||
#define LED2_DDR P1DIR
|
||||
#define LED2_POLARITY ACTIVE_HIGH
|
||||
//answer
|
||||
#define LED3_BV BV(2)
|
||||
#define LED3_SBIT P0_2
|
||||
#define LED3_DDR P0DIR
|
||||
// red
|
||||
#define LED3_BV BV(5)
|
||||
#define LED3_SBIT P1_5
|
||||
#define LED3_DDR P1DIR
|
||||
#define LED3_POLARITY ACTIVE_HIGH
|
||||
//handset
|
||||
#define LED4_BV BV(3)
|
||||
#define LED4_SBIT P0_3
|
||||
// old led
|
||||
#define LED4_BV BV(4)
|
||||
#define LED4_SBIT P0_4
|
||||
#define LED4_DDR P0DIR
|
||||
#define LED4_POLARITY ACTIVE_HIGH
|
||||
|
||||
// Catch control pin
|
||||
#define CATCH_BV BV(1)
|
||||
#define CATCH_PIN P0_1
|
||||
#define CATCH_DDR P0DIR
|
||||
#define CATCH_SSR P0SEL
|
||||
// Answer control pin
|
||||
#define ANSWER_BV BV(2)
|
||||
#define ANSWER_PIN P0_2
|
||||
#define ANSWER_DDR P0DIR
|
||||
#define ANSWER_SSR P0SEL
|
||||
// Handset control pin
|
||||
#define HANDSET_BV BV(3)
|
||||
#define HANDSET_PIN P0_3
|
||||
#define HANDSET_DDR P0DIR
|
||||
#define HANDSET_SSR P0SEL
|
||||
|
||||
#elif defined(HAL_BOARD_CHDTECH_DEV)
|
||||
//blue//d3
|
||||
//blue//d3
|
||||
#define LED1_BV BV(4)
|
||||
#define LED1_SBIT P1_4
|
||||
#define LED1_DDR P1DIR
|
||||
@@ -100,13 +114,33 @@
|
||||
#define LED3_DDR P1DIR
|
||||
#define LED3_POLARITY ACTIVE_LOW
|
||||
//ex
|
||||
#define LED4_BV BV(5)
|
||||
#define LED4_SBIT P1_5
|
||||
#define LED4_DDR P1DIR
|
||||
#define LED4_POLARITY ACTIVE_LOW
|
||||
#define LED4_BV BV(4)
|
||||
#define LED4_SBIT P0_4
|
||||
#define LED4_DDR P0DIR
|
||||
#define LED4_POLARITY ACTIVE_HIGH
|
||||
// Catch control pin
|
||||
#define CATCH_BV BV(1)
|
||||
#define CATCH_PIN P0_1
|
||||
#define CATCH_DDR P0DIR
|
||||
#define CATCH_SSR P0SEL
|
||||
// Answer control pin
|
||||
#define ANSWER_BV BV(2)
|
||||
#define ANSWER_PIN P1_2
|
||||
#define ANSWER_DDR P1DIR
|
||||
#define ANSWER_SSR P1SEL
|
||||
// Handset control pin
|
||||
#define HANDSET_BV BV(3)
|
||||
#define HANDSET_PIN P1_3
|
||||
#define HANDSET_DDR P1DIR
|
||||
#define HANDSET_SSR P1SEL
|
||||
#endif
|
||||
|
||||
#define BLUE_LED HAL_LED_1
|
||||
#define GREEN_LED HAL_LED_2
|
||||
#define RED_LED HAL_LED_3
|
||||
#define OLD_LED HAL_LED_4
|
||||
|
||||
#define INFO_LED HAL_LED_1 | HAL_LED_4
|
||||
|
||||
/* ------------------------------------------------------------------------------------------------
|
||||
* Push Button Configuration
|
||||
|
||||
@@ -42,24 +42,33 @@
|
||||
#endif
|
||||
|
||||
#if defined( HAL_BOARD_TARGET )
|
||||
// Income ring - P0_0
|
||||
#define KEY_INCOME_PORT HAL_KEY_PORT0
|
||||
#define HAL_KEY_P0_INPUT_PINS BV(0)
|
||||
#define HAL_KEY_P0_INPUT_PINS_EDGE HAL_KEY_RISING_EDGE
|
||||
// Button - P2_0
|
||||
#define KEY1_PORT HAL_KEY_PORT2
|
||||
#define HAL_KEY_P2_INPUT_PINS BV(0)
|
||||
#define HAL_KEY_P2_INPUT_PINS_EDGE HAL_KEY_FALLING_EDGE
|
||||
#define INT_HEAP_LEN 2256
|
||||
#define INT_HEAP_LEN 2200//2256
|
||||
#elif defined( HAL_BOARD_CHDTECH_DEV )
|
||||
// Income ring - P0_1
|
||||
#define KEY_INCOME_PORT HAL_KEY_PORT0
|
||||
#define HAL_KEY_P0_INPUT_PINS BV(1)
|
||||
#define HAL_KEY_P0_INPUT_PINS_EDGE HAL_KEY_FALLING_EDGE
|
||||
// Button - P2_0
|
||||
#define KEY1_PORT HAL_KEY_PORT2
|
||||
#define HAL_KEY_P2_INPUT_PINS BV(0)
|
||||
#define HAL_KEY_P2_INPUT_PINS_EDGE HAL_KEY_FALLING_EDGE
|
||||
#define DO_DEBUG_UART
|
||||
#define INT_HEAP_LEN 2060
|
||||
#endif
|
||||
|
||||
#define FACTORY_RESET_HOLD_TIME_LONG 5000
|
||||
#define BTN_HOLD_TIME 2000
|
||||
#define FACTORY_RESET_HOLD_TIME_LONG 10000
|
||||
|
||||
#if defined( DO_DEBUG_UART )
|
||||
#define HAL_UART_ISR 2
|
||||
#define HAL_UART_ISR 0
|
||||
#define HAL_UART TRUE
|
||||
#define HAL_UART_DMA 1
|
||||
#endif
|
||||
|
||||
346
Source/zcl_app.c
346
Source/zcl_app.c
@@ -58,6 +58,14 @@
|
||||
* GLOBAL VARIABLES
|
||||
*/
|
||||
byte zclApp_TaskID;
|
||||
#if defined( ZIC_BATTERY_MODE )
|
||||
static byte isRingOn = false;
|
||||
static byte isLedOn = false;
|
||||
#endif
|
||||
|
||||
// for Old LED
|
||||
static byte showMode = false;
|
||||
static byte showSound = false;
|
||||
|
||||
/*********************************************************************
|
||||
* GLOBAL FUNCTIONS
|
||||
@@ -77,18 +85,17 @@ static void zclApp_BasicResetCB(void);
|
||||
static void zclApp_RestoreAttributesFromNV(void);
|
||||
static void zclApp_SaveAttributesToNV(void);
|
||||
static void zclApp_HandleKeys(byte portAndAction, byte keyCode);
|
||||
static void zclApp_ControlPinsInit(void);
|
||||
static ZStatus_t zclApp_ReadWriteAuthCB(afAddrType_t *srcAddr, zclAttrRec_t *pAttr, uint8 oper);
|
||||
|
||||
static void zclApp_Report(void);
|
||||
static void zclApp_OneReport(void);
|
||||
static void zclApp_ConfigInit(bool restart);
|
||||
|
||||
static void zclApp_BtnClick(bool hold);
|
||||
static void zclApp_BtnClicks(byte count);
|
||||
static void zclApp_RingRun(void);
|
||||
static void zclApp_TalkStart(void);
|
||||
static void zclApp_RingEnd(void);
|
||||
|
||||
//static uint32 pressTime = 0;
|
||||
static void zclApp_WorkWithLEDs(void);
|
||||
|
||||
/*********************************************************************
|
||||
* ZCL General Profile Callback table
|
||||
@@ -103,9 +110,8 @@ static zclGeneral_AppCallbacks_t zclApp_CmdCallbacks = {
|
||||
NULL, // RSSI Location command
|
||||
NULL // RSSI Location Response command
|
||||
};
|
||||
void zclApp_Init(byte task_id) {
|
||||
//HalLedSet(HAL_LED_ALL, HAL_LED_MODE_BLINK);
|
||||
|
||||
void zclApp_Init(byte task_id) {
|
||||
zclApp_RestoreAttributesFromNV();
|
||||
|
||||
zclApp_TaskID = task_id;
|
||||
@@ -123,6 +129,9 @@ void zclApp_Init(byte task_id) {
|
||||
LREP("Build %s \r\n", zclApp_DateCodeNT);
|
||||
|
||||
zclApp_ConfigInit(TIMER_START);
|
||||
|
||||
zclApp_ControlPinsInit();
|
||||
|
||||
IO_IMODE_PORT_PIN(0,0,IO_TRI);
|
||||
|
||||
#if defined( ZIC_BATTERY_MODE )
|
||||
@@ -130,50 +139,69 @@ void zclApp_Init(byte task_id) {
|
||||
#endif
|
||||
}
|
||||
|
||||
static void zclApp_ControlPinsInit (void) {
|
||||
CATCH_SSR &= ~CATCH_BV; // Set PIN as general I/O port functions
|
||||
CATCH_DDR |= CATCH_BV; // Set the port transmission mode for PIN to output
|
||||
|
||||
ANSWER_SSR &= ~ANSWER_BV;
|
||||
ANSWER_DDR |= ANSWER_BV;
|
||||
|
||||
HANDSET_SSR &= ~HANDSET_BV;
|
||||
HANDSET_DDR |= HANDSET_BV;
|
||||
|
||||
P0SEL &= ~0x01; // Set P0_0 as general I/O port function
|
||||
P0DIR &= ~0x01; // Set the port transmission mode of P0_0 to input
|
||||
// ? P0INP &= ~0x01; //Set the port input mode of P0_0 to: pull up/down
|
||||
}
|
||||
|
||||
|
||||
static void zclApp_HandleKeys(byte portAndAction, byte keyCode) {
|
||||
|
||||
//LREP("zclApp_HandleKeys portAndAction=0x%X keyCode=0x%X\r\n", portAndAction, keyCode);
|
||||
//zclCommissioning_HandleKeys(portAndAction, keyCode);
|
||||
|
||||
if (portAndAction & 0x01) { //P0 Ring //S1 P0_1
|
||||
|
||||
if (portAndAction & KEY_INCOME_PORT) { //P0 Ring //S1 P0_1 TODO add check Income pin
|
||||
//exit old stop timer
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
osal_clear_event(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
|
||||
osal_start_timerEx(zclApp_TaskID, APP_RING_STOP_EVT, zclApp_Config.TimeBell * 1000);
|
||||
if (portAndAction & HAL_KEY_PRESS) {
|
||||
//osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_HOLD);
|
||||
//osal_pwrmgr_task_state(Hal_TaskID, PWRMGR_CONSERVE);
|
||||
|
||||
//start ring
|
||||
if (zclApp_State.RingRunStep == 0) {
|
||||
if (zclApp_State.State == Idle) {
|
||||
#if defined( ZIC_BATTERY_MODE )
|
||||
osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_HOLD);
|
||||
isRingOn = true;
|
||||
#endif
|
||||
LREPMaster("Ring start\r\n");
|
||||
HalLedSet(LED_PIN, HAL_LED_MODE_BLINK);
|
||||
zclApp_State.RingRunStep = 1;
|
||||
osal_start_reload_timer(zclApp_TaskID, APP_RING_RUN_EVT, 500);
|
||||
osal_start_timerEx(zclApp_TaskID, APP_RING_RUN_EVT, 50);
|
||||
afAddrType_t inderect_DstAddr = {.addrMode = (afAddrMode_t)AddrNotPresent, .endPoint = 0, .addr.shortAddr = 0};
|
||||
zclGeneral_SendOnOff_CmdOn(zclApp_FirstEP.EndPoint, &inderect_DstAddr, FALSE, bdb_getZCLFrameCounter());
|
||||
}
|
||||
}
|
||||
|
||||
//start new stop timer (ring ends timer)
|
||||
osal_start_reload_timer(zclApp_TaskID, APP_RING_STOP_EVT, 3000);
|
||||
}
|
||||
|
||||
if (portAndAction & 0x04) { //P2 Btn //S2 P2_0
|
||||
if (portAndAction & KEY1_PORT) { //P2 Btn //S2 P2_0 TODO add check BUTTON pin
|
||||
zclFactoryResetter_HandleKeys(portAndAction, keyCode);
|
||||
if (portAndAction & HAL_KEY_PRESS) {
|
||||
LREPMaster("Key pressed\r\n");
|
||||
osal_start_reload_timer(zclApp_TaskID, APP_BTN_CLICK_EVT, 50);
|
||||
LREP("Key pressed. Clicks - %d\r\n", zclApp_State.clicks);
|
||||
if (zclApp_State.clicks < 2) {
|
||||
zclApp_State.clicks++;
|
||||
}
|
||||
|
||||
osal_start_timerEx(zclApp_TaskID, APP_BTN_HOLD_EVT, BTN_HOLD_TIME);
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_BTN_CLICK_EVT);
|
||||
}
|
||||
if (portAndAction & HAL_KEY_RELEASE) {
|
||||
LREPMaster("Key released\r\n");
|
||||
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_BTN_HOLD_EVT);
|
||||
if (zclApp_State.clicks == 1) {
|
||||
osal_start_timerEx(zclApp_TaskID, APP_BTN_CLICK_EVT, 250);
|
||||
}
|
||||
if (zclApp_State.clicks == 2) {
|
||||
osal_start_timerEx(zclApp_TaskID, APP_BTN_DOUBLE_EVT, 50);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
uint16 zclApp_event_loop(uint8 task_id, uint16 events) {
|
||||
LREP("events 0x%x \r\n", events);
|
||||
if (events & SYS_EVENT_MSG) {
|
||||
@@ -203,7 +231,7 @@ uint16 zclApp_event_loop(uint8 task_id, uint16 events) {
|
||||
}
|
||||
if (events & APP_REPORT_EVT) {
|
||||
LREPMaster("APP_REPORT_EVT\r\n");
|
||||
zclApp_Report();
|
||||
zclApp_OneReport();
|
||||
return (events ^ APP_REPORT_EVT);
|
||||
}
|
||||
|
||||
@@ -216,7 +244,7 @@ uint16 zclApp_event_loop(uint8 task_id, uint16 events) {
|
||||
|
||||
if (events & APP_BTN_CLICK_EVT) {
|
||||
LREPMaster("APP_BTN_CLICK_EVT\r\n");
|
||||
zclApp_BtnClick(false);
|
||||
zclApp_BtnClicks(1);
|
||||
return (events ^ APP_BTN_CLICK_EVT);
|
||||
}
|
||||
|
||||
@@ -228,7 +256,10 @@ uint16 zclApp_event_loop(uint8 task_id, uint16 events) {
|
||||
|
||||
if (events & APP_RING_STOP_EVT) {
|
||||
LREPMaster("APP_RING_STOP_EVT\r\n");
|
||||
// if answer started - break not allowed
|
||||
if (zclApp_State.State == Ring) {
|
||||
zclApp_RingEnd();
|
||||
}
|
||||
return (events ^ APP_RING_STOP_EVT);
|
||||
}
|
||||
|
||||
@@ -238,158 +269,234 @@ uint16 zclApp_event_loop(uint8 task_id, uint16 events) {
|
||||
return (events ^ APP_TALK_START_EVT);
|
||||
}
|
||||
|
||||
if (events & APP_WORK_LED_EVT) {
|
||||
LREPMaster("APP_WORK_LED_EVT\r\n");
|
||||
zclApp_WorkWithLEDs();
|
||||
return (events ^ APP_WORK_LED_EVT);
|
||||
}
|
||||
|
||||
if (events & APP_BTN_HOLD_EVT) {
|
||||
LREPMaster("APP_BTN_HOLD_EVT\r\n");
|
||||
zclApp_BtnClick(true);
|
||||
//#if !defined( ZIC_BATTERY_MODE )
|
||||
zclApp_BtnClicks(255);
|
||||
//#endif
|
||||
return (events ^ APP_BTN_HOLD_EVT);
|
||||
}
|
||||
|
||||
if (events & APP_BTN_DOUBLE_EVT) {
|
||||
LREPMaster("APP_BTN_DOUBLE_EVT\r\n");
|
||||
zclApp_BtnClicks(2);
|
||||
return (events ^ APP_BTN_DOUBLE_EVT);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void zclApp_RingRun(void) {
|
||||
|
||||
zclApp_State.RingRunStep++;
|
||||
LREP("zclApp_State.RingRunStep %d\r\n", zclApp_State.RingRunStep);
|
||||
LREP("zclApp_State.State %d\r\n", zclApp_State.State);
|
||||
uint32 timeRingStart = osal_GetSystemClock();
|
||||
// timeout for next ring step
|
||||
// 250 - default ring timeout in Never mode
|
||||
uint32 timeout_value = 250;
|
||||
|
||||
switch (zclApp_State.State) {
|
||||
case Idle:
|
||||
zclApp_State.State = Ring;
|
||||
if (zclApp_Config.ModeOpen != Never) {
|
||||
timeout_value = zclApp_Config.TimeRing * 1000;
|
||||
}
|
||||
zclApp_OneReport();
|
||||
break;
|
||||
case Ring:
|
||||
if ((zclApp_Config.ModeOpen == Once) || (zclApp_Config.ModeOpen == Always)){
|
||||
if (zclApp_State.RingRunStep > (zclApp_Config.TimeRing * 2)) {
|
||||
if (zclApp_Config.ModeOpen == Never) {
|
||||
break;
|
||||
}
|
||||
zclApp_State.State = Talk;
|
||||
timeout_value = zclApp_Config.TimeTalk * 1000;
|
||||
zclApp_TalkStart();
|
||||
}
|
||||
}
|
||||
if (zclApp_Config.ModeOpen == Drop){
|
||||
zclApp_State.State = Droped;
|
||||
zclApp_TalkStart();
|
||||
}
|
||||
break;
|
||||
case Talk:
|
||||
if ((zclApp_Config.ModeOpen == Once) || (zclApp_Config.ModeOpen == Always)){
|
||||
if (zclApp_State.RingRunStep > ((zclApp_Config.TimeRing + zclApp_Config.TimeTalk) * 2)) {
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
if (zclApp_Config.ModeOpen == Once || zclApp_Config.ModeOpen == Always) {
|
||||
// open door
|
||||
timeout_value = zclApp_Config.TimeOpen * 1000;
|
||||
zclApp_State.State = Open;
|
||||
HalLedSet(ANSWER_PIN, HAL_LED_MODE_OFF);
|
||||
ANSWER_PIN = 0;
|
||||
zclApp_OneReport();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
// No break here. End call without open
|
||||
case Open:
|
||||
if ((zclApp_Config.ModeOpen == Once) || (zclApp_Config.ModeOpen == Always)){
|
||||
if (zclApp_State.RingRunStep > ((zclApp_Config.TimeRing + zclApp_Config.TimeTalk + zclApp_Config.TimeOpen) * 2)) {
|
||||
// end call
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
zclApp_RingEnd();
|
||||
}
|
||||
}
|
||||
break;
|
||||
case Droped:
|
||||
if (zclApp_State.RingRunStep > 3) {
|
||||
zclApp_RingEnd();
|
||||
}
|
||||
timeout_value = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
if (timeout_value != 0) {
|
||||
osal_start_timerEx(zclApp_TaskID, APP_RING_RUN_EVT, timeout_value);
|
||||
}
|
||||
osal_start_timerEx(zclApp_TaskID, APP_WORK_LED_EVT, 50);
|
||||
}
|
||||
|
||||
static void zclApp_TalkStart(void) {
|
||||
LREPMaster("Talk start\r\n");
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
osal_clear_event(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
zclApp_OneReport();
|
||||
HalLedSet(ANSWER_PIN, HAL_LED_MODE_ON);
|
||||
ANSWER_PIN = 1;
|
||||
if (zclApp_Config.ModeSound == true) {
|
||||
HalLedSet(HANDSET_PIN, HAL_LED_MODE_ON);
|
||||
HANDSET_PIN = 1;
|
||||
}
|
||||
else {
|
||||
HalLedSet(CATCH_PIN, HAL_LED_MODE_OFF);
|
||||
CATCH_PIN = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void zclApp_RingEnd(void) {
|
||||
LREPMaster("Ring end\r\n");
|
||||
if (zclApp_Config.ModeSound == true) {
|
||||
HalLedSet(CATCH_PIN, HAL_LED_MODE_OFF);
|
||||
HalLedSet(HANDSET_PIN, HAL_LED_MODE_OFF);
|
||||
}
|
||||
else {
|
||||
HalLedSet(CATCH_PIN, HAL_LED_MODE_ON);
|
||||
HalLedSet(HANDSET_PIN, HAL_LED_MODE_ON);
|
||||
}
|
||||
HalLedSet(ANSWER_PIN, HAL_LED_MODE_OFF);
|
||||
CATCH_PIN = !zclApp_Config.ModeSound;
|
||||
HANDSET_PIN = !zclApp_Config.ModeSound;
|
||||
ANSWER_PIN = 0;
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_RING_RUN_EVT);
|
||||
osal_clear_event(zclApp_TaskID, APP_RING_RUN_EVT);
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
osal_clear_event(zclApp_TaskID, APP_RING_STOP_EVT);
|
||||
zclApp_State.RingRunStep = 0;
|
||||
osal_start_timerEx(zclApp_TaskID, APP_WORK_LED_EVT, 50);
|
||||
zclApp_State.State = Idle;
|
||||
afAddrType_t inderect_DstAddr = {.addrMode = (afAddrMode_t)AddrNotPresent, .endPoint = 0, .addr.shortAddr = 0};
|
||||
|
||||
afAddrType_t inderect_DstAddr = {.addrMode = (afAddrMode_t)AddrNotPresent, .endPoint = 0, .addr.shortAddr = 0};
|
||||
zclGeneral_SendOnOff_CmdOff(zclApp_FirstEP.EndPoint, &inderect_DstAddr, FALSE, bdb_getZCLFrameCounter());
|
||||
|
||||
if (zclApp_Config.ModeOpen == Once) {
|
||||
zclApp_Config.ModeOpen = Never;
|
||||
}
|
||||
zclApp_OneReport();
|
||||
|
||||
#if defined( ZIC_BATTERY_MODE )
|
||||
zclBattery_Report();
|
||||
isRingOn = false;
|
||||
if (isLedOn == false) {
|
||||
osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_CONSERVE);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void zclApp_BtnClick(bool hold) {
|
||||
static void zclApp_WorkWithLEDs(void) {
|
||||
#if defined( ZIC_BATTERY_MODE )
|
||||
if (isLedOn != false) { // Off LEDs and goto sleep
|
||||
isLedOn = false;
|
||||
HalLedSet(HAL_LED_ALL, HAL_LED_MODE_OFF);
|
||||
if (isRingOn == false) {
|
||||
osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_CONSERVE);
|
||||
}
|
||||
return;
|
||||
}
|
||||
// On LEDs and hold power 2 sec.
|
||||
isLedOn = true;
|
||||
osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_HOLD);
|
||||
osal_start_timerEx(zclApp_TaskID, APP_WORK_LED_EVT, 2000);
|
||||
#endif
|
||||
|
||||
static uint8 currentBtnClickPhase = 0;
|
||||
LREP("currentBtnClickPhase %d\r\n", currentBtnClickPhase);
|
||||
switch (currentBtnClickPhase++) {
|
||||
case 0:
|
||||
if (hold) {
|
||||
zclApp_Config.ModeSound = !zclApp_Config.ModeSound;
|
||||
HalLedSet(CATCH_PIN, !zclApp_Config.ModeSound);
|
||||
if (showSound & showMode) {
|
||||
showSound = false;
|
||||
showMode = false;
|
||||
HalLedBlink(OLD_LED, 1, 99, 2000);
|
||||
} else if (showSound) {
|
||||
showSound = false;
|
||||
HalLedBlink(OLD_LED, zclApp_Config.ModeSound + 1, 50, 750);
|
||||
} else if (showMode) {
|
||||
showMode = false;
|
||||
HalLedBlink(OLD_LED, zclApp_Config.ModeOpen + 1, 50, 250);
|
||||
}
|
||||
|
||||
if (zclApp_Config.ModeOpen == Always) {
|
||||
HalLedSet(GREEN_LED, HAL_LED_MODE_ON);
|
||||
}
|
||||
if (zclApp_Config.ModeOpen != Always) {
|
||||
HalLedSet(GREEN_LED, HAL_LED_MODE_OFF);
|
||||
}
|
||||
if (zclApp_Config.ModeOpen == Once) {
|
||||
HalLedBlink(GREEN_LED, 0, 95, 500);
|
||||
}
|
||||
if (zclApp_Config.ModeOpen == Drop) {
|
||||
HalLedSet(RED_LED, HAL_LED_MODE_ON);
|
||||
}
|
||||
if (zclApp_Config.ModeOpen != Drop) {
|
||||
HalLedSet(RED_LED, HAL_LED_MODE_OFF);
|
||||
}
|
||||
if (zclApp_State.State != Idle) {
|
||||
HalLedSet(RED_LED, HAL_LED_MODE_BLINK);
|
||||
}
|
||||
if (zclApp_Config.ModeSound == true) {
|
||||
HalLedSet(BLUE_LED, HAL_LED_MODE_OFF);
|
||||
}
|
||||
else {
|
||||
HalLedSet(BLUE_LED, HAL_LED_MODE_ON);
|
||||
}
|
||||
}
|
||||
|
||||
static void zclApp_BtnClicks(byte count) {
|
||||
zclApp_State.clicks = 0;
|
||||
osal_start_timerEx(zclApp_TaskID, APP_WORK_LED_EVT, 50);
|
||||
|
||||
switch (count) {
|
||||
case 1:
|
||||
LREPMaster("Button click\r\n");
|
||||
if (zclApp_State.State == Idle) {
|
||||
// if we don`t have income ring - change mode
|
||||
if (zclApp_Config.ModeOpen < Drop) {
|
||||
zclApp_Config.ModeOpen++;
|
||||
}
|
||||
else {
|
||||
zclApp_Config.ModeOpen = Never;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
zclApp_OneReport();
|
||||
}
|
||||
else {
|
||||
// if we have income ring, and mode is Never - open door
|
||||
if (zclApp_State.State == Ring && zclApp_Config.ModeOpen == Never) {
|
||||
zclApp_Config.ModeOpen = Once;
|
||||
}
|
||||
}
|
||||
showMode = true;
|
||||
break;
|
||||
case 2:
|
||||
if (hold) {
|
||||
HalLedBlink(LED_PIN, zclApp_Config.ModeSound+1, 50, 750);
|
||||
}
|
||||
else {
|
||||
HalLedBlink(LED_PIN, zclApp_Config.ModeOpen+1, 50, 250);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
if (hold) {
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_BTN_HOLD_EVT);
|
||||
osal_clear_event(zclApp_TaskID, APP_BTN_HOLD_EVT);
|
||||
}
|
||||
else {
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_BTN_CLICK_EVT);
|
||||
osal_clear_event(zclApp_TaskID, APP_BTN_CLICK_EVT);
|
||||
}
|
||||
currentBtnClickPhase = 0;
|
||||
break;
|
||||
}
|
||||
#if defined( ZIC_BATTERY_MODE )
|
||||
zclBattery_Report();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void zclApp_Report(void) {
|
||||
LREPMaster("Button double\r\n");
|
||||
if (zclApp_State.State == Idle) {
|
||||
zclApp_Config.ModeSound = !zclApp_Config.ModeSound;
|
||||
HANDSET_PIN = !zclApp_Config.ModeSound;
|
||||
CATCH_PIN = !zclApp_Config.ModeSound;
|
||||
zclApp_OneReport();
|
||||
}
|
||||
showSound = true;
|
||||
break;
|
||||
case 255:
|
||||
LREPMaster("Button hold\r\n");
|
||||
if (zclApp_State.State == Idle) {
|
||||
// if we don`t have income ring - reset mode
|
||||
zclApp_Config.ModeSound = true;
|
||||
HANDSET_PIN = !zclApp_Config.ModeSound;
|
||||
CATCH_PIN = !zclApp_Config.ModeSound;
|
||||
zclApp_Config.ModeOpen = Never;
|
||||
zclApp_OneReport();
|
||||
}
|
||||
else {
|
||||
// if we have income ring - drop it
|
||||
if (zclApp_State.State == Ring) {
|
||||
// in stage "ring" - start talk
|
||||
osal_stop_timerEx(zclApp_TaskID, APP_RING_RUN_EVT);
|
||||
osal_start_timerEx(zclApp_TaskID, APP_RING_RUN_EVT, zclApp_Config.TimeTalk * 1000);
|
||||
zclApp_TalkStart();
|
||||
}
|
||||
// skip step "open", go to end call
|
||||
zclApp_State.State = Open;
|
||||
osal_start_timerEx(zclApp_TaskID, APP_RING_STOP_EVT, 250);
|
||||
}
|
||||
showMode = true;
|
||||
showSound = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void zclApp_OneReport(void) {
|
||||
HalLedSet(LED_PIN, HAL_LED_MODE_BLINK);
|
||||
bdb_RepChangedAttrValue(zclApp_FirstEP.EndPoint, ZCL_INTERCOM, ATTRID_STATE);
|
||||
bdb_RepChangedAttrValue(zclApp_FirstEP.EndPoint, ZCL_INTERCOM, ATTRID_MODEOPEN);
|
||||
bdb_RepChangedAttrValue(zclApp_FirstEP.EndPoint, ZCL_INTERCOM, ATTRID_MODESOUND);
|
||||
@@ -403,7 +510,7 @@ static void zclApp_BasicResetCB(void) {
|
||||
|
||||
static ZStatus_t zclApp_ReadWriteAuthCB(afAddrType_t *srcAddr, zclAttrRec_t *pAttr, uint8 oper) {
|
||||
LREPMaster("AUTH CB called\r\n");
|
||||
osal_start_timerEx(zclApp_TaskID, APP_SAVE_ATTRS_EVT, 2000);
|
||||
osal_start_timerEx(zclApp_TaskID, APP_SAVE_ATTRS_EVT, 200);
|
||||
return ZSuccess;
|
||||
}
|
||||
|
||||
@@ -421,16 +528,13 @@ static void zclApp_ConfigInit(bool restart) {
|
||||
uint32 ReportInterval = (uint32)zclApp_Config.TimeReport * (uint32)60;
|
||||
LREP("Start report with interval %d seconds\r\n", ReportInterval);
|
||||
osal_start_reload_timer(zclApp_TaskID, APP_REPORT_EVT, ((uint32)ReportInterval*(uint32)1000));
|
||||
osal_start_timerEx(zclApp_TaskID, APP_WORK_LED_EVT, 50);
|
||||
|
||||
if (zclApp_Config.ModeSound == true) {
|
||||
HalLedSet(HANDSET_PIN, HAL_LED_MODE_OFF);
|
||||
HalLedSet(CATCH_PIN, HAL_LED_MODE_OFF);
|
||||
if (zclApp_State.State == Idle) {
|
||||
HANDSET_PIN = !zclApp_Config.ModeSound;
|
||||
CATCH_PIN = !zclApp_Config.ModeSound;
|
||||
ANSWER_PIN = 0;
|
||||
}
|
||||
else {
|
||||
HalLedSet(HANDSET_PIN, HAL_LED_MODE_ON);
|
||||
HalLedSet(CATCH_PIN, HAL_LED_MODE_ON);
|
||||
}
|
||||
HalLedSet(ANSWER_PIN, HAL_LED_MODE_OFF);
|
||||
}
|
||||
|
||||
static void zclApp_RestoreAttributesFromNV(void) {
|
||||
|
||||
@@ -21,9 +21,11 @@ extern "C" {
|
||||
#define APP_SAVE_ATTRS_EVT 0x0002
|
||||
#define APP_BTN_CLICK_EVT 0x0004
|
||||
#define APP_RING_RUN_EVT 0x0008
|
||||
#define APP_BTN_HOLD_EVT 0x0016
|
||||
#define APP_RING_STOP_EVT 0x0032
|
||||
#define APP_TALK_START_EVT 0x0064
|
||||
#define APP_BTN_HOLD_EVT 0x0010
|
||||
#define APP_RING_STOP_EVT 0x0020
|
||||
#define APP_TALK_START_EVT 0x0040
|
||||
#define APP_WORK_LED_EVT 0x0080
|
||||
#define APP_BTN_DOUBLE_EVT 0x0100
|
||||
|
||||
/*********************************************************************
|
||||
* MACROS
|
||||
@@ -53,13 +55,9 @@ extern "C" {
|
||||
#define ATTRID_TIMERING 0x0053
|
||||
#define ATTRID_TIMETALK 0x0054
|
||||
#define ATTRID_TIMEOPEN 0x0055
|
||||
#define ATTRID_TIMEBELL 0x0057
|
||||
#define ATTRID_TIMEREPORT 0x0056
|
||||
|
||||
#define LED_PIN HAL_LED_1
|
||||
#define CATCH_PIN HAL_LED_2
|
||||
#define ANSWER_PIN HAL_LED_3
|
||||
#define HANDSET_PIN HAL_LED_4
|
||||
|
||||
#define TIMER_RESTART TRUE
|
||||
#define TIMER_START FALSE
|
||||
|
||||
@@ -107,13 +105,14 @@ typedef struct {
|
||||
uint8 TimeRing;
|
||||
uint8 TimeTalk;
|
||||
uint8 TimeOpen;
|
||||
uint8 TimeBell;
|
||||
uint8 TimeReport;
|
||||
} application_config_t;
|
||||
|
||||
typedef struct {
|
||||
WorkState_t State;
|
||||
uint8 RingRunStep;
|
||||
uint32 pressTime;
|
||||
byte clicks;
|
||||
} device_state_t;
|
||||
|
||||
|
||||
|
||||
@@ -64,10 +64,10 @@ const uint8 zclApp_PowerSource = POWER_SOURCE_DC;
|
||||
#define DEFAULT_ModeOpen Never
|
||||
#define DEFAULT_ModeSound TRUE
|
||||
|
||||
#define DEFAULT_TimeRing 3 //seconds to ring, before answer
|
||||
#define DEFAULT_TimeTalk 1 //seconds to talk, before open
|
||||
#define DEFAULT_TimeRing 7 //seconds to ring, before answer
|
||||
#define DEFAULT_TimeTalk 3 //seconds to talk, before open
|
||||
#define DEFAULT_TimeOpen 2 //seconds to hold open
|
||||
|
||||
#define DEFAULT_TimeBell 3 //seconds after last bell to finish ring
|
||||
|
||||
application_config_t zclApp_Config = {
|
||||
.ModeOpen = DEFAULT_ModeOpen,
|
||||
@@ -75,12 +75,13 @@ application_config_t zclApp_Config = {
|
||||
.TimeRing = DEFAULT_TimeRing,
|
||||
.TimeTalk = DEFAULT_TimeTalk,
|
||||
.TimeOpen = DEFAULT_TimeOpen,
|
||||
.TimeBell = DEFAULT_TimeBell,
|
||||
.TimeReport = DEFAULT_TimeReport,
|
||||
};
|
||||
|
||||
device_state_t zclApp_State = {
|
||||
.State = Idle,
|
||||
.RingRunStep = 0,
|
||||
.pressTime = 0,
|
||||
};
|
||||
|
||||
|
||||
@@ -121,6 +122,7 @@ CONST zclAttrRec_t zclApp_AttrsFirstEP[] = {
|
||||
{ZCL_INTERCOM, {ATTRID_TIMERING, ZCL_UINT8, RW, (void *)&zclApp_Config.TimeRing}},
|
||||
{ZCL_INTERCOM, {ATTRID_TIMETALK, ZCL_UINT8, RW, (void *)&zclApp_Config.TimeTalk}},
|
||||
{ZCL_INTERCOM, {ATTRID_TIMEOPEN, ZCL_UINT8, RW, (void *)&zclApp_Config.TimeOpen}},
|
||||
{ZCL_INTERCOM, {ATTRID_TIMEBELL, ZCL_UINT8, RW, (void *)&zclApp_Config.TimeBell}},
|
||||
{ZCL_INTERCOM, {ATTRID_TIMEREPORT, ZCL_UINT8, RW, (void *)&zclApp_Config.TimeReport}},
|
||||
};
|
||||
|
||||
@@ -156,5 +158,6 @@ void zclApp_ResetAttributesToDefaultValues(void) {
|
||||
zclApp_Config.TimeRing = DEFAULT_TimeRing;
|
||||
zclApp_Config.TimeTalk = DEFAULT_TimeTalk;
|
||||
zclApp_Config.TimeOpen = DEFAULT_TimeOpen;
|
||||
zclApp_Config.TimeBell = DEFAULT_TimeBell;
|
||||
zclApp_Config.TimeReport = DEFAULT_TimeReport;
|
||||
}
|
||||
@@ -1,17 +1,13 @@
|
||||
const {
|
||||
fromZigbeeConverters,
|
||||
toZigbeeConverters,
|
||||
exposes
|
||||
} = require('zigbee-herdsman-converters');
|
||||
const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
|
||||
|
||||
const exposes = zigbeeHerdsmanConverters['exposes'] || require("zigbee-herdsman-converters/lib/exposes");
|
||||
|
||||
const ep = exposes.presets;
|
||||
const ea = exposes.access;
|
||||
const fromZigbeeConverters = zigbeeHerdsmanConverters.fromZigbeeConverters || zigbeeHerdsmanConverters.fromZigbee;
|
||||
const toZigbeeConverters = zigbeeHerdsmanConverters.toZigbeeConverters || zigbeeHerdsmanConverters.toZigbee;
|
||||
|
||||
|
||||
const ZCL_DATATYPE_INT16 = 0x29;
|
||||
const ZCL_DATATYPE_UINT8 = 0x20;
|
||||
const ZCL_DATATYPE_UINT16 = 0x21;
|
||||
const ZCL_DATATYPE_BOOLEAN = 0x10;
|
||||
const ZCL_DATATYPE_INT32 = 0x2b;
|
||||
const bind = async (endpoint, target, clusters) => {
|
||||
for (const cluster of clusters) {
|
||||
await endpoint.bind(cluster, target);
|
||||
@@ -63,8 +59,6 @@ const repInterval = {
|
||||
MINUTE: 60,
|
||||
};
|
||||
|
||||
|
||||
|
||||
const fz = {
|
||||
diy_zintercom_config: {
|
||||
cluster: 'closuresDoorLock',
|
||||
@@ -89,6 +83,9 @@ const fz = {
|
||||
if (msg.data.hasOwnProperty(0x0055)) {
|
||||
result.time_open = msg.data[0x0055];
|
||||
}
|
||||
if (msg.data.hasOwnProperty(0x0057)) {
|
||||
result.time_bell = msg.data[0x0057];
|
||||
}
|
||||
if (msg.data.hasOwnProperty(0x0056)) {
|
||||
result.time_report = msg.data[0x0056];
|
||||
}
|
||||
@@ -99,7 +96,7 @@ const fz = {
|
||||
|
||||
const tz = {
|
||||
diy_zintercom_config: {
|
||||
key: ['state', 'mode', 'sound', 'time_ring', 'time_talk', 'time_open', 'time_report'],
|
||||
key: ['state', 'mode', 'sound', 'time_ring', 'time_talk', 'time_open', 'time_bell', 'time_report'],
|
||||
convertSet: async (entity, key, rawValue, meta) => {
|
||||
const lookup = {
|
||||
'OFF': 0x00,
|
||||
@@ -125,6 +122,7 @@ const tz = {
|
||||
time_ring: {0x0053: {value, type: 0x20}},
|
||||
time_talk: {0x0054: {value, type: 0x20}},
|
||||
time_open: {0x0055: {value, type: 0x20}},
|
||||
time_bell: {0x0057: {value, type: 0x20}},
|
||||
time_report: {0x0056: {value, type: 0x20}},
|
||||
};
|
||||
|
||||
@@ -141,6 +139,7 @@ const tz = {
|
||||
time_ring: ['closuresDoorLock', 0x0053],
|
||||
time_talk: ['closuresDoorLock', 0x0054],
|
||||
time_open: ['closuresDoorLock', 0x0055],
|
||||
time_bell: ['closuresDoorLock', 0x0057],
|
||||
time_report: ['closuresDoorLock', 0x0056],
|
||||
};
|
||||
await entity.read(payloads[key][0], [payloads[key][1]]);
|
||||
@@ -150,11 +149,10 @@ const tz = {
|
||||
|
||||
const device = {
|
||||
zigbeeModel: ['DIY_Zintercom'],
|
||||
model: 'DIY_Zintercom',
|
||||
vendor: 'xyzroe',
|
||||
description: '[Intercom Auto Opener]',
|
||||
supports: '',
|
||||
//homeassistant: [hass.temperature, hass.presure, hass.humidity, hass.co2],
|
||||
model: 'DIYRuZ_Zintercom',
|
||||
vendor: 'DIYRuZ',
|
||||
description: '[Matrix intercom auto opener](https://diyruz.github.io/posts/zintercom/)',
|
||||
icon: 'https://raw.githubusercontent.com/diyruz/Zintercom/master/images/z2m.png',
|
||||
fromZigbee: [
|
||||
fromZigbeeConverters.battery,
|
||||
fz.diy_zintercom_config,
|
||||
@@ -169,37 +167,11 @@ const device = {
|
||||
configure: async (device, coordinatorEndpoint) => {
|
||||
const firstEndpoint = device.getEndpoint(1);
|
||||
|
||||
//await bind(firstEndpoint, coordinatorEndpoint, ['msCO2', 'closuresDoorLock', 'genOnOff']);
|
||||
|
||||
await bind(firstEndpoint, coordinatorEndpoint, ['closuresDoorLock', 'genPowerCfg']);
|
||||
|
||||
const overides = {min: 0, max: 3600, change: 0};
|
||||
await configureReporting.batteryVoltage(firstEndpoint, overides);
|
||||
await configureReporting.batteryPercentageRemaining(firstEndpoint, overides);
|
||||
/*
|
||||
if (device.applicationVersion < 3) { // Legacy PM2 firmwares
|
||||
const payload = [{
|
||||
attribute: 'batteryPercentageRemaining',
|
||||
minimumReportInterval: 0,
|
||||
maximumReportInterval: 3600,
|
||||
reportableChange: 0,
|
||||
}, {
|
||||
attribute: 'batteryVoltage',
|
||||
minimumReportInterval: 0,
|
||||
maximumReportInterval: 3600,
|
||||
reportableChange: 0,
|
||||
}];
|
||||
await firstEndpoint.configureReporting('genPowerCfg', payload);
|
||||
}
|
||||
*/
|
||||
/*
|
||||
const msBindPayload = [{
|
||||
attribute: 'measuredValue',
|
||||
minimumReportInterval: 0,
|
||||
maximumReportInterval: 3600,
|
||||
reportableChange: 0,
|
||||
}];
|
||||
await firstEndpoint.configureReporting('msCO2', msBindPayload);
|
||||
*/
|
||||
|
||||
const payload = [{
|
||||
attribute: {
|
||||
@@ -212,20 +184,6 @@ const device = {
|
||||
},
|
||||
];
|
||||
await firstEndpoint.configureReporting('closuresDoorLock', payload);
|
||||
/**/
|
||||
/*
|
||||
await firstEndpoint.configureReporting('msTemperatureMeasurement', msBindPayload);
|
||||
await firstEndpoint.configureReporting('msRelativeHumidity', msBindPayload);
|
||||
|
||||
const pressureBindPayload = [{
|
||||
attribute: 'scaledValue',
|
||||
minimumReportInterval: 0,
|
||||
maximumReportInterval: 3600,
|
||||
reportableChange: 0,
|
||||
}];
|
||||
await firstEndpoint.configureReporting('msPressureMeasurement', pressureBindPayload);
|
||||
*/
|
||||
|
||||
|
||||
},
|
||||
exposes: [
|
||||
@@ -241,10 +199,11 @@ const device = {
|
||||
.withDescription('Time to hold before open'),
|
||||
exposes.numeric('time_open', ea.ALL).withUnit('sec')
|
||||
.withDescription('Time to open before end'),
|
||||
exposes.numeric('time_bell', ea.ALL).withUnit('sec')
|
||||
.withDescription('Time after last bell to finish ring'),
|
||||
exposes.numeric('time_report', ea.ALL).withUnit('min')
|
||||
.withDescription('Reporting interval'),
|
||||
ep.battery(),
|
||||
ep.linkquality(),
|
||||
],
|
||||
};
|
||||
|
||||
Binary file not shown.
Binary file not shown.
BIN
hardware/Gerber_Zintercom_rgb.zip
Normal file
BIN
hardware/Gerber_Zintercom_rgb.zip
Normal file
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 330 KiB After Width: | Height: | Size: 313 KiB |
BIN
hardware/Schematic_Zintercom_rgb.png
Normal file
BIN
hardware/Schematic_Zintercom_rgb.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 206 KiB |
BIN
hardware/Домофон zintercom.docx
Normal file
BIN
hardware/Домофон zintercom.docx
Normal file
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 348 KiB After Width: | Height: | Size: 192 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 347 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 265 KiB After Width: | Height: | Size: 175 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 400 KiB |
BIN
images/battery_no_handset.png
Normal file
BIN
images/battery_no_handset.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 76 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 239 KiB After Width: | Height: | Size: 298 KiB |
BIN
images/fix_error_rings.png
Normal file
BIN
images/fix_error_rings.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 71 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 198 KiB |
BIN
images/front_side_rgb.png
Normal file
BIN
images/front_side_rgb.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 220 KiB |
BIN
images/z2m.png
Normal file
BIN
images/z2m.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 190 KiB |
BIN
images/z2m_dashboard.gif
Normal file
BIN
images/z2m_dashboard.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 559 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 45 KiB |
Reference in New Issue
Block a user