From 812f8c1cfc7a5dadca5a904fc808e51a2d5af50f Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 23:53:28 +0800
Subject: [PATCH] merge from master and fix files

---
 Inc/functions.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Inc/functions.h b/Inc/functions.h
index c597f74..7a8fe6c 100644
--- a/Inc/functions.h
+++ b/Inc/functions.h
@@ -45,16 +45,16 @@
 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(pPacket p1,int len1);
 void ToggleRunLed(void );
 void ToggleErrLed(void );
 void ToggleOutStat(void );
@@ -74,5 +74,5 @@
 void EnableDisIn(uchar bEnable);
 void displayInput(unsigned int cc);
 void PutOutputSPI1(unsigned int Y);
-	
+
 #endif  /* __MYFUNCTIONS_H__ */

--
Gitblit v1.9.1