优化骑行体验

MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -14,7 +14,7 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.1.1.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>
@@ -125,7 +125,7 @@
             <Oh166RecLen>16</Oh166RecLen>
           </OPTHX>
           <Simulator>
-            <UseSimulator>1</UseSimulator>
+            <UseSimulator>0</UseSimulator>
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
@@ -137,19 +137,19 @@
             <RestoreSysVw>1</RestoreSysVw>
           </Simulator>
           <Target>
-            <UseTarget>0</UseTarget>
+            <UseTarget>1</UseTarget>
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
             <RestoreWatchpoints>1</RestoreWatchpoints>
             <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
-            <RestoreFunctions>1</RestoreFunctions>
+            <RestoreFunctions>0</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>9</TargetSelection>
+          <TargetSelection>1</TargetSelection>
           <SimDlls>
             <CpuDll></CpuDll>
             <CpuDllArguments></CpuDllArguments>
@@ -163,7 +163,7 @@
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
             <InitializationFile></InitializationFile>
-            <Driver>BIN\CMSIS_AGDI.dll</Driver>
+            <Driver>BIN\UL2CM3.DLL</Driver>
           </TargetDlls>
         </DebugOption>
         <Utilities>

MDK-ARM/stm32f1xx_stucpuregsaddressing.lst

@@ -121,13 +121,20 @@ ARM Macro Assembler    Page 2
                                                             ler
    98 00000096                 ENDP
    99 00000096                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_stucpuregsaddressing.d -o.\qd007a_ctl_app\stm32f1xx_stucpure
-gsaddressing.o -ID:\SoftDesign\20190311_QD007A_CTL\QD007E_CTRL_APP\QD007E_CTRL_
-APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil_v
-5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SETA
- 1" --list=stm32f1xx_stucpuregsaddressing.lst ..\SelfTestUser\src_specific\stm3
-2f1xx_STUCpuRegsAddressing.s
+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\hero\Documents\Work\SoftDesign\T
+T-KZ-19B_Volans\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CMSIS\Core\In
+clude -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_stucpuregsaddressi
+
+
+
+ARM Macro Assembler    Page 3 
+
+
+ng.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuRegsAddressing.s
 
 
 
@@ -239,4 +246,4 @@ ssing.s
 ssing.s
 Comment: FailSafePOR used once
 3 symbols
-338 symbols in table
+341 symbols in table

MDK-ARM/stm32f1xx_stucpuwalkpatkeil.lst

@@ -1591,13 +1591,14 @@ ARM Macro Assembler    Page 25
  1170 000006D0         
  1171 000006D0         
  1172 000006D0                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_stucpuwalkpatkeil.d -o.\qd007a_ctl_app\stm32f1xx_stucpuwalkp
-atkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\QD007E_CTRL_APP\QD007E_CTRL_APP\MD
-K-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil_v5\ARM\
-PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SETA 1" --
-list=stm32f1xx_stucpuwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STU
-CpuWalkpatKEIL.s
+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\hero\Documents\Work\SoftDesign\TT-KZ-1
+9B_Volans\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CMSIS\Core\Include 
+-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="__MI
+CROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ SETA
+ 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuwalkpatkeil.lst ..
+\SelfTestUser\src_specific\stm32f1xx_STUCpuWalkpatKEIL.s
 
 
 
@@ -2665,4 +2666,4 @@ KEIL.s
 KEIL.s
 
 1 symbol
-398 symbols in table
+401 symbols in table

MDK-ARM/stm32f1xx_sturamwalkpatkeil.lst

@@ -428,13 +428,14 @@ ARM Macro Assembler    Page 7
   329 000001F2                 ENDP
   330 000001F2         
   331 000001F2                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_sturamwalkpatkeil.d -o.\qd007a_ctl_app\stm32f1xx_sturamwalkp
-atkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\QD007E_CTRL_APP\QD007E_CTRL_APP\MD
-K-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil_v5\ARM\
-PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SETA 1" --
-list=stm32f1xx_sturamwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STU
-RamWalkpatKEIL.s
+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\hero\Documents\Work\SoftDesign\TT-KZ-1
+9B_Volans\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CMSIS\Core\Include 
+-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="__MI
+CROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ SETA
+ 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_sturamwalkpatkeil.lst ..
+\SelfTestUser\src_specific\stm32f1xx_STURamWalkpatKEIL.s
 
 
 
@@ -811,4 +812,4 @@ IL.s
       None
 Comment: FailSafePOR unused
 1 symbol
-360 symbols in table
+363 symbols in table

User/Src/motor_control.c

@@ -1335,7 +1335,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 			#endif
 				
 			//µÍÁ¦¾ØÍ£»ú
-			TorqueStopData = (MC_TorqueCorrectParam.StarData < 200) ? 100 : (MC_TorqueCorrectParam.StarData >> 1);
+			TorqueStopData = 100;//(MC_TorqueCorrectParam.StarData < 200) ? 100 : (MC_TorqueCorrectParam.StarData >> 1);
 			if(MC_TorqueProcess_Param.TorqueApp >= (TorqueStopData))
 			{
 				TorqueStopDelayTimeCnt = HAL_GetTick();
@@ -1350,7 +1350,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 				{
 					TorqueStopDelayTime = 1200;
 				}
-				TorqueStopDelayTime= (TorqueStopDelayTime < 500) ? 500 : TorqueStopDelayTime;
+				TorqueStopDelayTime = 2000;//(TorqueStopDelayTime < 500) ? 500 : TorqueStopDelayTime;
 				if((HAL_GetTick() - TorqueStopDelayTimeCnt) > TorqueStopDelayTime)//³¬Ê±1200ms
 				{
 					MC_TorqueProcess_Param.MotorStopLock_Flag = SET;

User/Src/var.c

@@ -256,9 +256,9 @@ const nGearParam_Struct_t GearParam_Default_SMART_Volans =
 //ECO도貫燎제꽝鑒
 const nGearParam_Struct_t GearParam_Default_ECO_Volans_Plus =
 {
-  (uint16_t)384,
+  (uint16_t)461,
 	(uint16_t)0,
-	(uint16_t)100,
+	(uint16_t)300,
 	(uint16_t)840,
 	(uint8_t)2,
 	(uint8_t)1,
@@ -268,9 +268,9 @@ const nGearParam_Struct_t GearParam_Default_ECO_Volans_Plus =
 //NORM도貫燎제꽝鑒
 const nGearParam_Struct_t GearParam_Default_NORM_Volans_Plus =
 {
-  (uint16_t)858,
+  (uint16_t)1029,
 	(uint16_t)0,
-	(uint16_t)100,
+	(uint16_t)300,
 	(uint16_t)1200,
 	(uint8_t)2,
 	(uint8_t)1,
@@ -280,9 +280,9 @@ const nGearParam_Struct_t GearParam_Default_NORM_Volans_Plus =
 //SPORT도貫燎제꽝鑒
 const nGearParam_Struct_t GearParam_Default_SPORT_Volans_Plus =
 {
-  (uint16_t)1353,
+  (uint16_t)1624,
 	(uint16_t)700,
-	(uint16_t)100,
+	(uint16_t)300,
 	(uint16_t)1590,
 	(uint8_t)3,
 	(uint8_t)1,
@@ -292,9 +292,9 @@ const nGearParam_Struct_t GearParam_Default_SPORT_Volans_Plus =
 //TURBO도貫燎제꽝鑒
 const nGearParam_Struct_t GearParam_Default_TURBO_Volans_Plus = 
 {
-  (uint16_t)1885,
+  (uint16_t)2262,
 	(uint16_t)840,
-	(uint16_t)100,
+	(uint16_t)300,
 	(uint16_t)1850,
 	(uint8_t)4,
 	(uint8_t)1,
@@ -304,9 +304,9 @@ const nGearParam_Struct_t GearParam_Default_TURBO_Volans_Plus =
 //5도燎제꽝鑒
 const nGearParam_Struct_t GearParam_Default_5_Volans_Plus = 
 {
-  (uint16_t)2354,
+  (uint16_t)2824,
 	(uint16_t)840,
-	(uint16_t)100,
+	(uint16_t)300,
 	(uint16_t)2100,
 	(uint8_t)5,
 	(uint8_t)1,
@@ -317,8 +317,8 @@ const nGearParam_Struct_t GearParam_Default_5_Volans_Plus =
 const nGearParam_Struct_t GearParam_Default_SMART_Volans_Plus =
 {
   (uint16_t)0,
-	(uint16_t)500,
-	(uint16_t)100,
+	(uint16_t)350,
+	(uint16_t)300,
 	(uint16_t)2100,
 	(uint8_t)4,
 	(uint8_t)1,
@@ -329,8 +329,8 @@ const nGearParam_Struct_t GearParam_Default_SMART_Volans_Plus =
 const nGearParam_Struct_t GearParam_Default_SMART_T_Volans_Plus =
 {
   (uint16_t)0,
-	(uint16_t)750,
-	(uint16_t)100,
+	(uint16_t)500,
+	(uint16_t)300,
 	(uint16_t)2100,
 	(uint8_t)4,
 	(uint8_t)1,
@@ -528,9 +528,9 @@ 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);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V2r2r0_20250219.", 16);
 	#if defined MS2305
-	strncpy(Firmware_Special, (char*)"TC033001-MS2305-V1r2.           ", 32);
+	strncpy(Firmware_Special, (char*)"TC033001-MS2305-V1r3.           ", 32);
 	#elif defined MS2304
 	strncpy(Firmware_Special, (char*)"TC033001-MS2304-V1r2.           ", 32);
 	#else