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 | 26 ++++++-------------------- 1 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Function/POWER_MANAGE/power_manage.h b/Function/POWER_MANAGE/power_manage.h index adc4252..811ef95 100644 --- a/Function/POWER_MANAGE/power_manage.h +++ b/Function/POWER_MANAGE/power_manage.h @@ -23,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 @@ -39,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 @@ -62,22 +63,7 @@ -#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 //ʣ������ٷֱȼ��� -- Gitblit v1.9.3