Jelajahi Sumber

V3.1.1_20200506
1、CAN错误中断回调中清除中断标志;
2、版本号:V3.1.1_20200506

dail.zhou 5 tahun lalu
induk
melakukan
a64da2e244
5 mengubah file dengan 8 tambahan dan 13 penghapusan
  1. 2 9
      Core/Src/can.c
  2. TEMPAT SAMPAH
      MDK-ARM/bin/MC_TTKZ010A_V3.1.1_20200506.bin
  3. TEMPAT SAMPAH
      MDK-ARM/bin/QD007A_CTL_APP.bin
  4. 3 3
      User/Src/var.c
  5. 3 1
      修改说明.txt

+ 2 - 9
Core/Src/can.c

@@ -116,11 +116,7 @@ void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle)
     canHandle->pTxMsg = &CAN_TxMessaage;
 		canHandle->pRxMsg = &CAN_RxMessaage;
 		CANFilterConfig_Scale32_IdMask_StandardIdOnly();
-		if(HAL_CAN_Receive_IT(&hcan, CAN_IT_FMP0) == HAL_BUSY)
-		{
-	  	__HAL_CAN_ENABLE_IT(&hcan, CAN_IT_FMP0);
-		}
-		
+		__HAL_CAN_ENABLE_IT(&hcan, CAN_IT_FMP0);
   /* USER CODE END CAN1_MspInit 1 */
   }
 }
@@ -319,10 +315,7 @@ void CANFilterConfig_Scale32_IdMask_StandardIdOnly(void)
 
 void HAL_CAN_ErrorCallback(CAN_HandleTypeDef *hcan)
 {
-  if(HAL_CAN_Receive_IT(hcan, CAN_IT_FMP0) == HAL_BUSY)
-	{
-		__HAL_CAN_ENABLE_IT(hcan, CAN_IT_FMP0);
-	}
+	__HAL_CAN_ENABLE_IT(hcan, CAN_IT_FMP0);
 }
 
 /* USER CODE END 1 */

TEMPAT SAMPAH
MDK-ARM/bin/MC_TTKZ010A_V3.1.1_20200506.bin


TEMPAT SAMPAH
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 3 - 3
User/Src/var.c

@@ -482,11 +482,11 @@ void Var_Init(void)
 	memcpy((uint8_t*)&PBU_ConfigParam.GearsNum, (uint8_t*)&PBU_ConfigParam_Default.GearsNum, sizeof(PBU_ConfigParam_Struct_t));
 		
 	//MC版本信息初始化,Mode和SN从EEPROM读取
-  strncpy(MC_VerInfo.HW_Version, (char*)"TT_KZ_010A.     ", 16);//TT_KZ_010A
-	strncpy(MC_VerInfo.FW_Version, (char*)"V3r1r0_20200417", 16);
+  strncpy(MC_VerInfo.HW_Version, (char*)"TT_KZ_010C.     ", 16);//TT_KZ_010A
+	strncpy(MC_VerInfo.FW_Version, (char*)"V3r1r1_20200506", 16);
 	
 	//电机型号
-	strncpy(MC_VerInfo.Mode, (char*)"MOTINOVA PEGASI.", 16);
+	strncpy(MC_VerInfo.Mode, (char*)"PG8000 & PSX000.", 16);
 	
 	//电机序列号
 	strncpy(MC_VerInfo.SN_Num, (char*)"0000000000000000", 16);

+ 3 - 1
修改说明.txt

@@ -278,7 +278,9 @@ V3.1.0_20200417
 6、增加对ECU的相关指令,不过暂时未开启;
 7、版本号:V3.1.0_20200417
 
-
+V3.1.1_20200506
+1、CAN错误中断回调中清除中断标志;
+2、版本号:V3.1.1_20200506