From d6ce00f6b68d3d1ecaf44c972909f311ac1d3bf8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 09 May 2024 19:54:54 +0800
Subject: [PATCH] 增加电源管理部分功能

---
 Function/POWER_MANAGE/power_manage.h |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Function/POWER_MANAGE/power_manage.h b/Function/POWER_MANAGE/power_manage.h
index b2fc38a..e04f138 100644
--- a/Function/POWER_MANAGE/power_manage.h
+++ b/Function/POWER_MANAGE/power_manage.h
@@ -3,39 +3,52 @@
 
 #include "define_all.h" 
 
-
 // ����������־λ����
 #define __VCC_PARA_FLAG_SET_(__HANDLE__) ((&pwr_vol_g)->__HANDLE__ = SET)
 // ����������־λ���
 #define __VCC_PARA_FLAG_CLEAR_(__HANDLE__) ((&pwr_vol_g)->__HANDLE__ = RESET)
 
-// ﮵����
-#define LITHIUM_PWR_DOWN_PORT GPIOF
-#define LITHIUM_PWR_DOWN_PIN 	GPIO_Pin_11
-// ﮵�Ƿѹ
-#define LIT_PWR_UNDER_PORT 	GPIOF
-#define LIT_PWR_UNDER_PIN 	GPIO_Pin_6
+// ﮵�͵�/����
+#define LITH_PWR_LOSE_PORT GPIOF
+#define LITH_PWR_LOSE_PIN 	GPIO_Pin_11
 
 // ﮵��⿪��
-#define LITHIUM_DETECTION_PORT	GPIOD
-#define LITHIUM_DETECTION_PIN		GPIO_Pin_2
+#define LITHIUM_DETECTION_PORT	GPIOF
+#define LITHIUM_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 ALKALI_PWR_DOWN_PORT 	GPIOA
-#define ALKALI_PWR_DOWN_PIN 	GPIO_Pin_4
+// ��綪ʧ
+#define ALKALI_PWR_LOSE_PORT 	GPIOH
+#define ALKALI_PWR_LOSE_PIN 	GPIO_Pin_0
 
 // ����⿪��
-#define ALKALI_DETECTION_PORT 	GPIOB
-#define ALKALI_DETECTION_PIN 		GPIO_Pin_2
+#define ALKALI_DETECTION_PORT 	GPIOF
+#define ALKALI_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 BORROW_PWR_PORT GPIOG
+#define BORROW_PWR_PIN 	GPIO_Pin_2
+
+#define BORROW_PWR_ON		GPIO_ResetBits(BORROW_PWR_PORT,BORROW_PWR_PIN)
+#define BORROW_PWR_OFF	GPIO_SetBits(BORROW_PWR_PORT,BORROW_PWR_PIN)
+
+//�����˿�
+#define HWIDO_EX_PWR_PORT GPIOF
+#define HWIDO_EX_PWR_PIN 	GPIO_Pin_5
+
+
+//�����ƶ˿�
+#define EX_PWR_EN_PORT GPIOG
+#define EX_PWR_EN_PIN 	GPIO_Pin_3
+#define EX_PWR_ON		GPIO_SetBits(EX_PWR_EN_PORT,EX_PWR_EN_PIN)
+#define EX_PWR_OFF	GPIO_ResetBits(EX_PWR_EN_PORT,EX_PWR_EN_PIN)
 
 
 #define	AD_LITH_PF6_BAT_CH			      				5
@@ -68,7 +81,7 @@
 	AMS_NONE,
 	AMS_PERIOD,
 	AMS_KEY,
-	AMS_GPRS_BEFORE,
+	AMS_WRC_BEFORE,
 }ALKA_MEASURE_STATUS;
 
 #pragma	pack(1)
@@ -76,7 +89,7 @@
 //�ŵ㣺ʹ�öѿռ䣬��ַ����������Ƭ�ڴ棨���ָ�����ݣ�
 //ȱ�㣺ÿ��ʹ������Ҫ�ֶ��ͷ�
 typedef struct ad_data_get{
-	uint8_t				ad_ch;
+	u8				ad_ch;
 	u16				ad_buffer_cnt;
 	uint32_t	ad_get_buffer[];
 }ad_data_s;
@@ -105,7 +118,7 @@
 float Get_Alka_Bat_Voltage(void);
 float Get_Lith_Bat_Voltage(void);
 
-void Get_Double_Bat_Voltage(PWR_VOL_T * pwr_vol_p);
+void GetBatVoltagePro(PWR_VOL_T * pwr_vol_p);
 
 
 #endif

--
Gitblit v1.9.3