From 7a54c0d5730cb2d02229c0ce515bc100bf211079 Mon Sep 17 00:00:00 2001 From: QuakeGod <QuakeGod@sina.com> Date: 星期一, 17 十月 2022 20:42:45 +0800 Subject: [PATCH] arrange again radio fp0 klink knet --- Src/functions.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Src/functions.c b/Src/functions.c index c184345..055d62e 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鐨刵S鏁帮紝 +//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;姣弖S鐨勬椂閽熸暟 - 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; @@ -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