QuakeGod
2023-02-01 2364f06313efb8eb97d4ae741a31cdd2efc175d2
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;}