|
@@ -271,41 +271,40 @@ void Can_voInitMC_Run(void)
|
|
|
// MC版本信息初始化,Mode和SN从EEPROM读取
|
|
|
strncpy(MC_VerInfo.HW_Version, (char *)"VTA010155A0001 ", 16); //长度不超过16
|
|
|
UBYTE MCU_ID[4] = {0, }, MCU_ID_Cal[2] = {0, };
|
|
|
- memcpy((UBYTE*)MCU_ID, (UBYTE*)(0x41C40000), 4);
|
|
|
+ memcpy((UBYTE*)MCU_ID, (UBYTE*)(0x41C40000), 4); //读取MCU 32位ID
|
|
|
MCU_ID_Cal[0] = MCU_ID[0] ^ MCU_ID[1];
|
|
|
MCU_ID_Cal[1] = MCU_ID[2] ^ MCU_ID[3];
|
|
|
- MC_VerInfo.HW_Version[14] = MCU_ID_Cal[0];
|
|
|
+ MC_VerInfo.HW_Version[14] = MCU_ID_Cal[0]; //校验转换为16位数据
|
|
|
MC_VerInfo.HW_Version[15] = MCU_ID_Cal[1];
|
|
|
|
|
|
// Software version
|
|
|
- char chFwVersion[16]="V1r0r0_";
|
|
|
- strncat(chFwVersion,COMPLIE_TIME,9); // Commit time COMPLIE_TIME
|
|
|
+ char chFwVersion[16] = "V1r0r0_";
|
|
|
+ strncat(chFwVersion, COMPLIE_TIME, 9);
|
|
|
strncpy(MC_VerInfo.FW_Version, (char *)chFwVersion, 16);
|
|
|
|
|
|
// Firmware Special Info
|
|
|
char chFrimware[32]="NC2025X000-MS0000-V0r0. ";
|
|
|
|
|
|
- strncat(chFrimware,FINGER_PRINT,8); // Git Version
|
|
|
+ strncat(chFrimware, FINGER_PRINT, 8); // Git Version
|
|
|
|
|
|
+ #if 0
|
|
|
if(cp_stFlg.RunModelSelect == CadAssist)
|
|
|
{
|
|
|
- strncat(chFrimware,"C",1); // Cadance assist end with "C" Torque assist end with "T"
|
|
|
+ strncat(chFrimware, "C", 1); // Cadance assist end with "C" Torque assist end with "T"
|
|
|
}
|
|
|
else if(cp_stFlg.RunModelSelect == TorqAssist)
|
|
|
{
|
|
|
- strncat(chFrimware,"T",1); // Torque Assist end with "T", Cadence Assist end with "C"
|
|
|
+ strncat(chFrimware, "T", 1); // Torque Assist end with "T", Cadence Assist end with "C"
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
/* 不做处理*/
|
|
|
}
|
|
|
- strncpy(Firmware_Special, (char *)chFrimware, 32);
|
|
|
+ #endif
|
|
|
|
|
|
+ strncpy(Firmware_Special, (char *)chFrimware, 32);
|
|
|
|
|
|
//电机型号
|
|
|
-// memcpy(MC_VerInfo.Mode, Syspara2.flash_stPara.ubMotorVersion, sizeof(Syspara2.flash_stPara.ubMotorVersion));
|
|
|
-// memcpy(MC_VerInfo.SN_Num, Syspara2.flash_stPara.ubSN, sizeof(Syspara2.flash_stPara.ubSN));
|
|
|
-
|
|
|
memcpy(MC_VerInfo.Mode, Productionpara.ubMotorVersion, sizeof(Productionpara.ubMotorVersion));
|
|
|
memcpy(MC_VerInfo.SN_Num, Productionpara.ubSN, sizeof(Productionpara.ubSN));
|
|
|
|