From ec1ec68ba7d175f39f5d4e066663cf29fa7c262a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 14 May 2024 19:56:10 +0800
Subject: [PATCH] 开始增加脉冲、报警线处理
---
Function/POWER_MANAGE/power_manage.h | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/Function/POWER_MANAGE/power_manage.h b/Function/POWER_MANAGE/power_manage.h
index e04f138..7899ad4 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)
// ���
@@ -43,6 +45,7 @@
#define HWIDO_EX_PWR_PORT GPIOF
#define HWIDO_EX_PWR_PIN GPIO_Pin_5
+#define HWIDO_EX_PWR_IO_READ GPIO_ReadInputDataBit(HWIDO_EX_PWR_PORT, HWIDO_EX_PWR_PIN)
//�����ƶ˿�
#define EX_PWR_EN_PORT GPIOG
@@ -69,6 +72,13 @@
#define AD_VTEM_CNT 8
+//ʣ������ٷֱȼ���
+#define BAT_PERSENT_LEVEL_3 70
+#define BAT_PERSENT_LEVEL_2 40
+#define BAT_PERSENT_LEVEL_1 20
+#define BAT_PERSENT_LEVEL_0 0
+
+
typedef enum
{
LMS_NONE,
@@ -84,6 +94,16 @@
AMS_WRC_BEFORE,
}ALKA_MEASURE_STATUS;
+typedef enum
+{
+ BAT_V_NONE, //��״̬
+// BAT_V_LOSE, //��ʧ��������ѹ���ͣ���Ϊ��ض�ʧ
+ BAT_V_DOWN, //Ƿѹ
+ BAT_V_LOW, //�͵�
+}BAT_V_STATUS;
+
+
+
#pragma pack(1)
//��������
//�ŵ㣺ʹ�öѿռ䣬��ַ����������Ƭ�ڴ棨���ָ�����ݣ�
@@ -94,20 +114,34 @@
uint32_t ad_get_buffer[];
}ad_data_s;
+#pragma pack()
+
typedef struct pwr_vol{
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;
+ BAT_V_STATUS alka_vcc_status;
float mcu_temperature;
- int8_t lith_vcc_per;
+ 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;
-#pragma pack()
-extern uint8_t sys_bst_flag;
+
+
extern uint8_t first_power_get_cnt_g;
@@ -118,8 +152,9 @@
float Get_Alka_Bat_Voltage(void);
float Get_Lith_Bat_Voltage(void);
-void GetBatVoltagePro(PWR_VOL_T * pwr_vol_p);
+void GetPwrStatusPro(PWR_VOL_T * pwr_vol_p);
+void PowerManagrInit(void);
#endif
--
Gitblit v1.9.3