rad/Zintercom
1
0
Fork 0
mirror of https://github.com/Utyff/Zintercom.git synced 2026-01-12 09:17:41 +03:00
Code Issues Projects Releases Wiki Activity

some rework

Browse Source 
reworked the sequence and conditions of optocouplers triggering;
clarified the name of the configurations;
This commit is contained in:
lost
2021-02-17 01:43:04 +02:00
parent c5780a9007
commit 02fac9e93d
3 changed files with 103 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
CC2530DB/GenericApp.ewp
View File

@@ -4568,7 +4568,7 @@
</settings> </settings>
</configuration> </configuration>
<configuration> <configuration>
<name>Zintercom_EndDevice_CC2592</name> <name>Zintercom_EndDevice_PA1</name>
<toolchain> <toolchain>
<name>8051</name> <name>8051</name>
</toolchain> </toolchain>
@@ -4679,15 +4679,15 @@
</option> </option>
<option> <option>
<name>ExePath</name> <name>ExePath</name>
<state>Zintercom_EndDevice_CC2592\Exe</state> <state>Zintercom_EndDevice_PA1\Exe</state>
</option> </option>
<option> <option>
<name>ObjPath</name> <name>ObjPath</name>
<state>Zintercom_EndDevice_CC2592\Obj</state> <state>Zintercom_EndDevice_PA1\Obj</state>
</option> </option>
<option> <option>
<name>ListPath</name> <name>ListPath</name>
<state>Zintercom_EndDevice_CC2592\List</state> <state>Zintercom_EndDevice_PA1\List</state>
</option> </option>
<option> <option>
<name>GOutputBinary</name> <name>GOutputBinary</name>
@@ -5712,7 +5712,7 @@
</settings> </settings>
</configuration> </configuration>
<configuration> <configuration>
<name>Zintercom_Router_CC2592</name> <name>Zintercom_Router_PA1</name>
<toolchain> <toolchain>
<name>8051</name> <name>8051</name>
</toolchain> </toolchain>
@@ -5823,15 +5823,15 @@
</option> </option>
<option> <option>
<name>ExePath</name> <name>ExePath</name>
<state>Zintercom_Router_CC2592\Exe</state> <state>Zintercom_Router_PA1\Exe</state>
</option> </option>
<option> <option>
<name>ObjPath</name> <name>ObjPath</name>
<state>Zintercom_Router_CC2592\Obj</state> <state>Zintercom_Router_PA1\Obj</state>
</option> </option>
<option> <option>
<name>ListPath</name> <name>ListPath</name>
<state>Zintercom_Router_CC2592\List</state> <state>Zintercom_Router_PA1\List</state>
</option> </option>
<option> <option>
<name>GOutputBinary</name> <name>GOutputBinary</name>
@@ -6855,7 +6855,7 @@
</settings> </settings>
</configuration> </configuration>
<configuration> <configuration>
<name>Zintercom_EndDevice_CC2591</name> <name>Zintercom_EndDevice_PA2</name>
<toolchain> <toolchain>
<name>8051</name> <name>8051</name>
</toolchain> </toolchain>
@@ -6966,15 +6966,15 @@
</option> </option>
<option> <option>
<name>ExePath</name> <name>ExePath</name>
<state>Zintercom_EndDevice_CC2591\Exe</state> <state>Zintercom_EndDevice_PA2\Exe</state>
</option> </option>
<option> <option>
<name>ObjPath</name> <name>ObjPath</name>
<state>Zintercom_EndDevice_CC2591\Obj</state> <state>Zintercom_EndDevice_PA2\Obj</state>
</option> </option>
<option> <option>
<name>ListPath</name> <name>ListPath</name>
<state>Zintercom_EndDevice_CC2591\List</state> <state>Zintercom_EndDevice_PA2\List</state>
</option> </option>
<option> <option>
<name>GOutputBinary</name> <name>GOutputBinary</name>
@@ -7999,7 +7999,7 @@
</settings> </settings>
</configuration> </configuration>
<configuration> <configuration>
<name>Zintercom_Router_CC2591</name> <name>Zintercom_Router_PA2</name>
<toolchain> <toolchain>
<name>8051</name> <name>8051</name>
</toolchain> </toolchain>
@@ -8110,15 +8110,15 @@
</option> </option>
<option> <option>
<name>ExePath</name> <name>ExePath</name>
<state>Zintercom_Router_CC2591\Exe</state> <state>Zintercom_Router_PA2\Exe</state>
</option> </option>
<option> <option>
<name>ObjPath</name> <name>ObjPath</name>
<state>Zintercom_Router_CC2591\Obj</state> <state>Zintercom_Router_PA2\Obj</state>
</option> </option>
<option> <option>
<name>ListPath</name> <name>ListPath</name>
<state>Zintercom_Router_CC2591\List</state> <state>Zintercom_Router_PA2\List</state>
</option> </option>
<option> <option>
<name>GOutputBinary</name> <name>GOutputBinary</name>
@@ -9696,10 +9696,10 @@
<configuration>CHDTECH_DEV_Router</configuration> <configuration>CHDTECH_DEV_Router</configuration>
<configuration>Zintercom_EndDevice</configuration> <configuration>Zintercom_EndDevice</configuration>
<configuration>Zintercom_Router</configuration> <configuration>Zintercom_Router</configuration>
<configuration>Zintercom_EndDevice_CC2592</configuration> <configuration>Zintercom_EndDevice_PA1</configuration>
<configuration>Zintercom_Router_CC2592</configuration> <configuration>Zintercom_Router_PA1</configuration>
<configuration>Zintercom_EndDevice_CC2591</configuration> <configuration>Zintercom_EndDevice_PA2</configuration>
<configuration>Zintercom_Router_CC2591</configuration> <configuration>Zintercom_Router_PA2</configuration>
</excluded> </excluded>
</file> </file>
<file> <file>
@@ -9711,8 +9711,8 @@
<configuration>CHDTECH_DEV_End</configuration> <configuration>CHDTECH_DEV_End</configuration>
<configuration>CHDTECH_DEV_Router</configuration> <configuration>CHDTECH_DEV_Router</configuration>
<configuration>Zintercom_EndDevice</configuration> <configuration>Zintercom_EndDevice</configuration>
<configuration>Zintercom_EndDevice_CC2592</configuration> <configuration>Zintercom_EndDevice_PA1</configuration>
<configuration>Zintercom_EndDevice_CC2591</configuration> <configuration>Zintercom_EndDevice_PA2</configuration>
</excluded> </excluded>
</file> </file>
<file> <file>

