From f04e2b1dac8f950376652c5a1dd8df6055af8fd0 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 02:15:38 +0800
Subject: [PATCH] sovle conflict
---
Inc/GlobalDef.h | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Inc/GlobalDef.h b/Inc/GlobalDef.h
index b9c380f..03f09b6 100644
--- a/Inc/GlobalDef.h
+++ b/Inc/GlobalDef.h
@@ -16,7 +16,10 @@
4 //New Master 16 in16 out V1.2
5 //Slave 8 in 8 out V1.2
*/
-#define XLAT_FREQ 12
+
+
+#define DefaultUart1Baud 230400
+#define DefaultUart2Baud 1000000
enum enBOARD_TYPE
{
@@ -33,12 +36,19 @@
BOARD_V42_SLAVE, //10 New V4.2 Slave 8 in 8 o
BOARD_V30_MINI =11, //11 Mini Board
+
+ BOARD_V45_NET = 13,
+
+ BOARD_EXT_FP0 = 14,
+
+ BOARD_V50_RADIO = 15,
};
-#define BOARD_TYPE 11
+#define BOARD_TYPE 9
+#define XLAT_FREQ 8
-extern int GetBoardType(void);
+#define GetBoardType() (BOARD_TYPE)
extern volatile int PendSvCount;
@@ -76,7 +86,6 @@
extern stUartStat Uart1Stat;
extern stUartStat Uart2Stat;
-extern const unsigned int DefaultUart1Baud;
extern unsigned int Uart1Baud;
extern unsigned int Uart2Baud;
@@ -101,7 +110,7 @@
struct stSysConfig{
int bInited:1;
int bConfiged:1;
- int bMaster:1;
+ int bKBusMaster:1;
};
--
Gitblit v1.9.1