From fbb8392d06677c8eccabe03ecf3feddd349175ce Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 02:15:38 +0800
Subject: [PATCH] sovle conflict
---
Src/functions.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Src/functions.c b/Src/functions.c
index cfc6d57..8a519f7 100644
--- a/Src/functions.c
+++ b/Src/functions.c
@@ -19,16 +19,16 @@
unsigned int TickPrioduS; //
volatile unsigned int nCurTick=0;
volatile unsigned int CurTickuS=0;
-//volatile unsigned int ThisRunTime=0; //开机时间
-//volatile unsigned int TotalRunTime=0; //总开机时间
-//volatile unsigned int PwrCount=0; //开机次数
-unsigned short ClkuS; //每个Clk的nS数，
+//volatile unsigned int ThisRunTime=0; //锟斤拷锟斤拷时锟斤拷
+//volatile unsigned int TotalRunTime=0; //锟杰匡拷锟斤拷时锟斤拷
+//volatile unsigned int PwrCount=0; //锟斤拷锟斤拷锟斤拷锟斤拷
+unsigned short ClkuS; //每锟斤拷Clk锟斤拷nS锟斤拷锟斤拷
int InituS(int TickFreq1)
{
- TickPrioduS=1000000/TickFreq1; //每个SysTick的微秒数
- CoreClkMHz=HAL_RCC_GetHCLKFreq()/1000000; //=SystemCoreClock/1000000;每uS的时钟数
- TickPriodClk=SystemCoreClock/TickFreq1; //每个SysTick的时钟数
+ TickPrioduS=1000000/TickFreq1; //每锟斤拷SysTick锟斤拷微锟斤拷锟斤拷
+ CoreClkMHz=HAL_RCC_GetHCLKFreq()/1000000; //=SystemCoreClock/1000000;每uS锟斤拷时锟斤拷锟斤拷
+ TickPriodClk=SystemCoreClock/TickFreq1; //每锟斤拷SysTick锟斤拷时锟斤拷锟斤拷
ClkuS=(1000000LL*65536)/SystemCoreClock;
CurTickuS=TickPrioduS+100u;
return 0;
@@ -732,7 +732,7 @@
void Output595_8(unsigned int cc)
{
//unsigned char i;
-;// 74HC595输出程序，输出8位
+;// 74HC595锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷8位
// cc=~0x3f;
__disable_irq();
STRCLK2_1();
@@ -758,7 +758,7 @@
void Output595_16(unsigned int cc)
{
//unsigned char i;
-;// 74HC595输出程序，输出8位
+;// 74HC595锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷8位
// cc=~0x3f;
__disable_irq();
STRCLK2_1();
@@ -860,7 +860,7 @@
#if (BOARD_TYPE == 9 || BOARD_TYPE == 10 || BOARD_TYPE == 15 )
//#pragma message("9,10")
- // V4.2 管脚排列向右移动了一位。
+ // V4.2 锟杰斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟狡讹拷锟斤拷一位锟斤拷
#define SRCLK1_0() LL_GPIO_ResetOutputPin(GPIOB,LL_GPIO_PIN_1)
#define SRCLK1_1() LL_GPIO_SetOutputPin(GPIOB,LL_GPIO_PIN_1)
#define STRCLK1_0() LL_GPIO_ResetOutputPin(GPIOB,LL_GPIO_PIN_2)
@@ -869,7 +869,7 @@
#define OE1_1() LL_GPIO_SetOutputPin(GPIOB,LL_GPIO_PIN_10)
#define SER1_0() LL_GPIO_ResetOutputPin(GPIOB,LL_GPIO_PIN_11)
#define SER1_1() LL_GPIO_SetOutputPin(GPIOB,LL_GPIO_PIN_11)
-#else //按照原来的管脚排列
+#else //锟斤拷锟斤拷原锟斤拷锟侥管斤拷锟斤拷锟斤拷
#define SRCLK1_0() LL_GPIO_ResetOutputPin(GPIOB,LL_GPIO_PIN_0)
#define SRCLK1_1() LL_GPIO_SetOutputPin(GPIOB,LL_GPIO_PIN_0)
#define STRCLK1_0() LL_GPIO_ResetOutputPin(GPIOB,LL_GPIO_PIN_1)
@@ -890,7 +890,7 @@
void displayInput(unsigned int cc)
{
//unsigned char i;
-;// 74HC595输出程序，输出8位
+;// 74HC595锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷8位
// cc=~0x3f;
__disable_irq();
STRCLK1_1();
--
Gitblit v1.9.1