From 828d914304e29f5d8202df87393ce6744e528fdd Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 11:59:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/klink' into kNet
---
Src/functions.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Src/functions.c b/Src/functions.c
index 8a519f7..feedbc0 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鐨刵S鏁帮紝
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;姣弖S鐨勬椂閽熸暟
+ TickPriodClk=SystemCoreClock/TickFreq1; //姣忎釜SysTick鐨勬椂閽熸暟
ClkuS=(1000000LL*65536)/SystemCoreClock;
CurTickuS=TickPrioduS+100u;
return 0;
@@ -281,7 +281,7 @@
#endif
if (Uart2Stat.bPacketRecved)
{
- ParsePacket(2, (pPacket)Uart2RecvBuf1, Uart2RecvBuf1DataLen);
+ KBusParsePacket(2, (pPacket)Uart2RecvBuf1, Uart2RecvBuf1DataLen);
Uart2RecvBuf1DataLen=0;
Uart2Stat.bPacketRecved=0;
Uart2RecvDMA(Uart2RecvBuf1,sizeof(Uart2RecvBuf1));
@@ -615,7 +615,7 @@
case 13:
return Input165_R(16);
case 14:
- return 0; //FP0
+ return 0; //FP0
case 15:
return Input165_R(16);
default:
@@ -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