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
---
Src/GlobalDef.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Src/GlobalDef.c b/Src/GlobalDef.c
index d7d1c0e..5478adc 100644
--- a/Src/GlobalDef.c
+++ b/Src/GlobalDef.c
@@ -12,9 +12,10 @@
stUartStat Uart1Stat={0};
stUartStat Uart2Stat={0};
-const unsigned int DefaultUart1Baud = 230400;
-unsigned int Uart1Baud = 230400;
-unsigned int Uart2Baud = 1000000;
+//const unsigned int DefaultUart1Baud = 230400;
+
+unsigned int Uart1Baud = DefaultUart1Baud;
+unsigned int Uart2Baud = DefaultUart2Baud;
unsigned char Uart1RecvBuf1[128];
int Uart1RecvBuf1DataLen=0;
@@ -35,6 +36,7 @@
volatile int SysConfigs;
+/*
int GetBoardType(void )
{
int BoardType=0;
@@ -46,7 +48,7 @@
BoardType = BOARD_TYPE;
return BoardType;
}
-
+*/
/*
int sintab[256]={
0, 1, 3, 4, 6, 7, 9, 10, 12, 14, 15, 17, 18, 20, 21, 23,
--
Gitblit v1.9.1