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] 增加阀控事件记录及修改阀控命令
---
HARDWARE/ADC/ADC.c | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/HARDWARE/ADC/ADC.c b/HARDWARE/ADC/ADC.c
index 1f82dda..f6be9e7 100644
--- a/HARDWARE/ADC/ADC.c
+++ b/HARDWARE/ADC/ADC.c
@@ -12,22 +12,22 @@
float const_30_top = 30.0;
-void ADC_LithIO_Init(void)
-{
- CMU_PERCLK_SetableEx(PADCLK, ENABLE); //PADʱ�ӣ�GPIO��ʹ�ܺ���
-// AnalogIO(LIT_PWR_UNDER_PORT,LIT_PWR_UNDER_PIN);//ADC_5
-// GPIOx_ANEN_Setable(LIT_PWR_UNDER_PORT,LIT_PWR_UNDER_PIN,ENABLE);
- AnalogIO(LIT_ADC_PORT,LIT_ADC_PIN);//ADC_IN4
- GPIOx_ANEN_Setable(LIT_ADC_PORT,LIT_ADC_PIN,ENABLE);
+//void ADC_LithIO_Init(void)
+//{
+// CMU_PERCLK_SetableEx(PADCLK, ENABLE); //PADʱ�ӣ�GPIO��ʹ�ܺ���
+//// AnalogIO(LIT_PWR_UNDER_PORT,LIT_PWR_UNDER_PIN);//ADC_5
+//// GPIOx_ANEN_Setable(LIT_PWR_UNDER_PORT,LIT_PWR_UNDER_PIN,ENABLE);
+// AnalogIO(LIT_ADC_PORT,LIT_ADC_PIN);//ADC_IN4
+// GPIOx_ANEN_Setable(LIT_ADC_PORT,LIT_ADC_PIN,ENABLE);
-}
+//}
-void ADC_AlkaIO_Init(void)
-{
- CMU_PERCLK_SetableEx(PADCLK, ENABLE); //PADʱ�ӣ�GPIO��ʹ�ܺ���
- AnalogIO_H(ALK_ADC_PIN);//ADC_IN8
-// GPIOx_ANEN_Setable(ALK_ADC_PORT,ALK_ADC_PIN,ENABLE); //?û��H�ڣ���ʱ��֪����ô����
-}
+//void ADC_AlkaIO_Init(void)
+//{
+// CMU_PERCLK_SetableEx(PADCLK, ENABLE); //PADʱ�ӣ�GPIO��ʹ�ܺ���
+// AnalogIO_H(ALK_ADC_PIN);//ADC_IN8
+//// GPIOx_ANEN_Setable(ALK_ADC_PORT,ALK_ADC_PIN,ENABLE); //?û��H�ڣ���ʱ��֪����ô����
+//}
void ADC_IN5_Init(void)
{
@@ -113,13 +113,14 @@
ADC_CFGR_BUFEN_Setable(ENABLE); //ADC����ͨ��bufferʹ��/��ֹ
ADC_CR_MODE_Set(ADC_CR_MODE_EXTERNAL); //ADC����ģʽѡ���ⲿ�ۼ���
ADC_CR_RSTCTRL_EN_Setable(ENABLE); //����������ⲿ��λ
- ADC_CFGR_ACC_PERIOD_Set(ADC_CFGR_ACC_PERIOD_14BITS); //�ⲿ�ۼ����ۼ���������
+
ADC_CR_HPEN_Set(ADC_CR_HPEN_1MHZ);
ADC_TRIM_Write(0X7FF); //adcƵ��1M ʱ ����ʱ��4ms
// ADC_TRIM_Write(0X3FF); //adcƵ��1M ʱ ����ʱ��2ms
// ADC_TRIM_Write(0X1FF); //adcƵ��1M ʱ ����ʱ��1ms
-
+
+ ADC_CFGR_ACC_PERIOD_Set(ADC_CFGR_ACC_PERIOD_14BITS); //�ⲿ�ۼ����ۼ���������
ADC_CR_ACC_IE_Setable(DISABLE); //�ⲿ�ۼ�ģʽ�жϽ�ֹ
ADC_CR_EN_Setable(DISABLE); //ADC�ر�
}
--
Gitblit v1.9.3