增加 MCU ID

User project/1.FrameLayer/Source/TimeTask_Event.c

@@ -280,6 +280,17 @@ void Event_5ms(void)
 
     /* adc sample with low priority */
     adc_voSampleUp_Low(&adc_stCof, &adc_stUpOut);
+            
+    if (adc_stUpOut.PCBTemp > ((SWORD)cp_stHistoryPara.uwNTCTempMaxCe))
+    {
+        cp_stHistoryPara.uwNTCTempMaxCe = adc_stUpOut.PCBTemp;
+    }
+
+
+    if (adc_stUpOut.PCBTemp < ((SWORD)cp_stHistoryPara.uwNTCTempMinCe))
+    {
+        cp_stHistoryPara.uwNTCTempMinCe = adc_stUpOut.PCBTemp;
+    }
 }
 
 void Event_10ms(void)

User project/3.BasicFunction/Source/canAppl.c

@@ -219,22 +219,24 @@ void Can_voInitMC_Run(void)
 #elif(MOTOR_ID_SEL == MOTOR_WELLING_CITY_48V)
 	strncpy(MC_VerInfo.HW_Version, (char *)"CITY-48V", 8);
 #elif(MOTOR_ID_SEL == MOTOR_WELLING_MTB_36V)
-	strncpy(MC_VerInfo.HW_Version, (char *)"MTB-36V.", 8);
+	strncpy(MC_VerInfo.HW_Version, (char *)"MTB-36V ", 8);
 #elif(MOTOR_ID_SEL == MOTOR_WELLING_MTB_48V)
-	strncpy(MC_VerInfo.HW_Version, (char *)"MTB-48V.", 8);
+	strncpy(MC_VerInfo.HW_Version, (char *)"MTB-48V ", 8);
 #else
-	strncpy(MC_VerInfo.HW_Version, (char *)"TEST.   ", 8);
+	strncpy(MC_VerInfo.HW_Version, (char *)"TEST    ", 8);
 #endif
     
+    strncpy(MC_VerInfo.HW_Version + 8, (char *)"GD  ", 4);
+    
     memcpy((uint8_t*)MCU_ID, (uint8_t*)(HW_ID_START_ADDRESS), 12);
-    memcpy((uint8_t*)(MC_VerInfo.HW_Version + 8), (uint8_t*)(MCU_ID), 4);
     MCU_ID_CRC32 = CRC32_Calculate(MCU_ID,12);
     memcpy((uint8_t*)(MC_VerInfo.HW_Version + 12), (uint8_t*)(&MCU_ID_CRC32), 4);
     
     // Software version
     char chFwVersion[16]="V0r1r10_";
     strncat(chFwVersion,COMMIT_TIME,9);
-    strncpy(MC_VerInfo.FW_Version, (char *)chFwVersion, 16);
+    //strncpy(MC_VerInfo.FW_Version, (char *)chFwVersion, 16);
+    strncpy(MC_VerInfo.FW_Version, (char *)MCU_ID, 12);
     
     // Firmware Special Info
     char chFrimware[32]="TC00000-MC00000-V0r0.  ";
@@ -265,18 +267,6 @@ void Can_voMC_Run_1ms(void) /* parasoft-suppress METRICS-28 "鏈」鐩湀
         cp_stHistoryPara.ulUsedTime++;
     }
 
-
-    if (adc_stUpOut.PCBTemp > ((SWORD)cp_stHistoryPara.uwNTCTempMaxCe))
-    {
-        cp_stHistoryPara.uwNTCTempMaxCe = adc_stUpOut.PCBTemp;
-    }
-
-
-    if (adc_stUpOut.PCBTemp < ((SWORD)cp_stHistoryPara.uwNTCTempMinCe))
-    {
-        cp_stHistoryPara.uwNTCTempMinCe = adc_stUpOut.PCBTemp;
-    }
-
     // Error Cnt record and Error Display Set
     MC_ErrorCntRecord.ulAlamCntTimeCnt_1ms++;
 
@@ -566,13 +556,10 @@ void Can_voMC_Run_200ms(void)
         MC_RunInfoToCDL.Uq = scm_swUqRefPu;
         MC_RunInfoToCDL.InstantTorq = torsensor_stTorSensorOut.uwTorqueReg;
         MC_RunInfoToCDL.FilteTorq = torsensor_stTorSensorOut.uwTorqueLPFPu;
-        MC_RunInfoToCDL.FreqTorq = ass_stCalOut.swCadAss2CurrentTemp;
-        MC_RunInfoToCDL.RS[0] = (UBYTE)scm_swIdRefPu;
-        MC_RunInfoToCDL.RS[1] = (UBYTE)(scm_swIdRefPu>>8);
-        MC_RunInfoToCDL.RS[2] = (UBYTE)scm_swIqRefPu;
-        MC_RunInfoToCDL.RS[3] = (UBYTE)(scm_swIqRefPu>>8);
-        MC_RunInfoToCDL.RS[4] = (UBYTE)ass_stCalOut.swTorAss2CurrentTemp;
-        MC_RunInfoToCDL.RS[5] = (UBYTE)(ass_stCalOut.swTorAss2CurrentTemp>>8);
+        MC_RunInfoToCDL.FreqTorq = ass_stTorqMafValue.slAverValue;
+        MC_RunInfoToCDL.RS[0] = scm_swIdRefPu;
+        MC_RunInfoToCDL.RS[1] = scm_swIqRefPu;
+        MC_RunInfoToCDL.RS[2] = ass_stCalOut.swTorAss2CurrentTemp;
         SendData(ID_MC_TO_CDL, MODE_REPORT, 0xBA20, (UBYTE *)&MC_RunInfoToCDL.SysStatus);
     }
 

User project/4.BasicHardwSoftwLayer/1.BasicHardwLayer/Include/board_config.h

@@ -29,7 +29,7 @@
 
 /* ---------------------------------- 系统ID--------------------------------- */
 
-#define HW_ID_START_ADDRESS 0x1FFFF7ACUL
+#define HW_ID_START_ADDRESS 0x1FFFF7E8UL
 
 /* ---------------------------------- MCU Frequency ---------------------------------- */