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

modify RGB

Browse Source
This commit is contained in:
Utyf
2022-02-23 19:20:53 +03:00
parent 6fe29470ec
commit 17ee0a7588
3 changed files with 72 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Source/hal_board_cfg.h
View File

@@ -81,6 +81,21 @@
#define LED4_SBIT P0_4 #define LED4_SBIT P0_4
#define LED4_DDR P0DIR #define LED4_DDR P0DIR
#define LED4_POLARITY ACTIVE_HIGH #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) #elif defined(HAL_BOARD_CHDTECH_DEV)
//blue//d3 //blue//d3
@@ -99,12 +114,31 @@
#define LED3_DDR P1DIR #define LED3_DDR P1DIR
#define LED3_POLARITY ACTIVE_LOW #define LED3_POLARITY ACTIVE_LOW
//ex //ex
#define LED4_BV BV(5) #define LED4_BV BV(4)
#define LED4_SBIT P1_5 #define LED4_SBIT P0_4
#define LED4_DDR P1DIR #define LED4_DDR P0DIR
#define LED4_POLARITY ACTIVE_LOW #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 #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
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------

57
Source/zcl_app.c
View File

@@ -134,8 +134,15 @@ void zclApp_Init(byte task_id) {
} }
static void zclApp_ControlPinsInit (void) { static void zclApp_ControlPinsInit (void) {
P0SEL &= ~0x0E; //Set P0_1, P0_2, P0_3 as general I/O port functions CATCH_SSR &= ~CATCH_BV; // Set PIN as general I/O port functions
P0DIR |= 0x0E; //Set the port transmission mode of P0_1, P0_2, P0_3 to output 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 P0SEL &= ~0x01; // Set P0_0 as general I/O port function
P0DIR &= ~0x01; // Set the port transmission mode of P0_0 to input 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 // ? P0INP &= ~0x01; //Set the port input mode of P0_0 to: pull up/down
@@ -305,7 +312,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;
ANSWER_O_PIN = 0; ANSWER_PIN = 0;
zclApp_OneReport(); zclApp_OneReport();
} }
} }
@@ -331,20 +338,20 @@ static void zclApp_RingRun(void) {
static void zclApp_TalkStart(void) { static void zclApp_TalkStart(void) {
LREPMaster("Talk start\r\n"); LREPMaster("Talk start\r\n");
zclApp_OneReport(); zclApp_OneReport();
ANSWER_O_PIN = 1; ANSWER_PIN = 1;
if (zclApp_Config.ModeSound == true) { if (zclApp_Config.ModeSound == true) {
HANDSET_O_PIN = 1; HANDSET_PIN = 1;
} }
else { else {
CATCH_O_PIN = 0; CATCH_PIN = 0;
} }
} }
static void zclApp_RingEnd(void) { static void zclApp_RingEnd(void) {
LREPMaster("Ring end\r\n"); LREPMaster("Ring end\r\n");
CATCH_O_PIN = !zclApp_Config.ModeSound; CATCH_PIN = !zclApp_Config.ModeSound;
HANDSET_O_PIN = !zclApp_Config.ModeSound; HANDSET_PIN = !zclApp_Config.ModeSound;
ANSWER_O_PIN = 0; ANSWER_PIN = 0;
osal_stop_timerEx(zclApp_TaskID, APP_RING_RUN_EVT); osal_stop_timerEx(zclApp_TaskID, APP_RING_RUN_EVT);
zclApp_State.RingRunStep = 0; zclApp_State.RingRunStep = 0;
zclApp_State.State = Idle; zclApp_State.State = Idle;
@@ -366,28 +373,28 @@ static void zclApp_RingEnd(void) {
static void zclApp_WorkWithLEDs(void) { static void zclApp_WorkWithLEDs(void) {
if (zclApp_Config.ModeOpen == Always) { if (zclApp_Config.ModeOpen == Always) {
HalLedSet(GREEN_LED_PIN, HAL_LED_MODE_ON); HalLedSet(GREEN_LED, HAL_LED_MODE_ON);
} }
if (zclApp_Config.ModeOpen != Always) { if (zclApp_Config.ModeOpen != Always) {
HalLedSet(GREEN_LED_PIN, HAL_LED_MODE_OFF); HalLedSet(GREEN_LED, HAL_LED_MODE_OFF);
} }
if (zclApp_Config.ModeOpen == Once) { if (zclApp_Config.ModeOpen == Once) {
HalLedSet(GREEN_LED_PIN, HAL_LED_MODE_BLINK); //FLASH HalLedBlink(GREEN_LED, 0, 90, 1000);
} }
if (zclApp_Config.ModeOpen == Drop) { if (zclApp_Config.ModeOpen == Drop) {
HalLedSet(RED_LED_PIN, HAL_LED_MODE_ON); HalLedSet(RED_LED, HAL_LED_MODE_ON);
} }
if (zclApp_Config.ModeOpen != Drop) { if (zclApp_Config.ModeOpen != Drop) {
HalLedSet(RED_LED_PIN, HAL_LED_MODE_OFF); HalLedSet(RED_LED, HAL_LED_MODE_OFF);
} }
if (zclApp_State.State != Idle) { if (zclApp_State.State != Idle) {
HalLedSet(RED_LED_PIN, HAL_LED_MODE_BLINK); HalLedBlink(RED_LED, 0, 90, 1000);
} }
if (zclApp_Config.ModeSound == true) { if (zclApp_Config.ModeSound == true) {
HalLedSet(BLUE_LED_PIN, HAL_LED_MODE_OFF); HalLedSet(BLUE_LED, HAL_LED_MODE_OFF);
} }
else { else {
HalLedSet(BLUE_LED_PIN, HAL_LED_MODE_ON); HalLedSet(BLUE_LED, HAL_LED_MODE_ON);
} }
osal_start_timerEx(zclApp_TaskID, APP_WORK_LED_EVT, 1000); osal_start_timerEx(zclApp_TaskID, APP_WORK_LED_EVT, 1000);
} }
@@ -414,8 +421,8 @@ static void zclApp_BtnClicks(byte count) {
LREPMaster("Button double\r\n"); LREPMaster("Button double\r\n");
if (zclApp_State.State == Idle) { if (zclApp_State.State == Idle) {
zclApp_Config.ModeSound = !zclApp_Config.ModeSound; zclApp_Config.ModeSound = !zclApp_Config.ModeSound;
HANDSET_O_PIN = !zclApp_Config.ModeSound; HANDSET_PIN = !zclApp_Config.ModeSound;
CATCH_O_PIN = !zclApp_Config.ModeSound; CATCH_PIN = !zclApp_Config.ModeSound;
zclApp_OneReport(); zclApp_OneReport();
} }
break; break;
@@ -423,8 +430,8 @@ static void zclApp_BtnClicks(byte count) {
LREPMaster("Button hold\r\n"); LREPMaster("Button hold\r\n");
if (zclApp_State.State == Idle) { if (zclApp_State.State == Idle) {
zclApp_Config.ModeSound = true; zclApp_Config.ModeSound = true;
HANDSET_O_PIN = !zclApp_Config.ModeSound; HANDSET_PIN = !zclApp_Config.ModeSound;
CATCH_O_PIN = !zclApp_Config.ModeSound; CATCH_PIN = !zclApp_Config.ModeSound;
zclApp_Config.ModeOpen = Never; zclApp_Config.ModeOpen = Never;
zclApp_OneReport(); zclApp_OneReport();
} }
@@ -442,7 +449,7 @@ static void zclApp_Report(void) {
} }
static void zclApp_OneReport(void) { static void zclApp_OneReport(void) {
//HalLedSet(BLUE_LED_PIN, HAL_LED_MODE_BLINK); //HalLedSet(BLUE_LED, HAL_LED_MODE_BLINK);
bdb_RepChangedAttrValue(zclApp_FirstEP.EndPoint, ZCL_INTERCOM, ATTRID_STATE); 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_MODEOPEN);
#if !defined( ZIC_BATTERY_MODE ) #if !defined( ZIC_BATTERY_MODE )
@@ -478,9 +485,9 @@ static void zclApp_ConfigInit(bool restart) {
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));
HANDSET_O_PIN = !zclApp_Config.ModeSound; HANDSET_PIN = !zclApp_Config.ModeSound;
CATCH_O_PIN = !zclApp_Config.ModeSound; CATCH_PIN = !zclApp_Config.ModeSound;
ANSWER_O_PIN = 0; ANSWER_PIN = 0;
} }
static void zclApp_RestoreAttributesFromNV(void) { static void zclApp_RestoreAttributesFromNV(void) {

9
Source/zcl_app.h
View File

@@ -58,15 +58,6 @@ extern "C" {
#define ATTRID_TIMEBELL 0x0057 #define ATTRID_TIMEBELL 0x0057
#define ATTRID_TIMEREPORT 0x0056 #define ATTRID_TIMEREPORT 0x0056
#define BLUE_LED_PIN HAL_LED_1
#define GREEN_LED_PIN HAL_LED_2
#define RED_LED_PIN HAL_LED_3
#define OLDLED_PIN HAL_LED_4
#define CATCH_O_PIN P0_1
#define ANSWER_O_PIN P0_2
#define HANDSET_O_PIN P0_3
#define TIMER_RESTART TRUE #define TIMER_RESTART TRUE
#define TIMER_START FALSE #define TIMER_START FALSE