From e61d1595ebb1fa76b499cddec2df4bd66ec92b97 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 20 May 2024 20:02:47 +0800
Subject: [PATCH] 继续完善
---
Function/POWER_MANAGE/power_manage.h | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/Function/POWER_MANAGE/power_manage.h b/Function/POWER_MANAGE/power_manage.h
index 3226d1e..990dea6 100644
--- a/Function/POWER_MANAGE/power_manage.h
+++ b/Function/POWER_MANAGE/power_manage.h
@@ -8,28 +8,30 @@
// ����������־λ���
#define __VCC_PARA_FLAG_CLEAR_(__HANDLE__) ((&pwr_vol_g)->__HANDLE__ = RESET)
-// ﮵�͵�/����
-#define LITH_PWR_LOSE_PORT GPIOF
-#define LITH_PWR_LOSE_PIN GPIO_Pin_11
+// ﮵綪ʧ
+#define LITH_PWR_LOSE_PORT GPIOD
+#define LITH_PWR_LOSE_PIN GPIO_Pin_0
+#define LITH_PWR_LOSE_IO_READ GPIO_ReadInputDataBit(LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN)
// ﮵����
-#define LITHIUM_DETECTION_PORT GPIOF
-#define LITHIUM_DETECTION_PIN GPIO_Pin_3
+#define LITH_DETECTION_PORT GPIOF
+#define LITH_DETECTION_PIN GPIO_Pin_3
-#define LIT_DEC_ON GPIO_SetBits(LITHIUM_DETECTION_PORT,LITHIUM_DETECTION_PIN)
-#define LIT_DEC_OFF GPIO_ResetBits(LITHIUM_DETECTION_PORT,LITHIUM_DETECTION_PIN)
+#define LIT_DEC_ON GPIO_SetBits(LITH_DETECTION_PORT,LITH_DETECTION_PIN)
+#define LIT_DEC_OFF GPIO_ResetBits(LITH_DETECTION_PORT,LITH_DETECTION_PIN)
// ��綪ʧ
-#define ALKALI_PWR_LOSE_PORT GPIOH
-#define ALKALI_PWR_LOSE_PIN GPIO_Pin_0
+#define ALKA_PWR_LOSE_PORT GPIOF
+#define ALKA_PWR_LOSE_PIN GPIO_Pin_11
+#define ALKA_PWR_LOSE_IO_READ GPIO_ReadInputDataBit(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN)
// ������
-#define ALKALI_DETECTION_PORT GPIOF
-#define ALKALI_DETECTION_PIN GPIO_Pin_4
+#define ALKA_DETECTION_PORT GPIOF
+#define ALKA_DETECTION_PIN GPIO_Pin_4
-#define ALK_DEC_ON GPIO_SetBits(ALKALI_DETECTION_PORT,ALKALI_DETECTION_PIN)
-#define ALK_DEC_OFF GPIO_ResetBits(ALKALI_DETECTION_PORT,ALKALI_DETECTION_PIN)
+#define ALK_DEC_ON GPIO_SetBits(ALKA_DETECTION_PORT,ALKA_DETECTION_PIN)
+#define ALK_DEC_OFF GPIO_ResetBits(ALKA_DETECTION_PORT,ALKA_DETECTION_PIN)
// ���
@@ -90,12 +92,13 @@
AMS_PERIOD,
AMS_KEY,
AMS_WRC_BEFORE,
+ AMS_VALVE_CTRL_BEFORE
}ALKA_MEASURE_STATUS;
typedef enum
{
BAT_V_NONE, //��״̬
- BAT_V_LOSE, //��ʧ��������ѹ���ͣ���Ϊ��ض�ʧ
+// BAT_V_LOSE, //��ʧ��������ѹ���ͣ���Ϊ��ض�ʧ
BAT_V_DOWN, //Ƿѹ
BAT_V_LOW, //�͵�
}BAT_V_STATUS;
@@ -119,6 +122,8 @@
LITH_MEASURE_STATUS lith_flag; //����������־λ
ALKA_MEASURE_STATUS alka_flag;
FlagStatus mcu_temp_flag; //mcu�¶ȱ�־λ
+ FlagStatus lith_lose_check_flag; //����﮵�������־
+ FlagStatus alka_lose_check_flag; //�������������־
float lith_vcc;
BAT_V_STATUS lith_vcc_status;
float alka_vcc;
@@ -126,11 +131,18 @@
float mcu_temperature;
int8_t lith_vcc_per; //���ݵ�ѹ����İٷֱ�
int8_t lith_remain_use_time_per; //����ʹ��ʱ������ʣ��ٷֱ�
+ int8_t lith_synthesize_per; //���ݵ�ѹ��ʹ��ʱ��ϳɵİٷֱȣ����ն�������İٷֱ�
+
+ int8_t alka_vcc_per; //���ݵ�ѹ����İٷֱ�
+
+ int8_t ex_pwr_in_cnt; //��������������
+ int8_t ex_pwr_out_cnt; //��粻������������
+
}PWR_VOL_T;
-extern uint8_t sys_bst_flag;
+
extern uint8_t first_power_get_cnt_g;
--
Gitblit v1.9.3