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.h | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/Function/POWER_MANAGE/power_manage.h b/Function/POWER_MANAGE/power_manage.h
index 990dea6..811ef95 100644
--- a/Function/POWER_MANAGE/power_manage.h
+++ b/Function/POWER_MANAGE/power_manage.h
@@ -2,6 +2,7 @@
#define _POWER_MANAGE_H_
#include "define_all.h"
+#include "extern_rtc.h"
// ����������־λ����
#define __VCC_PARA_FLAG_SET_(__HANDLE__) ((&pwr_vol_g)->__HANDLE__ = SET)
@@ -22,9 +23,10 @@
// ��綪ʧ
-#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 ALKA_PWR_LOSE_PORT GPIOH //?PH0û���жϣ�����Ҫ�ģ���ʱ�������ó��жϼ��
+#define ALKA_PWR_LOSE_PIN GPIO_Pin_0
+//#define ALKA_PWR_LOSE_IO_READ GPIO_ReadInputDataBit(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN)
+#define ALKA_PWR_LOSE_IO_READ GPIOH_ReadInputDataBit(ALKA_PWR_LOSE_PIN)
// ������
#define ALKA_DETECTION_PORT GPIOF
@@ -38,8 +40,8 @@
#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 BORROW_PWR_ON GPIO_SetBits(BORROW_PWR_PORT,BORROW_PWR_PIN)
+#define BORROW_PWR_OFF GPIO_ResetBits(BORROW_PWR_PORT,BORROW_PWR_PIN)
//�����˿�
#define HWIDO_EX_PWR_PORT GPIOF
@@ -53,23 +55,15 @@
#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 LIMIT_TRIGGER_PORT GPIOC
+#define LIMIT_TRIGGER_PIN GPIO_Pin_13
-#define AD_LITH_PF6_BAT_CH 5
-#define AD_LITH_PF6_BAT_CNT 8
-#define LITH_PF6_VOL_COE 1.206f
-#define AD_LITH_BAT_REF_VOL 5.0f
-#define AD_LITH_BAT_CH 4
-#define AD_LITH_BAT_CNT 8
-#define LITH_VOL_COE 2.01f
-#define AD_ALKA_BAT_REF_VOL 5.0f
-#define AD_ALKA_BAT_CH 8
-#define AD_ALKA_BAT_CNT 8
-#define ALKA_VOL_COE 3.14f
-#define AD_VTEM_CH ADC_CFGR_BUFSEL_TS
-#define AD_VTEM_CNT 8
+
+
//ʣ������ٷֱȼ���
@@ -115,7 +109,7 @@
uint32_t ad_get_buffer[];
}ad_data_s;
-#pragma pack()
+
typedef struct pwr_vol{
@@ -141,14 +135,28 @@
}PWR_VOL_T;
+#pragma pack()
+
+typedef struct {
+ sClockBCD record_time_BCD;
+ uint32_t trigger_times;
+ uint8_t RS485_running_flag;
+ uint8_t valve_running_flag;
+ uint8_t wrc_running_flag;
+ uint8_t EXPWR_check_status; //�����״̬���Ƿ���������
+ uint8_t EXPWR_ctrl_status; //������״̬����ǰ�Ƿ�����繩��
+
+}LIMIT_TRIGGER_RECORD_PARA_T;
extern uint8_t first_power_get_cnt_g;
-
extern PWR_VOL_T pwr_vol_g;
+extern LIMIT_TRIGGER_RECORD_PARA_T limit_trigger_record_para_g;
+
void Power_IO_Init(void);
+void borrow_Pwr_GPIO_Clk_Init(void);
float Get_Alka_Bat_Voltage(void);
float Get_Lith_Bat_Voltage(void);
--
Gitblit v1.9.3