From 2364f06313efb8eb97d4ae741a31cdd2efc175d2 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 16:05:50 +0800
Subject: [PATCH] KBus fix after merget together
---
Src/main.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index dd15b74..36214fe 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -193,11 +193,7 @@
/* USER CODE BEGIN SysInit */
TickFreq=10000; //Tick棰戠巼
InituS(TickFreq);
-<<<<<<< HEAD
// HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/TickFreq); //閲嶆柊瀹氫箟SysTick鐨勯鐜�
-=======
- // HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/TickFreq); //閲嶆柊瀹氫箟SysTick鐨勯鐜囷拷
->>>>>>> origin/Radio
/* USER CODE END SysInit */
@@ -218,13 +214,9 @@
else{bKBusMaster=0;bKBusSlave=1;}
nChilds=nStationID;
FP0_Init();
-<<<<<<< HEAD
-#elif (BOARD_TYPE == 15)
- nStationID=KMem.EffJumperSW&0x0f;
-=======
+
#elif (BOARD_TYPE == 15 || BOARD_TYPE == 16)
- nAddr=KMem.EffJumperSW&0x0f;
->>>>>>> origin/Radio
+ nStationID=KMem.EffJumperSW&0x0f;
if (KMem.EffJumperSW == 0x1f) {bKBusRepeater=1;bKBusMaster=1;bKBusSlave=0;}
else if ((KMem.EffJumperSW&0x10)!=0) {bKBusMaster=1;bKBusSlave=0;}
else{bKBusMaster=0;bKBusSlave=1;}
--
Gitblit v1.9.1