增加MS2304和MS2305宏定义。

Core/Inc/main.h

@@ -51,6 +51,7 @@
 #define DEBUG 1
 #define NormalWork 1
 #define BaudRate250K 0
+#define MS2305 //MS2304 »ò MS2305
 #define BREAK_IN_Pin GPIO_PIN_12
 #define BREAK_IN_GPIO_Port GPIOB
 #define BREAK_IN_EXTI_IRQn EXTI15_10_IRQn

MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -14,6 +14,8 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x08000000,0x20000) IRAM(0x20000000,0x5000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -82,6 +84,8 @@
             <UserProg2Name>.\crc_gen_keil.bat</UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
           </AfterMake>
           <SelectedForBatchBuild>0</SelectedForBatchBuild>
           <SVCSIdString></SVCSIdString>
@@ -143,7 +147,6 @@
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
-            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
           <TargetSelection>9</TargetSelection>
@@ -360,6 +363,8 @@
             <uSurpInc>0</uSurpInc>
             <uC99>1</uC99>
             <useXO>0</useXO>
+            <v6Lang>0</v6Lang>
+            <v6LangP>0</v6LangP>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F103xB</Define>

User/Src/motor_control.c

@@ -1712,16 +1712,18 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 		}
 		else //纯转把，限速25km/h或32km/h
 		{
-		  #if 1 //新西兰兼容澳大利亚，纯转把限速25km/h
+		  #if defined MS2304 //新西兰兼容澳大利亚，MS2304，纯转把限速25km/h
 			SpeedLimitEnd = 25;
 			//随车速调节助力比
 		  Torque_Temp = (uint16_t)((uint32_t)(Torque_Temp * Function_Linear_3Stage(0, 0, 240, 46, MC_SpeedSensorData.Speed_Data)) >> 10);	
 			Torque_Temp = (uint16_t)((uint32_t)(Torque_Temp * Function_Linear_3Stage(0, 0, 240, 46, MC_SpeedSensorData.Speed_Data)) >> 10);
-			#else //新西兰，纯转把限速32km/h
+			#elif defined MS2305 //新西兰，MS2305，纯转把限速32km/h
 			SpeedLimitEnd = 32;
 			//随车速调节助力比
 		  Torque_Temp = (uint16_t)((uint32_t)(Torque_Temp * Function_Linear_3Stage(0, 0, 310, 46, MC_SpeedSensorData.Speed_Data)) >> 10);	
 			Torque_Temp = (uint16_t)((uint32_t)(Torque_Temp * Function_Linear_3Stage(0, 0, 310, 46, MC_SpeedSensorData.Speed_Data)) >> 10);
+			#else
+			error();
 			#endif
 		}
 		

User/Src/var.c

@@ -2,7 +2,6 @@
 #include "adc.h"
 #include "hardware_check.h"
 
-
 MC_RunInfo_Struct_t MC_RunInfo;                           //MC运行信息
 MC_ErrorCode_Struct_t MC_ErrorCode;                       //MC故障代码
 MC_VerInfo_Struct_t MC_VerInfo;                           //MC版本信息
@@ -530,7 +529,14 @@ void Var_Init(void)
 	//MC版本信息初始化，Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"QD007H.         ", 16);	
 	strncpy(MC_VerInfo.FW_Version, (char*)"V2r2r0_20240123.", 16);
+	#if defined MS2305
+	strncpy(Firmware_Special, (char*)"TC033001-MS2305-V1r2.           ", 32);
+	#elif defined MS2304
 	strncpy(Firmware_Special, (char*)"TC033001-MS2304-V1r2.           ", 32);
+	#else
+	error();
+	#endif
+	
 	//编译时间
 	do
 	{