From 7a2ff321965f1f24f3047fedd44a83f451f1f793 Mon Sep 17 00:00:00 2001 From: QuakeGod <QuakeGod@sina.com> Date: 星期三, 01 二月 2023 10:58:10 +0800 Subject: [PATCH] radio add new device type --- Inc/GlobalDef.h | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/Inc/GlobalDef.h b/Inc/GlobalDef.h index e724690..3f4d43b 100644 --- a/Inc/GlobalDef.h +++ b/Inc/GlobalDef.h @@ -16,6 +16,11 @@ 4 //New Master 16 in16 out V1.2 5 //Slave 8 in 8 out V1.2 */ + + +#define DefaultUart1Baud 230400 +#define DefaultUart2Baud 1000000 + enum enBOARD_TYPE { BOARD_UNKNOWN =0, @@ -29,12 +34,41 @@ BOARD_V4_SLAVE, //8 New V4 Slave 8 in 8 o BOARD_V42_MASTER, //9 New V4.2 Master 16 in16 o 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_16 = 15, + BOARD_V50_RADIO_8 = 16, + }; -#define BOARD_TYPE 2 +#define BOARD_TYPE 16 +#define BOARD_VER 1 +#define XLAT_FREQ 8 -extern int GetBoardType(void); +#define GetBoardType() (BOARD_TYPE) + +#if ( BOARD_TYPE == 1) +#define DINPUT 4 +#define DOUTPUT 4 +#elif (BOARD_TYPE == 2 || BOARD_TYPE == 4 || BOARD_TYPE == 6 || BOARD_TYPE == 8 || BOARD_TYPE == 10 || BOARD_TYPE == 11 || BOARD_TYPE == 16) +#define DINPUT 8 +#define DOUTPUT 8 +#elif BOARD_TYPE == 3 || BOARD_TYPE == 5 || BOARD_TYPE == 7 || BOARD_TYPE == 9 || BOARD_TYPE == 13 || BOARD_TYPE == 15 +#define DINPUT 16 +#define DOUTPUT 16 +#elif BOARD_TYPE == 14 +#define DINPUT 0 +#define DOUTPUT 6 +#else +#define DINPUT 0 +#define DOUTPUT 0 +#endif extern volatile int PendSvCount; typedef struct tagUartStat @@ -71,7 +105,6 @@ extern stUartStat Uart1Stat; extern stUartStat Uart2Stat; -extern const unsigned int DefaultUart1Baud; extern unsigned int Uart1Baud; extern unsigned int Uart2Baud; @@ -96,7 +129,7 @@ struct stSysConfig{ int bInited:1; int bConfiged:1; - int bMaster:1; + int bKBusMaster:1; }; -- Gitblit v1.9.1