From 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 19 Jun 2024 17:25:45 +0800
Subject: [PATCH] 增加OTA协议

---
 Function/POWER_MANAGE/power_manage.c |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Function/POWER_MANAGE/power_manage.c b/Function/POWER_MANAGE/power_manage.c
index 136e81c..8ef2462 100644
--- a/Function/POWER_MANAGE/power_manage.c
+++ b/Function/POWER_MANAGE/power_manage.c
@@ -69,7 +69,7 @@
 void borrow_Pwr_GPIO_Clk_Init(void)
 {
 	CMU_PERCLK_SetableEx(PADCLK, ENABLE);  //PADʱ�ӣ�GPIO��ʹ�ܺ���
-	InputtIO( BORROW_PWR_PORT, BORROW_PWR_PIN, IN_NORMAL);
+	OutputIO( BORROW_PWR_PORT, BORROW_PWR_PIN, OUT_PUSHPULL);
 }
 
 
@@ -396,13 +396,18 @@
 	}
 	
 	//������ȷ��
-	if(pwr_vol_p->alka_lose_check_flag == SET){
-		pwr_vol_p->alka_lose_check_flag = RESET;
+//	if(pwr_vol_p->alka_lose_check_flag == SET){      //��ʱû���жϴ�����ע�͵�
+//		pwr_vol_p->alka_lose_check_flag = RESET;
 		if(ALKA_PWR_LOSE_IO_READ == Bit_RESET){
-			//ȷ��﮵����
-			__SYS_STATUS_ALARM_BYTES_SET(alka_remove,ALARM_ID_ALKA_BAT_REMOVAL);
+			delay_ms(10);
+			if(ALKA_PWR_LOSE_IO_READ == Bit_RESET){
+				//ȷ��﮵����
+				__SYS_STATUS_ALARM_BYTES_SET(alka_remove,ALARM_ID_ALKA_BAT_REMOVAL);
+			}
+		}else{
+			__SYS_STATUS_BYTES_STATUS(alka_remove, RESET, ALARM_ID_ALKA_BAT_REMOVAL);
 		}
-	}
+//	}
 	
 	
 	
@@ -488,9 +493,14 @@
 				GPIO_EXTI_Init( HWIDO_EX_PWR_PORT, HWIDO_EX_PWR_PIN, EXTI_RISING, ENABLE);
 				
 				up_comm_uart_enable();//���ʱʹ����λ������
+				uart_ctrl_para_g.UP_COMM_rxto_flag = RESET;
 				lcd_first_wake_up_flag_g = SET;  //�����������Ļ�����ֳ���
 				
-				//?������仯��������籨�����⴦������ֻ�����������أ�����ʾ������
+				//���ر�
+				borrow_Pwr_GPIO_Clk_Init();
+				BORROW_PWR_OFF;
+				
+				//������仯��������籨�����⴦������ֻ�����������أ�����ʾ������
 				if(__SYS_ALARM_CTL_BYTES_GET(power_state)){                   
 					if(__SYS_ALARM_REPORT_CTL_BYTES_GET(power_state) ==SET){ 				
 						if(AlarmCntIncrease(ALARM_ID_EX_POWER_STATUS_CHANGE) ==SET){														
@@ -506,7 +516,8 @@
 	{
 		GPIO_EXTI_Init( HWIDO_EX_PWR_PORT, HWIDO_EX_PWR_PIN, EXTI_RISING, DISABLE);
 		EX_PWR_OFF;
-		//?������仯��������籨�����⴦���Ƴ����������뷧�أ�����ʾ������
+		pwr_vol_p->ex_pwr_in_cnt = 0;
+		//������仯��������籨�����⴦���Ƴ����������뷧�أ�����ʾ������
 		if(__SYS_STATUS_BYTES_GET(power_state) ==SET){
 			__SYS_STATUS_BYTES_STATUS(power_state, RESET, ALARM_ID_NORMAL);//��״̬�����뱨����ʾ
 			if(__SYS_ALARM_CTL_BYTES_GET(power_state)){

--
Gitblit v1.9.3