From 6c7e61a54ef9b96f79704f0b965664e89f57dd52 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 29 May 2024 17:41:52 +0800
Subject: [PATCH] 增加休眠，开始上板测试
---
HARDWARE/EXTI/exti.c | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index 1025637..549c290 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -13,6 +13,8 @@
#include "pulse_and_alarm_line.h"
#include "tim.h"
#include "wireless_remote_comm.h"
+#include "main.h"
+#include "lcd.h"
void NMI_Handler(void)
{
@@ -31,6 +33,7 @@
{
// if(__SYS_DELAY_SEC_FLAG_GET(sys_active_time) == SET && LargeCurrent_LimitingProcess() == 3)
SysWakeUp_ClockCfg();
+
if(GPIO_EXTI_EXTIISR_ChkEx(EXT_RTC_INT_PORT, EXT_RTC_INT_PIN) == SET) //RTC�ж�
{
GPIO_EXTI_EXTIISR_ClrEx(EXT_RTC_INT_PORT, EXT_RTC_INT_PIN);
@@ -67,12 +70,12 @@
if(KEY1_IO_READ==Bit_RESET)
{
- if(KEY3_IO_READ==Bit_RESET)
+ if((KEY3_IO_READ==Bit_RESET)&&(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0))
{
//����
if(__SYS_STATUS_BYTES_GET(account_state) == RESET ||__SYS_STATUS_BYTES_GET(valve_lock) == RESET )
ValveCtrlOrder(VC_OPEN);
- }else if(KEY2_IO_READ==Bit_RESET)
+ }else if((KEY2_IO_READ==Bit_RESET)&&(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0))
{
//�ط�
if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
@@ -80,7 +83,8 @@
}else
{
//������Դ
-
+ __SYS_DELAY_SEC_TIME_SET_(sys_active_time,SYS_WAKE_UP_TIME);
+ lcd_wake_up_flag_g = 1;
}
}
@@ -91,7 +95,10 @@
GPIO_EXTI_EXTIISR_ClrEx(KEY2_PORT, KEY2_PIN);
if(KEY2_IO_READ==Bit_RESET)
{
-
+ lcd_wake_up_flag_g = 1;
+ if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0){ //��������ⰴ�����ü���ʱ��
+ __SYS_DELAY_SEC_TIME_SET_(sys_active_time,SYS_WAKE_UP_TIME);
+ }
}
}
@@ -105,15 +112,22 @@
//�ɼ����������ݲ������ϱ�
start_rs485_g = RS485_START_REASON_KEY;
start_wrc_g = WRC_MEANS_KEY;
+ }else{
+ lcd_wake_up_flag_g = 1;
}
+
+ if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0){ //��������ⰴ�����ü���ʱ��
+ __SYS_DELAY_SEC_TIME_SET_(sys_active_time,SYS_WAKE_UP_TIME);
+ }
+
}
}
- if(GPIO_EXTI_EXTIISR_ChkEx(KEY4_PORT, KEY4_PIN) == SET) //key4�ж�
- {
- GPIO_EXTI_EXTIISR_ClrEx(KEY4_PORT, KEY4_PIN);
+// if(GPIO_EXTI_EXTIISR_ChkEx(KEY4_PORT, KEY4_PIN) == SET) //key4�ж�
+// {
+// GPIO_EXTI_EXTIISR_ClrEx(KEY4_PORT, KEY4_PIN);
- }
+// }
if(GPIO_EXTI_EXTIISR_ChkEx(Motor_OP_PORT, Motor_OP_PIN) == SET) //���ſ���λ�ж�
{
@@ -158,13 +172,34 @@
if(((flow_meter_para_g.broken_line_multiplex & BROKEN_LINE_MUTIPLEX_PULSE)!=BROKEN_LINE_MUTIPLEX_PULSE)&& \
((flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_PULSE)||(flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_RS485_AND_PULSE))){
pulse_exti_flag = SET;
- BTx_CR1_CHEN_Setable(BT1,ENABLE); //������ʱ��
-
+ BTx_CR1_CHEN_Setable(BT1,ENABLE); //������ʱ��
}
+ }
+
+ if(GPIO_EXTI_EXTIISR_ChkEx(HWIDO_EX_PWR_PORT, HWIDO_EX_PWR_PIN) == SET) //����Ƴ��ж�
+ {
+ GPIO_EXTI_EXTIISR_ClrEx(HWIDO_EX_PWR_PORT, HWIDO_EX_PWR_PIN);
+ //����Ƴ��������ر�������
+ EX_PWR_OFF;
+// __SYS_STATUS_BYTES_STATUS(power_state, RESET, ALARM_ID_NORMAL);
}
+ if(GPIO_EXTI_EXTIISR_ChkEx(LIMIT_TRIGGER_PORT, LIMIT_TRIGGER_PIN) == SET) //��������
+ {
+ GPIO_EXTI_EXTIISR_ClrEx(LIMIT_TRIGGER_PORT, LIMIT_TRIGGER_PIN);
+ //��¼��������ʱ����Ϣ
+ arrayA_2_arrayB((uint8_t *)&sys_clockBCD_g.year,&limit_trigger_record_para_g.record_time_BCD.year,sizeof(sys_clockBCD_g),LITTLE_ENDIAN);
+ limit_trigger_record_para_g.trigger_times ++;
+ limit_trigger_record_para_g.RS485_running_flag = sys_fun_run_ctrl_g.rs485_ctrl_flag.running_flag;
+ limit_trigger_record_para_g.valve_running_flag = sys_fun_run_ctrl_g.valve_ctrl_flag.running_flag;
+ limit_trigger_record_para_g.wrc_running_flag = sys_fun_run_ctrl_g.wrc_ctrl_flag.running_flag;
+ limit_trigger_record_para_g.EXPWR_check_status = HWIDO_EX_PWR_IO_READ;
+ limit_trigger_record_para_g.EXPWR_ctrl_status = __SYS_STATUS_BYTES_GET(power_state);
+ }
+
+
// if(GPIO_EXTI_EXTIISR_ChkEx(VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN) == SET)
// {
// GPIO_EXTI_EXTIISR_ClrEx(VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN);
--
Gitblit v1.9.3