92
Source/zcl_app.c
View File

@@ -85,6 +85,7 @@ static void zclApp_ConfigInit(bool restart);
static void zclApp_BtnClick(bool hold); static void zclApp_BtnClick(bool hold);
static void zclApp_RingRun(void); static void zclApp_RingRun(void);
static void zclApp_TalkStart(void);
static void zclApp_RingEnd(void); static void zclApp_RingEnd(void);
//static uint32 pressTime = 0; //static uint32 pressTime = 0;
@@ -132,19 +133,42 @@ static void zclApp_HandleKeys(byte portAndAction, byte keyCode) {
zclCommissioning_HandleKeys(portAndAction, keyCode); zclCommissioning_HandleKeys(portAndAction, keyCode);
if (portAndAction & 0x01) { //P0 Ring if (portAndAction & 0x01) { //P0 Ring
afAddrType_t inderect_DstAddr = {.addrMode = (afAddrMode_t)AddrNotPresent, .endPoint = 0, .addr.shortAddr = 0};
if (portAndAction & HAL_KEY_PRESS) { if (portAndAction & HAL_KEY_PRESS) {
osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_HOLD); //osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_HOLD);
//LREPMaster("Ring start\r\n");
//HalLedSet(LED_PIN, HAL_LED_MODE_BLINK);
//zclGeneral_SendOnOff_CmdOn(zclApp_FirstEP.EndPoint, &inderect_DstAddr, FALSE, bdb_getZCLFrameCounter());
//osal_start_reload_timer(zclApp_TaskID, APP_RING_RUN_EVT, 500);
//osal_start_reload_timer(zclApp_TaskID, APP_RING_RUN_EVT, 500); //start ring
//exit old stop timer
//osal_stop_timerEx(zclApp_TaskID, APP_RING_STOP_EVT);
//osal_clear_event(zclApp_TaskID, APP_RING_STOP_EVT);
//start ring
if (zclApp_State.RingRunStep == 0) {
LREPMaster("Ring start\r\n"); LREPMaster("Ring start\r\n");
HalLedSet(LED_PIN, HAL_LED_MODE_BLINK); HalLedSet(LED_PIN, HAL_LED_MODE_BLINK);
zclGeneral_SendOnOff_CmdOn(zclApp_FirstEP.EndPoint, &inderect_DstAddr, FALSE, bdb_getZCLFrameCounter()); zclApp_State.RingRunStep = 1;
osal_start_reload_timer(zclApp_TaskID, APP_RING_RUN_EVT, 500); osal_start_reload_timer(zclApp_TaskID, APP_RING_RUN_EVT, 500);
afAddrType_t inderect_DstAddr = {.addrMode = (afAddrMode_t)AddrNotPresent, .endPoint = 0, .addr.shortAddr = 0};
zclGeneral_SendOnOff_CmdOn(zclApp_FirstEP.EndPoint, &inderect_DstAddr, FALSE, bdb_getZCLFrameCounter());
} }
if (portAndAction & HAL_KEY_RELEASE) {
zclApp_RingEnd(); //start new stop timer (ring ends timer)
zclGeneral_SendOnOff_CmdOff(zclApp_FirstEP.EndPoint, &inderect_DstAddr, FALSE, bdb_getZCLFrameCounter()); //osal_start_reload_timer(zclApp_TaskID, APP_RING_STOP_EVT, 1000);
osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_CONSERVE);
//osal_start_reload_timer(zclApp_TaskID, APP_RING_RUN_EVT, 1000); //stop ring after 1s of inactive
} }
//if (portAndAction & HAL_KEY_RELEASE) {
//zclApp_RingEnd();
//zclGeneral_SendOnOff_CmdOff(zclApp_FirstEP.EndPoint, &inderect_DstAddr, FALSE, bdb_getZCLFrameCounter());
//osal_pwrmgr_task_state(zclApp_TaskID, PWRMGR_CONSERVE);
//}
} }
@@ -227,6 +251,17 @@ uint16 zclApp_event_loop(uint8 task_id, uint16 events) {
return (events ^ APP_RING_RUN_EVT); return (events ^ APP_RING_RUN_EVT);
} }
if (events & APP_RING_STOP_EVT) {
LREPMaster("APP_RING_STOP_EVT\r\n");
zclApp_RingEnd();
return (events ^ APP_RING_STOP_EVT);
}
if (events & APP_TALK_START_EVT) {
LREPMaster("APP_TALK_START_EVT\r\n");
zclApp_TalkStart();
return (events ^ APP_TALK_START_EVT);
}
if (events & APP_BTN_HOLD_EVT) { if (events & APP_BTN_HOLD_EVT) {
LREPMaster("APP_BTN_HOLD_EVT\r\n"); LREPMaster("APP_BTN_HOLD_EVT\r\n");
@@ -248,16 +283,14 @@ static void zclApp_RingRun(void) {
zclApp_OneReport(); zclApp_OneReport();
if (zclApp_Config.ModeOpen == Drop){ if (zclApp_Config.ModeOpen == Drop){
zclApp_State.State = Droped; zclApp_State.State = Droped;
HalLedSet(CATCH_PIN, HAL_LED_MODE_ON); zclApp_TalkStart();
} }
break; break;
case Ring: case Ring:
if ((zclApp_Config.ModeOpen == Once) || (zclApp_Config.ModeOpen == Always)){ if ((zclApp_Config.ModeOpen == Once) || (zclApp_Config.ModeOpen == Always)){
if (zclApp_State.RingRunStep > (zclApp_Config.TimeRing * 2)) { if (zclApp_State.RingRunStep > (zclApp_Config.TimeRing * 2)) {
zclApp_State.State = Talk; zclApp_State.State = Talk;
HalLedSet(CATCH_PIN, HAL_LED_MODE_ON); zclApp_TalkStart();
HalLedSet(ANSWER_PIN, HAL_LED_MODE_ON);
zclApp_OneReport();
} }
} }
break; break;
@@ -265,7 +298,7 @@ static void zclApp_RingRun(void) {
if ((zclApp_Config.ModeOpen == Once) || (zclApp_Config.ModeOpen == Always)){ if ((zclApp_Config.ModeOpen == Once) || (zclApp_Config.ModeOpen == Always)){
if (zclApp_State.RingRunStep > ((zclApp_Config.TimeRing + zclApp_Config.TimeTalk) * 2)) { if (zclApp_State.RingRunStep > ((zclApp_Config.TimeRing + zclApp_Config.TimeTalk) * 2)) {
zclApp_State.State = Open; zclApp_State.State = Open;
HalLedSet(OPEN_PIN, HAL_LED_MODE_ON); HalLedSet(ANSWER_PIN, HAL_LED_MODE_OFF);
zclApp_OneReport(); zclApp_OneReport();
} }
} }
@@ -281,7 +314,6 @@ static void zclApp_RingRun(void) {
switch (zclApp_State.RingRunStep) { switch (zclApp_State.RingRunStep) {
case 2: case 2:
zclApp_OneReport(); zclApp_OneReport();
HalLedSet(ANSWER_PIN, HAL_LED_MODE_ON);
break; break;
case 3: case 3:
zclApp_RingEnd(); zclApp_RingEnd();
@@ -292,17 +324,37 @@ static void zclApp_RingRun(void) {
} }
static void zclApp_TalkStart(void) {
LREPMaster("Talk start\r\n");
HalLedSet(ANSWER_PIN, HAL_LED_MODE_ON);
if (zclApp_Config.ModeSound == true) {
HalLedSet(HANDSET_PIN, HAL_LED_MODE_ON);
}
else {
HalLedSet(CATCH_PIN, HAL_LED_MODE_OFF);
}
}
static void zclApp_RingEnd(void) { static void zclApp_RingEnd(void) {
LREPMaster("Ring end\r\n"); LREPMaster("Ring end\r\n");
if (zclApp_Config.ModeSound == true) { if (zclApp_Config.ModeSound == true) {
HalLedSet(CATCH_PIN, HAL_LED_MODE_OFF); 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); HalLedSet(ANSWER_PIN, HAL_LED_MODE_OFF);
HalLedSet(OPEN_PIN, HAL_LED_MODE_OFF);
osal_stop_timerEx(zclApp_TaskID, APP_RING_RUN_EVT); osal_stop_timerEx(zclApp_TaskID, APP_RING_RUN_EVT);
osal_clear_event(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; zclApp_State.RingRunStep = 0;
zclApp_State.State = Idle; zclApp_State.State = Idle;
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) { if (zclApp_Config.ModeOpen == Once) {
zclApp_Config.ModeOpen = Never; zclApp_Config.ModeOpen = Never;
} }
@@ -391,12 +443,16 @@ static void zclApp_ConfigInit(bool restart) {
uint32 ReportInterval = (uint32)zclApp_Config.TimeReport * (uint32)60; uint32 ReportInterval = (uint32)zclApp_Config.TimeReport * (uint32)60;
LREP("Start report with interval %d seconds\r\n", ReportInterval); 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_reload_timer(zclApp_TaskID, APP_REPORT_EVT, ((uint32)ReportInterval*(uint32)1000));
if (zclApp_Config.ModeSound == false) {
HalLedSet(CATCH_PIN, HAL_LED_MODE_ON); if (zclApp_Config.ModeSound == true) {
} HalLedSet(HANDSET_PIN, HAL_LED_MODE_OFF);
else {
HalLedSet(CATCH_PIN, HAL_LED_MODE_OFF); HalLedSet(CATCH_PIN, HAL_LED_MODE_OFF);
} }
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) { static void zclApp_RestoreAttributesFromNV(void) {

4
Source/zcl_app.h
View File

@@ -22,6 +22,8 @@ extern "C" {
#define APP_BTN_CLICK_EVT 0x0004 #define APP_BTN_CLICK_EVT 0x0004
#define APP_RING_RUN_EVT 0x0008 #define APP_RING_RUN_EVT 0x0008
#define APP_BTN_HOLD_EVT 0x0010 #define APP_BTN_HOLD_EVT 0x0010
#define APP_RING_STOP_EVT 0x0012
#define APP_TALK_START_EVT 0x0014
/********************************************************************* /*********************************************************************
* MACROS * MACROS
@@ -56,7 +58,7 @@ extern "C" {
#define LED_PIN HAL_LED_1 #define LED_PIN HAL_LED_1
#define CATCH_PIN HAL_LED_2 #define CATCH_PIN HAL_LED_2
#define ANSWER_PIN HAL_LED_3 #define ANSWER_PIN HAL_LED_3
#define OPEN_PIN HAL_LED_4 #define HANDSET_PIN HAL_LED_4
#define TIMER_RESTART TRUE #define TIMER_RESTART TRUE
#define TIMER_START FALSE #define TIMER_START FALSE