From b6290b94cac76a5634cd90b495b65d91ee92d85e Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 22 二月 2023 08:57:38 +0800
Subject: [PATCH] fix conflict

---
 Inc/functions.h |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Inc/functions.h b/Inc/functions.h
index cc5c54a..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 );
@@ -43,21 +43,26 @@
 int Uart3RecvDMA(void * pBuf, int nSize);
 int Uart3TriggerRecvDMA(void );
 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 );
@@ -66,9 +71,10 @@
 unsigned short crc_check(const unsigned char * data, unsigned int  length);
 unsigned short crc16bitbybit(const unsigned char *ptr, unsigned int len);
 uint16_t crc16table(const uint8_t *ptr, uint16_t len);
-uint16_t crc16tablefast(const uint8_t *ptr, uint16_t len) ;
+//uint16_t crc16tablefast(const uint8_t *ptr, uint16_t len) ;
 
 void EnableDisIn(uchar bEnable);
 void displayInput(unsigned int cc);
+void PutOutputSPI1(unsigned int Y);
 
 #endif  /* __MYFUNCTIONS_H__ */

--
Gitblit v1.9.1