From 2364f06313efb8eb97d4ae741a31cdd2efc175d2 Mon Sep 17 00:00:00 2001 From: QuakeGod <QuakeGod@sina.com> Date: 星期三, 01 二月 2023 16:05:50 +0800 Subject: [PATCH] KBus fix after merget together --- Inc/functions.h | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Inc/functions.h b/Inc/functions.h index c597f74..6ce84e7 100644 --- a/Inc/functions.h +++ b/Inc/functions.h @@ -21,7 +21,7 @@ extern volatile unsigned int CurTickuS; //extern volatile unsigned int ThisRunTime; //extern volatile unsigned int TotalRunTime; -//extern volatile unsigned int PwrCount; //开机次数 +//extern volatile unsigned int PwrCount; //寮�鏈烘鏁� typedef unsigned char uint8_t; typedef unsigned char uchar; @@ -31,7 +31,7 @@ int InituS(int TickFreq1); unsigned int GetuS(void); - +void logData(unsigned char d); int InitUartstat(stUartStat * pUartstat,void * pBufRx, int nSizeRx, void * pBufTx, int nSizeTx); int Uart1SendDMA(void * pData, int nSize); int Uart1TriggerSendDMA(void ); @@ -45,22 +45,24 @@ int Uart3TriggerSendDMA(void ); void TriggerPendSV(void); void PendSvCallBack(void); - +void SPI1_IRQ_CallBack(void); + void Uart1SendDone(void); void Uart1RecvDone(void); void Uart2SendDone(void); void Uart2RecvDone(void); int PutStr(char * str1, int len1); -void clearscreen(void ); -void Locate(int x,int y); -int SendPacket1(void * pBuf,int len1); -int SendPacket2(pPacket p1,int len1); +int SendPacket(int nChn, void * pBuf,int len1); +//int SendPacket1(void * pBuf,int len1); +//int SendPacket2(pKBPacket p1,int len1); void ToggleRunLed(void ); void ToggleErrLed(void ); +void ToggleErr2Led(void ); void ToggleOutStat(void ); int ReadJumperSW(void ); void SetRunLed(uchar bOn); void SetErrLed(uchar bOn); +void SetErr2Led(uchar bOn); void SetOutStat(uchar bOn); void Enable595(uchar bEnable); unsigned int GetInput(void ); @@ -74,5 +76,5 @@ void EnableDisIn(uchar bEnable); void displayInput(unsigned int cc); void PutOutputSPI1(unsigned int Y); - + #endif /* __MYFUNCTIONS_H__ */ -- Gitblit v1.9.1