From fa6053f85287163f6e2d5dba690bec05cbc95f4a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 07 Jun 2024 17:00:49 +0800
Subject: [PATCH] 增加阀控事件记录及修改阀控命令
---
Function/POWER_MANAGE/power_manage.c | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Function/POWER_MANAGE/power_manage.c b/Function/POWER_MANAGE/power_manage.c
index 136e81c..a06ed1b 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,7 +493,12 @@
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)){
@@ -506,6 +516,7 @@
{
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);//��״̬�����뱨����ʾ
--
Gitblit v1.9.3