From a12102b90bda2f409babc8c241bfc66118a8cb70 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 25 Apr 2024 20:01:19 +0800
Subject: [PATCH] 继续完善485采集
---
HARDWARE/EXTI/exti.c | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index c70941b..409b592 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -5,7 +5,7 @@
#include "eeprom.h"
#include "extern_rtc.h"
#include "system_general_para.h"
-
+#include "key.h"
@@ -26,12 +26,84 @@
{
// 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)
+ 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);
sys_run_period = SET;
+
+ // �ж�ϵͳ����ʱ���Ƿ����
+ if (sys_delay_sec_para_g.sys_active_time.delay_time)
+ {
+ if (!(--sys_delay_sec_para_g.sys_active_time.delay_time))
+ {
+ sys_delay_sec_para_g.sys_active_time.delay_flag = SET;
+ }
+ }
+
+ // �ж�GPRS��ʱʱ��
+ if (sys_delay_sec_para_g.gprs_timeout_para.delay_time)
+ {
+ if (!(--sys_delay_sec_para_g.gprs_timeout_para.delay_time))
+ sys_delay_sec_para_g.gprs_timeout_para.delay_flag = SET;
+ }
+
}
+
+ if(GPIO_EXTI_EXTIISR_ChkEx(KEY1_PORT, KEY1_PIN) == SET) //key1�ж�,��Դ
+ {
+ GPIO_EXTI_EXTIISR_ClrEx(KEY1_PORT, KEY1_PIN);
+
+ if(KEY1_IO_READ==Bit_RESET)
+ {
+ if(KEY3_IO_READ==Bit_RESET)
+ {
+ //����
+
+ }else if(KEY2_IO_READ==Bit_RESET)
+ {
+ //�ط�
+
+ }else
+ {
+ //������Դ
+
+ }
+
+ }
+ }
+
+ if(GPIO_EXTI_EXTIISR_ChkEx(KEY2_PORT, KEY2_PIN) == SET) //key2�ж�
+ {
+ GPIO_EXTI_EXTIISR_ClrEx(KEY2_PORT, KEY2_PIN);
+ if(KEY2_IO_READ==Bit_RESET)
+ {
+
+ }
+ }
+
+ if(GPIO_EXTI_EXTIISR_ChkEx(KEY3_PORT, KEY3_PIN) == SET) //key3�ж�
+ {
+ GPIO_EXTI_EXTIISR_ClrEx(KEY3_PORT, KEY3_PIN);
+ if(KEY3_IO_READ==Bit_RESET)
+ {
+ if(KEY2_IO_READ==Bit_RESET)
+ {
+ //�ɼ����������ݲ������ϱ�
+
+
+ }
+ }
+ }
+
+ if(GPIO_EXTI_EXTIISR_ChkEx(KEY4_PORT, KEY4_PIN) == SET) //key4�ж�
+ {
+ GPIO_EXTI_EXTIISR_ClrEx(KEY4_PORT, KEY4_PIN);
+
+ }
+
+
+
// 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