Browse Source

波特率125K

Ye Jin 1 year ago
parent
commit
d113a43560
2 changed files with 2 additions and 2 deletions
  1. 1 1
      MOTINOVA_CDL_App/Src/can.c
  2. 1 1
      MOTINOVA_CDL_App/Src/uart_process.c

+ 1 - 1
MOTINOVA_CDL_App/Src/can.c

@@ -89,7 +89,7 @@ void MX_CAN_Init(void)
 {
 
   hcan.Instance = CAN1;
-  hcan.Init.Prescaler = (HAL_GPIO_ReadPin(BautrateSwitch_GPIO_Port, BautrateSwitch_Pin) == GPIO_PIN_SET) ? 24 : 48;
+  hcan.Init.Prescaler = 48;//125K
   hcan.Init.Mode = CAN_MODE_NORMAL;
   hcan.Init.SJW = CAN_SJW_1TQ;
   hcan.Init.BS1 = CAN_BS1_4TQ;

+ 1 - 1
MOTINOVA_CDL_App/Src/uart_process.c

@@ -92,7 +92,7 @@ static void UART_DataProcess(uint8_t Mode, uint16_t Command, uint8_t* Data)
 			memcpy(InputKey, Data + 12, 8);
 			CheckCodeCal(InputCode, InputKey, OutputCode);
 			memcpy(SendData, OutputCode, 12);
-			memcpy(SendData + 12, (uint8_t*)"V3.0.1_20231020", 15);
+			memcpy(SendData + 12, (uint8_t*)"V3.1.0_20231021", 15);
 			
 			SendCmdData(&UART_TxBuff_Struct3, MODE_REPORT, 0x551B, SendData);
 			break;