From 65062d0d5b21f838aa0043a15ce54cfab8d72c43 Mon Sep 17 00:00:00 2001
From: wujiazhi <1147861305@qq.com>
Date: Tue, 11 Jun 2024 14:23:53 +0800
Subject: [PATCH] 1.Fixed communication failure between MCU and wireless module 2.Fix the wrong judgment of alkaline lithium power

---
 HARDWARE/ADC/ADC.h |   40 ++++++++++++++++++----------------------
 1 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/HARDWARE/ADC/ADC.h b/HARDWARE/ADC/ADC.h
index d1b3c09..fce3fb9 100644
--- a/HARDWARE/ADC/ADC.h
+++ b/HARDWARE/ADC/ADC.h
@@ -1,38 +1,34 @@
 #ifndef _ADC_H_
 #define _ADC_H_
 
-#include "define_all.h" 
+#include "define_all.h"
 
-//�ڲ��ۼ�
-//#define const_adc_Slope 	(*((uint16_t *)(0x1FFFFA84)))	//ADCб�ʣ���1000��ʹ��
-//#define const_adc_Offset 	(*((int16_t *)(0x1FFFFA86)))	//ADC�ؾ࣬��100��ʹ�ã���λmV
+// �ڲ��ۼ�
+// #define const_adc_Slope 	(*((uint16_t *)(0x1FFFFA84)))	//ADCб�ʣ���1000��ʹ��
+// #define const_adc_Offset 	(*((int16_t *)(0x1FFFFA86)))	//ADC�ؾ࣬��100��ʹ�ã���λmV
 
-//�ⲿ�ۼ�
-#define const_adc_Slope 	(*((uint16_t *)(0x1FFFFA88)))	//ADCб�ʣ���1000��ʹ��
-#define const_adc_Offset 	(*((int16_t *)(0x1FFFFA8A)))	//ADC�ؾ࣬��100��ʹ�ã���λmV
+// �ⲿ�ۼ�
+#define const_adc_Slope (*((uint16_t *)(0x1FFFFA88))) // ADCб�ʣ���1000��ʹ��
+#define const_adc_Offset (*((int16_t *)(0x1FFFFA8A))) // ADC�ؾ࣬��100��ʹ�ã���λmV
 
+// �ڲ��ۼ�  �¶�
+#define const_T_30 *(uint16_t *)0x1FFFFA92 // 0X640  30����ֵ
 
-//�ڲ��ۼ�  �¶�
-#define const_T_30            *(uint16_t*) 0x1FFFFA92  //0X640  30����ֵ
+// �ⲿ�ۼ�  �¶�
+#define const_T_30_14BIT *(uint16_t *)0x1FFFFB54 // 0X�ⲿ�ۼ� 16383��14bit��  30����ֵ
 
-//�ⲿ�ۼ�  �¶�
-#define const_T_30_14BIT      *(uint16_t*) 0x1FFFFB54   //0X�ⲿ�ۼ� 16383��14bit��  30����ֵ
+// ADC_IN4
+#define LIT_ADC_PORT GPIOD
+#define LIT_ADC_PIN GPIO_Pin_1
 
-//ADC_IN4
-#define LIT_ADC_PORT 	GPIOF
-#define LIT_ADC_PIN		GPIO_Pin_6
-
-
-//ADC_IN8
-#define ALK_ADC_PORT	GPIOH
-#define ALK_ADC_PIN		GPIO_Pin_1
-
-
+// ADC_IN8
+#define ALK_ADC_PORT GPIOB
+#define ALK_ADC_PIN GPIO_Pin_3
 
 void ADC_LithIO_Init(void);
 void ADC_AlkaIO_Init(void);
 void ADC_IN5_Init(void);
-void ADC_IN4_Init(void);
+void ADC_IN10_Init(void);
 void ADC_IN8_Init(void);
 void ADC_Temp_Init(void);
 uint32_t Get_AdcValue(void);

--
Gitblit v1.9.3