From 08b3909c40a192778719c6262bbee4745682948d Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 31 May 2024 19:15:47 +0800
Subject: [PATCH] 测试和修改了一些功能bug
---
HARDWARE/EXTI/exti.c | 104 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 46 deletions(-)
diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index cdfcff2..727ea71 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -101,38 +101,38 @@
}
}
- 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)
- {
- lcd_wake_up_flag_g = SET;
- 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(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)
- {
- //�ɼ����������ݲ������ϱ�
- start_rs485_g = RS485_START_REASON_KEY;
- start_wrc_g = WRC_MEANS_KEY;
- }else{
- lcd_wake_up_flag_g = SET;
- }
-
- 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(KEY2_PORT, KEY2_PIN) == SET) //key2�ж�
+// {
+// GPIO_EXTI_EXTIISR_ClrEx(KEY2_PORT, KEY2_PIN);
+// if(KEY2_IO_READ==Bit_RESET)
+// {
+// lcd_wake_up_flag_g = SET;
+// 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(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)
+// {
+// //�ɼ����������ݲ������ϱ�
+// start_rs485_g = RS485_START_REASON_KEY;
+// start_wrc_g = WRC_MEANS_KEY;
+// }else{
+// lcd_wake_up_flag_g = SET;
+// }
+//
+// 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�ж�
// {
@@ -140,23 +140,35 @@
// }
- if(GPIO_EXTI_EXTIISR_ChkEx(Motor_OP_PORT, Motor_OP_PIN) == SET) //���ſ���λ�ж�
+
+ if(GPIO_EXTI_EXTIISR_ChkEx(Motor_OP_PORT, Motor_OP_PIN) == SET) //���ſ��ص�λ�ź��õ�ͬһ���жϣ����Է�һ����
{
- GPIO_EXTI_EXTIISR_ClrEx(Motor_OP_PORT, Motor_OP_PIN);
-
- ValveMotorStop();//�ر�����
- save_valve_para_g.valve_status = VALVE_OPEN;
-
+ GPIO_EXTI_EXTIISR_ClrEx(Motor_OP_PORT, Motor_OP_PIN);
+
+ if(save_valve_para_g.valve_status == VALVE_OPENING){
+ if(Motor_OP_IO_READ == Bit_RESET){ //����״̬ȷ��
+ ValveMotorStop();//�ر�����
+ save_valve_para_g.valve_status = VALVE_OPEN;
+ }
+ }else if(save_valve_para_g.valve_status == VALVE_CLOSING){
+ if(Motor_CL_IO_READ == Bit_RESET){ //����״̬ȷ��
+ ValveMotorStop();//�ر�����
+ save_valve_para_g.valve_status = VALVE_CLOSE;
+ }
+ }
}
- if(GPIO_EXTI_EXTIISR_ChkEx(Motor_CL_PORT, Motor_CL_PIN) == SET) //���Źص�λ�ж�
- {
- GPIO_EXTI_EXTIISR_ClrEx(Motor_CL_PORT, Motor_CL_PIN);
-
- ValveMotorStop();//�ر�����
- save_valve_para_g.valve_status = VALVE_CLOSE;
-
- }
+
+// if(GPIO_EXTI_EXTIISR_ChkEx(Motor_CL_PORT, Motor_CL_PIN) == SET) //���Źص�λ�ж�
+// {
+// GPIO_EXTI_EXTIISR_ClrEx(Motor_CL_PORT, Motor_CL_PIN);
+// if(Motor_CL_IO_READ == Bit_RESET){ //����״̬ȷ��
+// ValveMotorStop();//�ر�����
+// save_valve_para_g.valve_status = VALVE_CLOSE;
+// }
+//
+// }
+
if(GPIO_EXTI_EXTIISR_ChkEx(LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN) == SET)
--
Gitblit v1.9.3