From 08b3909c40a192778719c6262bbee4745682948d Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 31 May 2024 19:15:47 +0800
Subject: [PATCH] 测试和修改了一些功能bug
---
HARDWARE/ADC/ADC.h | 74 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/HARDWARE/ADC/ADC.h b/HARDWARE/ADC/ADC.h
index 43e99ce..855257e 100644
--- a/HARDWARE/ADC/ADC.h
+++ b/HARDWARE/ADC/ADC.h
@@ -1,37 +1,55 @@
+#ifndef _ADC_H_
+#define _ADC_H_
-/******************************************************************************
- * Copyright (C) 2014-2015 HangZhou SiZhu Co.,LTD.
- *
- *-----------------------------------------------------------------------------
- * File: adc.h
- * Description: head file of adc.c ,use arm inner adc1 to sample given voltage
- * Author: Lishoujian (867693272@qq.com)
- * Date: Jan 9, 2015
- *****************************************************************************/
+#include "define_all.h"
-/* ----------------------- Platform includes --------------------------------*/
-#ifndef __ADC_H
-#define __ADC_H
-#include "sys.h"
+//�ڲ��ۼ�
+//#define const_adc_Slope (*((uint16_t *)(0x1FFFFA84))) //ADCб�ʣ���1000��ʹ��
+//#define const_adc_Offset (*((int16_t *)(0x1FFFFA86))) //ADC�ؾ࣬��100��ʹ�ã���λmV
-#define AD_LENGTH 500
+//�ⲿ�ۼ�
+#define const_adc_Slope (*((uint16_t *)(0x1FFFFA88))) //ADCб�ʣ���1000��ʹ��
+#define const_adc_Offset (*((int16_t *)(0x1FFFFA8A))) //ADC�ؾ࣬��100��ʹ�ã���λmV
-#define ADC_dianchi_PIN_NUM GPIO_Pin_3
-#define ADC_dianchi_PIN_GROUP GPIOC
+//�ڲ��ۼ� �¶�
+#define const_T_30 *(uint16_t*) 0x1FFFFA92 //0X640 30����ֵ
-typedef struct ad_data_get
-{
- u16 *ad_get_address_p;
- u32 ad_buffer_cnt;
- u8 ad_ch;
+//�ⲿ�ۼ� �¶�
+#define const_T_30_14BIT *(uint16_t*) 0x1FFFFB54 //0X�ⲿ�ۼ� 16383��14bit�� 30����ֵ
-}ad_data_s;
+//ADC_IN4
+#define LIT_ADC_PORT GPIOF
+#define LIT_ADC_PIN GPIO_Pin_6
-double Temp_GetBFiltedData(ad_data_s * data_p);
-void Adc_set(u8 tem_flag);
-uint16 Get_vol_Average(u8 channel,u8 tem_flag);
-extern volatile u16 ad_data[1000];
-u16 Get_val(u8 ch);
-#endif
+//ADC_IN8
+#define ALK_ADC_PORT GPIOH
+#define ALK_ADC_PIN GPIO_Pin_1
+
+
+#define AD_LITH_BAT_REF_VOL 5.0f
+#define AD_LITH_BAT_CH 5
+#define AD_LITH_BAT_CNT 8
+#define LITH_VOL_COE 3.206f
+
+#define AD_ALKA_BAT_REF_VOL 5.0f
+#define AD_ALKA_BAT_CH 10
+#define AD_ALKA_BAT_CNT 8
+#define ALKA_VOL_COE 3.2085f
+
+//#define AD_VTEM_CH ADC_CFGR_BUFSEL_TS
+#define AD_VTEM_CNT 8
+
+
+
+void ADC_LithIO_Init(void);
+void ADC_AlkaIO_Init(void);
+void ADC_IN5_Init(void);
+void ADC_IN4_Init(void);
+void ADC_IN8_Init(void);
+void ADC_IN10_Init(void);
+void ADC_Temp_Init(void);
+uint32_t Get_AdcValue(void);
+float Get_AdcTempValue(void);
+#endif
--
Gitblit v1.9.3