Selaa lähdekoodia

1、增加开机强制进入TURBO挡位;
2、默认参数改为客户车辆配置。

Dail 1 vuosi sitten
vanhempi
sitoutus
5b09c97183

+ 4 - 9
MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -14,8 +14,6 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <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(72000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -84,8 +82,6 @@
             <UserProg2Name>.\crc_gen_keil.bat</UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
           </AfterMake>
           <SelectedForBatchBuild>0</SelectedForBatchBuild>
           <SVCSIdString></SVCSIdString>
@@ -129,7 +125,7 @@
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
-            <RestoreWatchpoints>1</RestoreWatchpoints>
+            <RestoreWatchpoints>0</RestoreWatchpoints>
             <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
             <RestoreFunctions>1</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
@@ -147,9 +143,10 @@
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>1</TargetSelection>
+          <TargetSelection>6</TargetSelection>
           <SimDlls>
             <CpuDll></CpuDll>
             <CpuDllArguments></CpuDllArguments>
@@ -163,7 +160,7 @@
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
             <InitializationFile></InitializationFile>
-            <Driver>BIN\UL2CM3.DLL</Driver>
+            <Driver>Segger\JL2CM3.dll</Driver>
           </TargetDlls>
         </DebugOption>
         <Utilities>
@@ -363,8 +360,6 @@
             <uSurpInc>0</uSurpInc>
             <uC99>1</uC99>
             <useXO>0</useXO>
-            <v6Lang>0</v6Lang>
-            <v6LangP>0</v6LangP>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F103xB</Define>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2573 - 2573
MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex


BIN
MDK-ARM/bin/MC_VL6500J01-TC013041-BM2102_V4.1.0.0.2_20240126.bin


BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 8 - 15
MDK-ARM/stm32f1xx_stucpuregsaddressing.lst

@@ -121,20 +121,13 @@ ARM Macro Assembler    Page 2
                                                             ler
    98 00000096                 ENDP
    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 -ID:\Documents\Work\SoftDesign\TT-KZ-010A_C
-TRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.4.0\CMSIS\Include -IC:\Ke
-il_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="__MICROLIB 
-SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ SETA 1" --p
-redefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuregsaddressing.lst ..\Sel
-
-
-
-ARM Macro Assembler    Page 3 
-
-
-fTestUser\src_specific\stm32f1xx_STUCpuRegsAddressing.s
+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\TT-KZ-010A_CTRL_APP\TT-KZ-01
+0A_CTRL_APP\MDK-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="__MICRO
+LIB SETA 1" --list=stm32f1xx_stucpuregsaddressing.lst ..\SelfTestUser\src_speci
+fic\stm32f1xx_STUCpuRegsAddressing.s
 
 
 
@@ -246,4 +239,4 @@ ssing.s
 ssing.s
 Comment: FailSafePOR used once
 3 symbols
-341 symbols in table
+338 symbols in table

+ 8 - 9
MDK-ARM/stm32f1xx_stucpuwalkpatkeil.lst

@@ -1591,14 +1591,13 @@ ARM Macro Assembler    Page 25
  1170 000006D0         
  1171 000006D0         
  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 -ID:\Documents\Work\SoftDesign\TT-KZ-010A_CTRL_AP
-P\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" --predefi
-ne="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuwalkpatkeil.lst ..\SelfTestUser
-\src_specific\stm32f1xx_STUCpuWalkpatKEIL.s
+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\TT-KZ-010A_CTRL_APP\TT-KZ-010A_CTR
+L_APP\MDK-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 SE
+TA 1" --list=stm32f1xx_stucpuwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32
+f1xx_STUCpuWalkpatKEIL.s
 
 
 
@@ -2666,4 +2665,4 @@ KEIL.s
 KEIL.s
 
 1 symbol
-401 symbols in table
+398 symbols in table

+ 8 - 9
MDK-ARM/stm32f1xx_sturamwalkpatkeil.lst

@@ -428,14 +428,13 @@ ARM Macro Assembler    Page 7
   329 000001F2                 ENDP
   330 000001F2         
   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 -ID:\Documents\Work\SoftDesign\TT-KZ-010A_CTRL_AP
-P\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" --predefi
-ne="STM32F10X_MD SETA 1" --list=stm32f1xx_sturamwalkpatkeil.lst ..\SelfTestUser
-\src_specific\stm32f1xx_STURamWalkpatKEIL.s
+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\TT-KZ-010A_CTRL_APP\TT-KZ-010A_CTR
+L_APP\MDK-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 SE
+TA 1" --list=stm32f1xx_sturamwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32
+f1xx_STURamWalkpatKEIL.s
 
 
 
@@ -812,4 +811,4 @@ IL.s
       None
 Comment: FailSafePOR unused
 1 symbol
-363 symbols in table
+360 symbols in table

+ 1 - 1
User/Src/tasks.c

@@ -967,7 +967,7 @@ void NoPBUMode_Ini( void )
 		if( NoPBUModeIniFinishedFlag== FALSE )
 		{
 			NoPBUModeIniFinishedFlag = TRUE;
-			if(MC_ConfigParam1.NoPBU_Flag == MC_SUPPORT_ENABLE)
+			if(1)//if(MC_ConfigParam1.NoPBU_Flag == MC_SUPPORT_ENABLE)
 			{
 				MC_ControlCode.GearSt = MC_GearSt_Torque_TURBO;//MC_GearSt_SMART;
 				Update_MC_ControlCode_Back();

+ 12 - 12
User/Src/var.c

@@ -64,16 +64,16 @@ const MC_ConfigParam1_Struct_t MC_ConfigParam1_Default =
   (MC_SupportFlag_Struct_t)MC_SUPPORT_DISABLE,     //支持指拨模式,0x55-不支持,0x-AA支持
 	(MC_StarMode_Struct_t)MC_StarMode_NORM,          //启动模式 
 	(uint16_t)100,                                   //停机时间 ms	
-	(uint8_t)25,                                     //限速 km/h
+	(uint8_t)24,                                     //限速 km/h
 	(uint8_t)3,                                      //下降速度
 	(uint8_t)14,                                     //前齿数 T
 	(uint8_t)9,                                      //后齿数 T
-	(uint8_t)17,                                     //限流 A
+	(uint8_t)13,                                     //限流 A
 	(uint8_t)135,                                    //高温预警值 +40℃
 	(uint8_t)165,                                    //高温保护值 +40℃
-  (MC_SupportFlag_Struct_t)MC_SUPPORT_DISABLE,     //无码表支持,0x55-不支持,0x-AA支持	
-  (uint8_t)219,                                    //轮胎周长 cm
-  (uint8_t)0,                                      //系列号,
+  (MC_SupportFlag_Struct_t)MC_SUPPORT_ENABLE,     //无码表支持,0x55-不支持,0x-AA支持	
+  (uint8_t)202,                                    //轮胎周长 cm
+  (uint8_t)1,                                      //系列号,
 	{100,100},                                       //ECO
   {100,100},                                       //NORM
   {100,100},                                       //SPORT
@@ -95,15 +95,15 @@ const MC_ConfigParam2_Struct_t MC_ConfigParam2_Default =
 	(int16_t)0,
 	(MC_SupportFlag_Struct_t)MC_SUPPORT_DISABLE,     //0x55-不支持,0x-AA支持
 	(MC_TailLight_Mode_Struct_t)MC_TAIL_LIGHT_MODE2, 
-	(MC_LightVoltage_Struct_t)0,
-	(MC_LightVoltage_Struct_t)0,
+	(MC_LightVoltage_Struct_t)6,
+	(MC_LightVoltage_Struct_t)6,
 };
 
 //MC默认马达参数,占用16bytes
 const MC_MotorParam_Struct_t MC_MotorParam_Default =
 {
   (uint16_t)250,    //W
-	(uint16_t)2000,   //rpm
+	(uint16_t)1200,   //rpm
 	(uint16_t)200,    //mohm
 	(uint16_t)10,     //mH
 	(uint16_t)10,     //mH
@@ -504,15 +504,15 @@ void Var_Init(void)
 	strncpy(MC_VerInfo.HW_Version, (char*)"TTKZ010D.       ", 16);
 	
 	#if BaudRate250K
-  strncpy(MC_VerInfo.FW_Version, (char*)"V4r1r0_20240125C", 16);
-	#else
-	strncpy(MC_VerInfo.FW_Version, (char*)"V3r4r1_20230317C", 16);
+  strncpy(MC_VerInfo.FW_Version, (char*)"V4r1r0_20240126C", 16);
+	#else 
+	strncpy(MC_VerInfo.FW_Version, (char*)"V4r1r0_20240126C", 16);
 	#endif
 	
   #if NormalWork
 	MC_VerInfo.FW_Version[15] = '.';
   #endif
-	strncpy(Firmware_Special, (char*)"TC013041-BM2102-V0r1.           ", 32);
+	strncpy(Firmware_Special, (char*)"TC013041-BM2102-V0r2.           ", 32);
 	if(MCUManufacturer == NoName) MC_VerInfo.HW_Version[10] = '0';
 	else if(MCUManufacturer == STM32F103RBT6) MC_VerInfo.HW_Version[10] = '1';
 	else if(MCUManufacturer == APM32F103RBT6) MC_VerInfo.HW_Version[10] = '2';

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä