Merge branch 'master' into Assist_VoltLimt

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

@@ -454,7 +454,7 @@ void  Event_200ms(void)
         bikespeed_voGetBikeSpeedPwrError(adc_stUpOut.uwU5VPu);
         
         /* Bike Sensor Faults Detect */
-        if((cp_stFlg.RunModelSelect == MountainBIKE) || (cp_stFlg.RunModelSelect == CityBIKE))
+        if(((cp_stFlg.RunModelSelect == MountainBIKE) || (cp_stFlg.RunModelSelect == CityBIKE)) && (1 != MC_WorkMode))
         {
             alm_stBikeIn.uwTroqReg = torsensor_stTorSensorOut.uwTorqueReg;
             alm_stBikeIn.uwTroqPu = torsensor_stTorSensorOut.uwTorqueLPFPu;//torsensor_stTorSensorOut.uwTorquePu;

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

@@ -229,7 +229,7 @@ void Can_voInitMC_Run(void)
 	strncpy(MC_VerInfo.HW_Version, (char *)"TEST    ", 8);
 #endif
     
-    strncpy(MC_VerInfo.HW_Version + 8, (char *)"GD  ", 4);
+    strncpy(MC_VerInfo.HW_Version + 8, (char *)"GD .", 4);
     
     memcpy((uint8_t*)MCU_ID, (uint8_t*)(HW_ID_START_ADDRESS), 12);
     MCU_ID_CRC32 = CRC32_Calculate(MCU_ID,12);