From 9aed5d7e7b3c7bf09da712e9c272ece401a7acc9 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 25 十一月 2024 14:51:23 +0800
Subject: [PATCH] add UltraSonic and MultiWireLess
---
ComLib/Inc/GlobalDef.h | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/ComLib/Inc/GlobalDef.h b/ComLib/Inc/GlobalDef.h
index d259b39..7a05e85 100644
--- a/ComLib/Inc/GlobalDef.h
+++ b/ComLib/Inc/GlobalDef.h
@@ -11,20 +11,27 @@
#include "BoardType.h"
#include "MyQueue.h"
-#define DefaultUart1Baud 230400
-#define DefaultUart2Baud 1000000
-#define AlterUart2Baud 500000
-extern volatile int PendSvCount;
+
+#pragma anon_unions
typedef struct tagUartStat
{
volatile int SendBytes;
volatile int RecvBytes;
- volatile char bInited;
- volatile char bSending;
- volatile char bRecving;
- volatile char bUseAltRecvBuf;
+ volatile int SentPacket;
+ union{
+ volatile unsigned char state;
+ struct {
+ volatile unsigned char bInited:1;
+ volatile unsigned char bSending:1;
+ volatile unsigned char bRecving:1;
+ volatile unsigned char bUseAltRecvBuf:1;
+
+ };
+ };
+ volatile unsigned char bPacketRecved;
+ volatile unsigned char bSendDone;
volatile int IRQCount;
volatile int RXNECount;
volatile int TXECount;
@@ -32,40 +39,26 @@
volatile int OverRunCount;
volatile int TcCount; //Transmit Complete
volatile int IdelCount; //RecvIdel
- volatile int LostBytes;
+// volatile int LostBytes;
volatile int DMACount;
volatile int DMASendLen;
volatile int DMARecvLen;
stMyQueue QRx;
stMyQueue QTx;
- volatile int SentPacket;
- volatile int bPacketRecved;
- volatile int OKPacket;
- volatile int TimeOutErr;
- volatile int NotPacketErr;
- volatile int LengthErr;
- volatile int BCCerr;
+
+
+// volatile int OKPacket;
+// volatile int TimeOutErr;
+// volatile int NotPacketErr;
+// volatile int LengthErr;
+// volatile int BCCerr;
}stUartStat;
extern stUartStat Uart1Stat;
extern stUartStat Uart2Stat;
-extern unsigned int Uart1Baud;
-extern unsigned int Uart2Baud;
-extern unsigned char Uart1RecvBuf1[128];
-extern int Uart1RecvBuf1DataLen;
-//extern unsigned char Uart1RecvBuf2[128];
-//extern int Uart1RecvBuf2DataLen;
-
-extern unsigned char Uart2RecvBuf1[128];
-extern int Uart2RecvBuf1DataLen;
-//extern unsigned char Uart2RecvBuf2[128];
-//extern int Uart2RecvBuf2DataLen;
-
-extern volatile int Uart1BaudGot;
-extern volatile int Uart1BaudFirstGot;
//extern volatile int Uart2BaudGot;
//extern volatile int Uart2BaudFirstGot;
--
Gitblit v1.9.1