From 65062d0d5b21f838aa0043a15ce54cfab8d72c43 Mon Sep 17 00:00:00 2001
From: wujiazhi <1147861305@qq.com>
Date: Tue, 11 Jun 2024 14:23:53 +0800
Subject: [PATCH] 1.Fixed communication failure between MCU and wireless module 2.Fix the wrong judgment of alkaline lithium power

---
 HARDWARE/EXTI/exti.c |   65 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/HARDWARE/EXTI/exti.c b/HARDWARE/EXTI/exti.c
index 7ee62b0..f0dd5b6 100644
--- a/HARDWARE/EXTI/exti.c
+++ b/HARDWARE/EXTI/exti.c
@@ -2,28 +2,29 @@
 #include "key.h"
 #include "gpio.h"
 #include "uart.h"
-#include "eeprom.h"
-
-
-
-
+#include "e2p.h"
+#include "valve_control.h"
+#include "power_manage.h"
+#include "lcd.h"
+#include "master_slave_inter.h"
+#include "low_pwr_test.h"
 
 
 void NMI_Handler(void)
 {
-//	//NWKUPĬ�����ӵ���cpu��NMI���������жϣ�����NVIC���ƣ�����ȫ���ж�ʹ�ܿ��ƣ����Ѻ��Ȼ��NMI�ж�
-//	if( SET == PMU_WKFR_WKPxF_Chk(PINWKEN_PF5) )
-//	{	
-//		PMU_WKFR_WKPxF_Clr(PINWKEN_PF5);
-//		__SYS_STATUS_ALARM_BYTES_SET(uncap_state_1);
-//#ifdef RS232_PRINTF		
-//			printf("���DZ���\r\n");
-//#endif	
-//	}
+	//NWKUPĬ�����ӵ���cpu��NMI���������жϣ�����NVIC���ƣ�����ȫ���ж�ʹ�ܿ��ƣ����Ѻ��Ȼ��NMI�ж�
+	if( SET == PMU_WKFR_WKPxF_Chk(PINWKEN_PF5) )
+	{	
+		PMU_WKFR_WKPxF_Clr(PINWKEN_PF5);
+		__SYS_STATUS_ALARM_BYTES_SET(uncap_state_1);
+#ifdef RS232_PRINTF		
+			printf("���DZ���\r\n");
+#endif	
+	}
 }
 
-void GPIO_IRQHandler(void)
-{
+//void GPIO_IRQHandler(void)
+//{
 //	if(__SYS_DELAY_SEC_FLAG_GET(sys_active_time) == SET && LargeCurrent_LimitingProcess() == 3)
 //		SysWakeUp_ClockCfg();
 //	if(GPIO_EXTI_EXTIISR_ChkEx(KEYA_S1_PORT, KEYA_S1_PIN)  == SET)
@@ -93,26 +94,26 @@
 //		
 ////    pwr_vol_g.alka_flag = AMS_PERIOD; // ���������ɼ�һ�ε���
 //	}
-}
+//}
 
 void All_Exti_Init(void)
 {
-//		CMU_OPCCR1_EXTICKSEL_Set(CMU_OPCCR1_EXTICKSEL_LSCLK);//EXTI�жϲ���ʱ��ѡ��
-//    CMU_OPCCR1_EXTICKE_Setable(ENABLE);			//EXTI����ʱ��ʹ��
-//	
-//		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( 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( UNCAP_DETECTION_PORT, UNCAP_DETECTION_PIN, EXTI_RISING, ENABLE);	//PF5
+		CMU_OPCCR1_EXTICKSEL_Set(CMU_OPCCR1_EXTICKSEL_LSCLK);//EXTI�жϲ���ʱ��ѡ��
+    CMU_OPCCR1_EXTICKE_Setable(ENABLE);			//EXTI����ʱ��ʹ��
+	
+		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( 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( UNCAP_DETECTION_PORT, UNCAP_DETECTION_PIN, EXTI_RISING, ENABLE);	//PF5
 
-////		GPIO_PINWKSEL_SetEx(PINWKEN_PF5,GPIO_PINWKEN_PINWKSEL_RISING);
-////		GPIO_PINWKEN_SetableEx(PINWKEN_PF5,ENABLE);//ʹ��PB0��NWKUP1����	
+//		GPIO_PINWKSEL_SetEx(PINWKEN_PF5,GPIO_PINWKEN_PINWKSEL_RISING);
+//		GPIO_PINWKEN_SetableEx(PINWKEN_PF5,ENABLE);//ʹ��PB0��NWKUP1����	
 
-//    /*NVIC�����*/
-//    NVIC_DisableIRQ(GPIO_IRQn);
-//    NVIC_SetPriority(GPIO_IRQn,2);//�ж����ȼ�����
-//    NVIC_EnableIRQ(GPIO_IRQn);	
+    /*NVIC�����*/
+    NVIC_DisableIRQ(GPIO_IRQn);
+    NVIC_SetPriority(GPIO_IRQn,2);//�ж����ȼ�����
+    NVIC_EnableIRQ(GPIO_IRQn);	
 }
 

--
Gitblit v1.9.3