MC_VS7500-TC033001-MS2001-V2.1.6.0.6_20210507

1、按照澳大利亚版本需求修改。

MDK-ARM/startup_stm32f103xb.lst

@@ -524,12 +524,11 @@ ork --depend=.\qd007a_ctl_app\startup_stm32f103xb.d -o.\qd007a_ctl_app\startup_
 ARM Macro Assembler    Page 9 
 
 
-stm32f103xb.o -IC:\Users\xuwei\Desktop\Motor\QD007E_20190711\QD007E_CTRL_APP\MD
-K-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.0\CMSIS\Include -
-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="__MIC
-ROLIB SETA 1" --predefine="__UVISION_VERSION SETA 522" --predefine="_RTE_ SETA 
-1" --predefine="STM32F10X_MD SETA 1" --list=startup_stm32f103xb.lst startup_stm
-32f103xb.s
+stm32f103xb.o -ID:\SoftDesign\20190311_QD007A_CTL\QD007E_CTRL_APP\QD007E_CTRL_A
+PP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.4.0\CMSIS\Include -IC:\Keil_v5
+\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="__MICROLIB SETA 
+1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ SETA 1" --predef
+ine="STM32F10X_MD SETA 1" --list=startup_stm32f103xb.lst startup_stm32f103xb.s
 
 
 

MDK-ARM/stm32f1xx_stucpuregsaddressing.lst

@@ -123,19 +123,18 @@ ARM Macro Assembler    Page 2
    99 00000096                 END
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
 ork --depend=.\qd007a_ctl_app\stm32f1xx_stucpuregsaddressing.d -o.\qd007a_ctl_a
-pp\stm32f1xx_stucpuregsaddressing.o -IC:\Users\xuwei\Desktop\Motor\QD007E_20190
-711\QD007E_CTRL_APP\MDK-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\PACK\ARM\CMSIS
-\5.0.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Incl
-ude --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 522" --
-predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stu
+pp\stm32f1xx_stucpuregsaddressing.o -ID:\SoftDesign\20190311_QD007A_CTL\QD007E_
+CTRL_APP\QD007E_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.4.0\CMSI
+S\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --prede
+fine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine="
+_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuregsaddr
 
 
 
 ARM Macro Assembler    Page 3 
 
 
-cpuregsaddressing.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuRegsAddressi
-ng.s
+essing.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuRegsAddressing.s
 
 
 

MDK-ARM/stm32f1xx_stucpuwalkpatkeil.lst

@@ -1593,12 +1593,12 @@ ARM Macro Assembler    Page 25
  1172 000006D0                 END
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
 ork --depend=.\qd007a_ctl_app\stm32f1xx_stucpuwalkpatkeil.d -o.\qd007a_ctl_app\
-stm32f1xx_stucpuwalkpatkeil.o -IC:\Users\xuwei\Desktop\Motor\QD007E_20190711\QD
-007E_CTRL_APP\MDK-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.0
-\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --
-predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 522" --predef
-ine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuwal
-kpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuWalkpatKEIL.s
+stm32f1xx_stucpuwalkpatkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\QD007E_CTRL_A
+PP\QD007E_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.4.0\CMSIS\Incl
+ude -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="
+__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ 
+SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuwalkpatkeil.ls
+t ..\SelfTestUser\src_specific\stm32f1xx_STUCpuWalkpatKEIL.s
 
 
 

MDK-ARM/stm32f1xx_sturamwalkpatkeil.lst

@@ -430,12 +430,12 @@ ARM Macro Assembler    Page 7
   331 000001F2                 END
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
 ork --depend=.\qd007a_ctl_app\stm32f1xx_sturamwalkpatkeil.d -o.\qd007a_ctl_app\
-stm32f1xx_sturamwalkpatkeil.o -IC:\Users\xuwei\Desktop\Motor\QD007E_20190711\QD
-007E_CTRL_APP\MDK-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.0
-\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --
-predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 522" --predef
-ine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_sturamwal
-kpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STURamWalkpatKEIL.s
+stm32f1xx_sturamwalkpatkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\QD007E_CTRL_A
+PP\QD007E_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.4.0\CMSIS\Incl
+ude -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="
+__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ 
+SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_sturamwalkpatkeil.ls
+t ..\SelfTestUser\src_specific\stm32f1xx_STURamWalkpatKEIL.s
 
 
 

User/Src/motor_control.c

@@ -175,7 +175,7 @@ MC_AssistRunMode_Struct_t MC_JudgeAsistRunMode_Process(MC_GearSt_Struct_t GearSt
 			}
 			else
 			{
-			  #if 0
+			  #if 1
 				static MC_AssistRunMode_Struct_t MC_AssistRunMode_Result_Old = MC_AssistRunMode_INVALID;
 				//½øÈëÁ¦¾Øģʽ
 				MC_AssistRunMode_Result = MC_AssistRunMode_TORQUE;
@@ -1232,7 +1232,9 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 	{
 	  MC_TorqueProcess_Param.MotorStopLock_Flag = RESET;
 		//Í£Ö¹ÅжÏ
-		if(AdcSenorData.GasSensor < 30)
+		if((AdcSenorData.GasSensor < 30) ||
+			 (CadenceData.Cadence_Dir == MC_Cadence_Backward) ||
+			 (CadenceData.IsStopFlag == TRUE))
 		{
 		  MC_TorqueProcess_Param.MotorStopLock_Flag = SET;
 		}

User/Src/var.c

@@ -490,8 +490,8 @@ void Var_Init(void)
 		
 	//MC版本信息初始化，Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"QD007H.         ", 16);
-	strncpy(MC_VerInfo.FW_Version, (char*)"V2r1r6_20210427.", 16);
-	strncpy(Firmware_Special, (char*)"TC033001-MS2001-V0r5.           ", 32);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V2r1r6_20210507.", 16);
+	strncpy(Firmware_Special, (char*)"TC033001-MS2001-V0r6.           ", 32);
 		
 	//电机型号
 	strncpy(MC_VerInfo.Mode, (char*)"VL6500 & VS7500.", 16);

修改说明.txt

@@ -387,8 +387,8 @@ MC_VS7500-TC033001-MS2001-V2.1.5.0.5_20210427
 1、增加MC_GearSt_SMART_T = 0x05档位体验，配合大石定制仪表，T Smart档位发送0x05；
 2、增加对T Smart档位平均功耗的存储，对于旧的样车，需要维持在其它档位骑行超过5km后，才会更新并保存T Smart档位的平均功耗。
 
-
-
+MC_VS7500-TC033001-MS2001-V2.1.6.0.6_20210507
+1、按照澳大利亚版本需求修改。