Przeglądaj źródła

修改故障日志地址,解决参数被擦除问题。

Dail 1 rok temu
rodzic
commit
dca50177b2

+ 6 - 11
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(12000000) 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>
@@ -125,7 +121,7 @@
             <Oh166RecLen>16</Oh166RecLen>
           </OPTHX>
           <Simulator>
-            <UseSimulator>0</UseSimulator>
+            <UseSimulator>1</UseSimulator>
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
@@ -137,19 +133,20 @@
             <RestoreSysVw>1</RestoreSysVw>
           </Simulator>
           <Target>
-            <UseTarget>1</UseTarget>
+            <UseTarget>0</UseTarget>
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
             <RestoreWatchpoints>1</RestoreWatchpoints>
             <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
-            <RestoreFunctions>0</RestoreFunctions>
+            <RestoreFunctions>1</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>1</TargetSelection>
+          <TargetSelection>9</TargetSelection>
           <SimDlls>
             <CpuDll></CpuDll>
             <CpuDllArguments></CpuDllArguments>
@@ -163,7 +160,7 @@
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
             <InitializationFile></InitializationFile>
-            <Driver>BIN\UL2CM3.DLL</Driver>
+            <Driver>BIN\CMSIS_AGDI.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>

Plik diff jest za duży
+ 2618 - 2618
MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex


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-19B_Vo
-lans\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 SET
-A 1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ SETA 1" --pred
-efine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuregsaddressing.lst ..\SelfTe
-
-
-
-ARM Macro Assembler    Page 3 
-
-
-stUser\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\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
 
 
 
@@ -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-19B_Volans\M
-DK-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" --predefine=
-"STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuwalkpatkeil.lst ..\SelfTestUser\sr
-c_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\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
 
 
 
@@ -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-19B_Volans\M
-DK-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" --predefine=
-"STM32F10X_MD SETA 1" --list=stm32f1xx_sturamwalkpatkeil.lst ..\SelfTestUser\sr
-c_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\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
 
 
 
@@ -812,4 +811,4 @@ IL.s
       None
 Comment: FailSafePOR unused
 1 symbol
-363 symbols in table
+360 symbols in table

+ 2 - 2
User/Inc/eeprom_flash.h

@@ -16,8 +16,8 @@
 #define    EEPROM_FLASH_ADDR_USER_INFO2          EEPROM_FLASH_BEGIN_ADDRESS + (uint32_t)104         //自定义字符串2 16bytes + 4bytes
 #define    EEPROM_FLASH_ADDR_USER_INFO3          EEPROM_FLASH_BEGIN_ADDRESS + (uint32_t)124         //自定义字符串3 16bytes + 4bytes
 
-#define    EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS    0x0801F400
-#define    EEPROM_FLASH_ADDR_TEMP_END_ADDRESS      0x0801F7FF
+#define    EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS    0x0801E800
+#define    EEPROM_FLASH_ADDR_TEMP_END_ADDRESS      0x0801EFFF
 
 #define    EEPROM_FLASH_ADDR_POWEROFF_BKP_FLAG   EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS               //掉电保存的关键数据标志 4bytes + 4bytes
 #define    EEPROM_FLASH_ADDR_POWEROFF_BKP        EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS + (uint32_t)8 //掉电保存的关键数据 40bytes + 4bytes

+ 2 - 2
User/Inc/log_save.h

@@ -5,8 +5,8 @@
 #include "motor_control.h"
 #include "eeprom_flash.h"
 
-#define LOG_ADDRESS_BEGIN               0x0801F800
-#define LOG_ADDRESS_END                 0x0801FBFF
+#define LOG_ADDRESS_BEGIN               0x0801F000
+#define LOG_ADDRESS_END                 0x0801F3FF
 
 //故障日志记录信息 64 bytes,1K空间可以保存最近16条故障记录
 typedef struct

+ 1 - 1
User/Src/motor_control.c

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

+ 33 - 2
User/Src/var.c

@@ -528,9 +528,40 @@ void Var_Init(void)
 	memcpy((uint8_t*)&PBU_ConfigParam.GearsNum, (uint8_t*)&PBU_ConfigParam_Default.GearsNum, sizeof(PBU_ConfigParam_Struct_t));
 		
 	//MC版本信息初始化,Mode和SN从EEPROM读取
-  strncpy(MC_VerInfo.HW_Version, (char*)"QD007H.         ", 16);
+  strncpy(MC_VerInfo.HW_Version, (char*)"QD007H.         ", 16);	
 	strncpy(MC_VerInfo.FW_Version, (char*)"V2r2r0_20240123.", 16);
-	strncpy(Firmware_Special, (char*)"TC033001-MS2305-V1r0.           ", 32);
+	strncpy(Firmware_Special, (char*)"TC033001-MS2304-V1r2.           ", 32);
+	//编译时间
+	do
+	{
+	  uint8_t String_BuildDate[] = __DATE__; //Mouth Date Year,例如Jan 13 2022
+		uint8_t String_BuildTime[] = __TIME__; //HH:MM:SS,例如18:00:00
+		//年
+		Firmware_Special[26] = (String_BuildDate[9] - '0') * 10 + (String_BuildDate[10] - '0');
+		//月
+		if(strncasecmp((char*)String_BuildDate, "Jan", 3) == 0) Firmware_Special[27] = 1;
+		else if(strncasecmp((char*)String_BuildDate, "Feb", 3) == 0) Firmware_Special[27] = 2;
+		else if(strncasecmp((char*)String_BuildDate, "Mar", 3) == 0) Firmware_Special[27] = 3;
+		else if(strncasecmp((char*)String_BuildDate, "Apr", 3) == 0) Firmware_Special[27] = 4;
+		else if(strncasecmp((char*)String_BuildDate, "May", 3) == 0) Firmware_Special[27] = 5;
+		else if(strncasecmp((char*)String_BuildDate, "Jun", 3) == 0) Firmware_Special[27] = 6;
+		else if(strncasecmp((char*)String_BuildDate, "Jul", 3) == 0) Firmware_Special[27] = 7;
+		else if(strncasecmp((char*)String_BuildDate, "Aug", 3) == 0) Firmware_Special[27] = 8;
+		else if(strncasecmp((char*)String_BuildDate, "Sep", 3) == 0) Firmware_Special[27] = 9;
+		else if(strncasecmp((char*)String_BuildDate, "Oct", 3) == 0) Firmware_Special[27] = 10;
+		else if(strncasecmp((char*)String_BuildDate, "Nov", 3) == 0) Firmware_Special[27] = 11;
+		else if(strncasecmp((char*)String_BuildDate, "Dec", 3) == 0) Firmware_Special[27] = 12;
+		else Firmware_Special[27] = 0;
+		//日		
+		Firmware_Special[28] = (String_BuildDate[4] == 0x20 ? 0 : String_BuildDate[4] - '0') * 10 + (String_BuildDate[5] - '0');
+		//时
+		Firmware_Special[29] = (String_BuildTime[0] == 0x20 ? 0 : String_BuildTime[0] - '0') * 10 + (String_BuildTime[1] - '0');
+    //分
+		Firmware_Special[30] = (String_BuildTime[3] == 0x20 ? 0 : String_BuildTime[3] - '0') * 10 + (String_BuildTime[4] - '0');
+		//秒
+		Firmware_Special[31] = (String_BuildTime[6] == 0x20 ? 0 : String_BuildTime[6] - '0') * 10 + (String_BuildTime[7] - '0');		
+	}while(0);
+	
 	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';

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików