From f04e2b1dac8f950376652c5a1dd8df6055af8fd0 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 02:15:38 +0800
Subject: [PATCH] sovle conflict

---
 Src/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index b6da46e..102c640 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -66,7 +66,7 @@
 /* USER CODE END Includes */
 
 /* Private variables ---------------------------------------------------------*/
-
+#define ADCrefAddr 0x1FFFF7BA
 /* USER CODE BEGIN PV */
 /* Private variables ---------------------------------------------------------*/
 
@@ -188,9 +188,9 @@
   SystemClock_Config();
 
   /* USER CODE BEGIN SysInit */
-	TickFreq=10000;		//Tick频率
+	TickFreq=10000;		//Tick频锟斤拷
 	InituS(TickFreq);	
- // HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/TickFreq);	//重新定义SysTick的频率�
+ // HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/TickFreq);	//锟斤拷锟铰讹拷锟斤拷SysTick锟斤拷频锟斤拷锟�
 
   /* USER CODE END SysInit */
 

--
Gitblit v1.9.1