From d6ce00f6b68d3d1ecaf44c972909f311ac1d3bf8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 09 May 2024 19:54:54 +0800
Subject: [PATCH] 增加电源管理部分功能

---
 HARDWARE/EXTI/exti.c |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index 409b592..1b671e7 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -6,8 +6,9 @@
 #include "extern_rtc.h"
 #include "system_general_para.h"
 #include "key.h"
-
-
+#include "valve_control.h"
+#include "system_mem_para.h"
+#include "system_run_fun.h"
 
 void NMI_Handler(void)
 {
@@ -90,8 +91,8 @@
 			if(KEY2_IO_READ==Bit_RESET)			
 			{
 				//�ɼ����������ݲ������ϱ�
-				
-				
+				start_rs485_g = RS485_START_REASON_KEY;
+				start_wrc_g = WRC_MEANS_KEY;
 			}
 		}
 	}
@@ -100,6 +101,24 @@
 	{
 		GPIO_EXTI_EXTIISR_ClrEx(KEY4_PORT, KEY4_PIN);
 
+	}
+	
+	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;
+		
+	}
+	
+	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;
+		
 	}
 	
 	
@@ -133,9 +152,9 @@
 ////#endif	
 ////		}
 ////	}
-//	if(GPIO_EXTI_EXTIISR_ChkEx(LITHIUM_PWR_DOWN_PORT, LITHIUM_PWR_DOWN_PIN)  == SET)
+//	if(GPIO_EXTI_EXTIISR_ChkEx(LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN)  == SET)
 //	{
-//		GPIO_EXTI_EXTIISR_ClrEx(LITHIUM_PWR_DOWN_PORT, LITHIUM_PWR_DOWN_PIN);
+//		GPIO_EXTI_EXTIISR_ClrEx(LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN);
 //#ifdef RS232_PRINTF
 //    printf("﮵����\r\n");
 //#endif
@@ -144,9 +163,9 @@
 //		SLAVE_PWR_OFF; //�����С���ѹ���ȣ�������������ݻ��ң��Ӷ����¸��ַ�����������������Ҫ�رյ�Դ���ָ����ٿ�����
 ////    pwr_vol_g.lith_flag = LMS_PERIOD; // ���������ɼ�һ�ε���	
 //	}
-//	if(GPIO_EXTI_EXTIISR_ChkEx(ALKALI_PWR_DOWN_PORT, ALKALI_PWR_DOWN_PIN)  == SET)
+//	if(GPIO_EXTI_EXTIISR_ChkEx(ALKALI_PWR_LOSE_PORT, ALKALI_PWR_LOSE_PIN)  == SET)
 //	{
-//		GPIO_EXTI_EXTIISR_ClrEx(ALKALI_PWR_DOWN_PORT, ALKALI_PWR_DOWN_PIN);
+//		GPIO_EXTI_EXTIISR_ClrEx(ALKALI_PWR_LOSE_PORT, ALKALI_PWR_LOSE_PIN);
 //#ifdef RS232_PRINTF
 //    printf("������\r\n");
 //#endif
@@ -163,9 +182,9 @@
 //	
 //		GPIO_EXTI_Init( KEYA_S1_PORT, KEYA_S1_PIN, EXTI_FALLING, ENABLE);	//�����жϴ򿪡��½��ش��������������˲� //PD6
 //		GPIO_EXTI_Init( VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN, EXTI_RISING, ENABLE);	//PA1
-//    GPIO_EXTI_Init( LITHIUM_PWR_DOWN_PORT, LITHIUM_PWR_DOWN_PIN, EXTI_FALLING, ENABLE);	//PF11
+//    GPIO_EXTI_Init( LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);	//PF11
 ////		GPIO_EXTI_Init( LIT_PWR_UNDER_PORT, LIT_PWR_UNDER_PIN, EXTI_FALLING, ENABLE);	//PF6
-//		GPIO_EXTI_Init( ALKALI_PWR_DOWN_PORT, ALKALI_PWR_DOWN_PIN, EXTI_FALLING, ENABLE);	//PA4
+//		GPIO_EXTI_Init( ALKALI_PWR_LOSE_PORT, ALKALI_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);	//PA4
 ////		GPIO_EXTI_Init( UNCAP_DETECTION_PORT, UNCAP_DETECTION_PIN, EXTI_RISING, ENABLE);	//PF5
 
 ////		GPIO_PINWKSEL_SetEx(PINWKEN_PF5,GPIO_PINWKEN_PINWKSEL_RISING);

--
Gitblit v1.9.3