Quellcode durchsuchen

调试1,增加MOS过额降电流处理。

hero vor 1 Jahr
Ursprung
Commit
ae15e0e6c7

+ 9 - 4
MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -14,6 +14,8 @@
         <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>
@@ -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>
@@ -125,7 +129,7 @@
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
-            <RestoreWatchpoints>0</RestoreWatchpoints>
+            <RestoreWatchpoints>1</RestoreWatchpoints>
             <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
             <RestoreFunctions>1</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
@@ -143,10 +147,9 @@
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
-            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>6</TargetSelection>
+          <TargetSelection>1</TargetSelection>
           <SimDlls>
             <CpuDll></CpuDll>
             <CpuDllArguments></CpuDllArguments>
@@ -160,7 +163,7 @@
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
             <InitializationFile></InitializationFile>
-            <Driver>Segger\JL2CM3.dll</Driver>
+            <Driver>BIN\UL2CM3.DLL</Driver>
           </TargetDlls>
         </DebugOption>
         <Utilities>
@@ -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,PEGASI_48V,BARD_250K</Define>

Datei-Diff unterdrückt, da er zu groß ist
+ 2641 - 2641
MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex


BIN
MDK-ARM/bin/MC_PSX0XX(250K)-TC011000-MS0000-V7.2.3.0.0_20231118-1.bin


BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 8 - 7
MDK-ARM/startup_stm32f103xb.lst

@@ -516,18 +516,19 @@ ARM Macro Assembler    Page 8
   334 00000004         
   335 00000004         
   336 00000004                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\startup_stm32f103xb.d -o.\qd007a_ctl_app\startup_stm32f103xb.o -ID:\So
+Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
+ork --depend=.\qd007a_ctl_app\startup_stm32f103xb.d -o.\qd007a_ctl_app\startup_
 
 
 
 ARM Macro Assembler    Page 9 
 
 
-ftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-010A_CTRL_APP\MDK-ARM\RT
-E -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Kei
-l\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SETA 1" --list=sta
-rtup_stm32f103xb.lst startup_stm32f103xb.s
+stm32f103xb.o -ID:\Documents\Work\SoftDesign\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE -I
+C:\Keil_v5\ARM\PACK\ARM\CMSIS\4.4.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\ST
+M32F1xx_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=startup_stm32f103xb.lst startup_stm32f103xb.s
 
 
 
@@ -1257,4 +1258,4 @@ Symbol: __main
       At line 152 in file startup_stm32f103xb.s
 Comment: __main used once
 2 symbols
-405 symbols in table
+408 symbols in table

+ 15 - 8
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\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
+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
 
 
 
@@ -239,4 +246,4 @@ ssing.s
 ssing.s
 Comment: FailSafePOR used once
 3 symbols
-338 symbols in table
+341 symbols in table

+ 9 - 8
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\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
+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
 
 
 
@@ -2665,4 +2666,4 @@ KEIL.s
 KEIL.s
 
 1 symbol
-398 symbols in table
+401 symbols in table

+ 9 - 8
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\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
+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
 
 
 
@@ -811,4 +812,4 @@ IL.s
       None
 Comment: FailSafePOR unused
 1 symbol
-360 symbols in table
+363 symbols in table

+ 27 - 22
User/Src/motor_control.c

@@ -169,7 +169,7 @@ uint16_t MC_LimitSpeed_Cal_K_BySOC(FunctionalState Flag, uint16_t SOC)
 	return Limit_K_BySOC;
 }
 
-//随温度计算助力衰减系数
+//随温度计算助力衰减系数,温度区间25℃
 uint16_t MC_Cal_K_ByTemperature(uint16_t CoilTemp, uint16_t AlarmTempTH)
 {
   uint32_t CalTemp;
@@ -542,9 +542,9 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
 			case MC_GearSt_Torque_ECO:
 			{
 				//控制输入给定加速斜率
-				TorqueAccStep = (MC_AssisParam.Gear_ECO.AccCnt <= 0) ? 1 : MC_AssisParam.Gear_ECO.AccCnt;
+				TorqueAccStep = 1;
 				//控制输入给定减速斜率
-				TorqueDecStep = MC_AssisParam.Gear_ECO.DecCnt;	
+				TorqueDecStep = 1;	
 				//根据输入调节力矩环给定
 				Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_AssisParam.Gear_ECO.Upper_Iq) >> 11;
 				//给定上限
@@ -561,9 +561,9 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
 			case MC_GearSt_Torque_NORM:
 			{
 				//控制输入给定加速斜率
-				TorqueAccStep = (MC_AssisParam.Gear_NORM.AccCnt <= 0) ? 1 : MC_AssisParam.Gear_NORM.AccCnt;
+				TorqueAccStep = 1;
 				//控制输入给定减速斜率
-				TorqueDecStep = MC_AssisParam.Gear_NORM.DecCnt;	
+				TorqueDecStep = 1;	
 				//根据输入调节力矩环给定
 				Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_AssisParam.Gear_NORM.Upper_Iq) >> 11;
 				//给定上限
@@ -580,9 +580,9 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
 			case MC_GearSt_Torque_SPORT:
 			{
 				//控制输入给定加速斜率
-				TorqueAccStep = (MC_AssisParam.Gear_SPORT.AccCnt <= 0) ? 1 : MC_AssisParam.Gear_SPORT.AccCnt;
+				TorqueAccStep = 1;
 				//控制输入给定减速斜率
-				TorqueDecStep = MC_AssisParam.Gear_SPORT.DecCnt;	
+				TorqueDecStep = 1;	
 				//根据输入调节力矩环给定
 				Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_AssisParam.Gear_SPORT.Upper_Iq) >> 11;
 				//给定上限
@@ -599,9 +599,9 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
 			case MC_GearSt_Torque_TURBO: case MC_GearSt_SMART:
 			{
 				//控制输入给定加速斜率
-				TorqueAccStep = (MC_AssisParam.Gear_TURBO.AccCnt <= 0) ? 1 : MC_AssisParam.Gear_TURBO.AccCnt;
+				TorqueAccStep = 1;
 				//控制输入给定减速斜率
-				TorqueDecStep = MC_AssisParam.Gear_TURBO.DecCnt;	
+				TorqueDecStep = 1;
 				//根据输入调节力矩环给定
 				Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_AssisParam.Gear_TURBO.Upper_Iq) >> 11;
 				//给定上限
@@ -627,9 +627,9 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
 	else if(GasMode_Param.Mode_bit.PowerLimitFlag == 0) //不根据挡位限制功率,按照Turbo参数
 	{
 	  //控制输入给定加速斜率
-		TorqueAccStep = (MC_AssisParam.Gear_SMART.AccCnt <= 0) ? 1 : MC_AssisParam.Gear_SMART.AccCnt;
+		TorqueAccStep = 1;
 		//控制输入给定减速斜率
-		TorqueDecStep = MC_AssisParam.Gear_TURBO.DecCnt;	
+		TorqueDecStep = 1;	
 		//根据输入调节力矩环给定
 		Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_AssisParam.Gear_TURBO.Upper_Iq) >> 11;
 		//给定上限
@@ -687,7 +687,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
 			MC_TorqueProcess_Param.TorqueRefEnd -= 1; 
 		}
 	}
-	else if((0)&&(MC_SpeedSensorData.Speed_Data < 100))  //上坡处理,取消了坡度传感器,这里不执行			  
+	else if((0)&&(MC_SpeedSensorData.Speed_Data < 100)) //上坡处理,取消了坡度传感器,这里不执行			  
 	{
 		if((MC_TorqueProcess_Param.TorqueRef - MC_TorqueProcess_Param.TorqueRefEnd) > 2)
 		{
@@ -734,7 +734,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
 	static uint16_t K_ByVoltage_Set_Old = 1024;
 	uint16_t K_ByVoltage_Set;
 	static uint16_t K_ByVoltage_Result;
-	uint32_t K_ByTemperature_Set, K_ByTemperature_Set1, K_ByTemperature_Set2;
+	uint16_t K_ByTemperature_Set, K_ByTemperature_SetTemp[3];;
 	static uint16_t K_ByTemperature_Result;
 
 	//根据电压调节输出
@@ -743,9 +743,10 @@ MC_CalParam_Struct_t MC_AssistRunMode_GasTorque_Process(MC_GasMode_Struct_t GasM
   K_ByVoltage_Result = MC_DataSet_Linear_Process(K_ByVoltage_Set, K_ByVoltage_Result, 1, 1); //设定值与给定值线性处理
 	
 	//根据温度调节输出
-	K_ByTemperature_Set1 = MC_Cal_K_ByTemperature(MC_RunInfo.T_Coil, MC_ConfigParam1.TempTH_Alarm); //根据温度计算衰减比例
-	K_ByTemperature_Set2 = MC_Cal_K_ByTemperature(MC_RunInfo.T_PCB, (MC_ConfigParam1.TempTH_Alarm-15)); //根据温度计算衰减比例
-	K_ByTemperature_Set  = (K_ByTemperature_Set1 * K_ByTemperature_Set2)>>10;	
+	K_ByTemperature_SetTemp[0] = MC_Cal_K_ByTemperature(MC_RunInfo.T_PCB, (MC_ConfigParam1.TempTH_Alarm - 15));     //根据PCB温度衰减系数,80℃到105℃
+	K_ByTemperature_SetTemp[1] = MC_Cal_K_ByTemperature(MC_RunInfo.T_MCU, (MC_ConfigParam1.TempTH_Alarm - 5));      //根据MOS温度衰减系数,90℃到115℃
+	K_ByTemperature_SetTemp[2] = MC_Cal_K_ByTemperature(MC_RunInfo.T_Coil, (MC_ConfigParam1.TempTH_Alarm));         //根据电机温度衰减系数,95℃到120℃
+	K_ByTemperature_Set = GetMinData(K_ByTemperature_SetTemp, 3);	
 	K_ByTemperature_Result = MC_DataSet_Linear_Process(K_ByTemperature_Set, K_ByTemperature_Result, 1, 1); //设定值与给定值线性处理
 	
 	#else
@@ -864,7 +865,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Walk_Process(MC_WorkMode_Struct_t p_MC_Wor
 	static uint16_t K_ByVoltage_Set_Old = 1024;
 	uint16_t K_ByVoltage_Set;
 	static uint16_t K_ByVoltage_Result;
-	uint16_t K_ByTemperature_Set;
+	uint16_t K_ByTemperature_Set, K_ByTemperature_SetTemp[3];
 	static uint16_t K_ByTemperature_Result;
 
 	//根据电压调节输出
@@ -873,7 +874,10 @@ MC_CalParam_Struct_t MC_AssistRunMode_Walk_Process(MC_WorkMode_Struct_t p_MC_Wor
   K_ByVoltage_Result = MC_DataSet_Linear_Process(K_ByVoltage_Set, K_ByVoltage_Result, 1, 1); //设定值与给定值线性处理
 	
 	//根据温度调节输出
-	K_ByTemperature_Set = MC_Cal_K_ByTemperature(MC_RunInfo.T_Coil, MC_ConfigParam1.TempTH_Alarm); //根据温度计算衰减比例
+	K_ByTemperature_SetTemp[0] = MC_Cal_K_ByTemperature(MC_RunInfo.T_PCB, (MC_ConfigParam1.TempTH_Alarm - 15));     //根据PCB温度衰减系数,80℃到105℃
+	K_ByTemperature_SetTemp[1] = MC_Cal_K_ByTemperature(MC_RunInfo.T_MCU, (MC_ConfigParam1.TempTH_Alarm - 5));      //根据MOS温度衰减系数,90℃到115℃
+	K_ByTemperature_SetTemp[2] = MC_Cal_K_ByTemperature(MC_RunInfo.T_Coil, (MC_ConfigParam1.TempTH_Alarm));         //根据电机温度衰减系数,95℃到120℃
+	K_ByTemperature_Set = GetMinData(K_ByTemperature_SetTemp, 3);	
 	K_ByTemperature_Result = MC_DataSet_Linear_Process(K_ByTemperature_Set, K_ByTemperature_Result, 1, 1); //设定值与给定值线性处理
 	
 	#else
@@ -1351,7 +1355,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(uint16_t SenorData, MC_Gear
 	static uint16_t K_ByVoltage_Set_Old = 1024;
 	uint16_t K_ByVoltage_Set;
 	static uint16_t K_ByVoltage_Result;
-	uint32_t K_ByTemperature_Set, K_ByTemperature_Set1, K_ByTemperature_Set2;
+	uint16_t K_ByTemperature_Set, K_ByTemperature_SetTemp[3];
 	static uint16_t K_ByTemperature_Result;
 
 	//根据电压调节输出
@@ -1360,9 +1364,10 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(uint16_t SenorData, MC_Gear
   K_ByVoltage_Result = MC_DataSet_Linear_Process(K_ByVoltage_Set, K_ByVoltage_Result, 1, 1); //设定值与给定值线性处理
 	
 	//根据温度调节输出
-	K_ByTemperature_Set1 = MC_Cal_K_ByTemperature(MC_RunInfo.T_Coil, MC_ConfigParam1.TempTH_Alarm); //根据温度计算衰减比例
-	K_ByTemperature_Set2 = MC_Cal_K_ByTemperature(MC_RunInfo.T_PCB, (MC_ConfigParam1.TempTH_Alarm-15)); //根据温度计算衰减比例
-	K_ByTemperature_Set  = (K_ByTemperature_Set1 * K_ByTemperature_Set2)>>10;	
+	K_ByTemperature_SetTemp[0] = MC_Cal_K_ByTemperature(MC_RunInfo.T_PCB, (MC_ConfigParam1.TempTH_Alarm - 15));     //根据PCB温度衰减系数,80℃到105℃
+	K_ByTemperature_SetTemp[1] = MC_Cal_K_ByTemperature(MC_RunInfo.T_MCU, (MC_ConfigParam1.TempTH_Alarm - 5));      //根据MOS温度衰减系数,90℃到115℃
+	K_ByTemperature_SetTemp[2] = MC_Cal_K_ByTemperature(MC_RunInfo.T_Coil, (MC_ConfigParam1.TempTH_Alarm));         //根据电机温度衰减系数,95℃到120℃
+	K_ByTemperature_Set = GetMinData(K_ByTemperature_SetTemp, 3);	
 	K_ByTemperature_Result = MC_DataSet_Linear_Process(K_ByTemperature_Set, K_ByTemperature_Result, 1, 1); //设定值与给定值线性处理
 	
 	#else

+ 5 - 5
User/Src/protect_check.c

@@ -256,16 +256,16 @@ void MC_Protect_OverHeat_Process(uint8_t T_MCU, uint8_t T_PCB, uint8_t T_Coil, u
 	{
 		//旧板无MOS温度传感器,根据PCB温度和绕组温度
 		if( MC_HallSensorData.InverterExistFlag==TRUE )
-		{	//PCB板100度保护,绕组135度保护
-			if( (T_PCB < (TH - 25))&&(T_Coil < (TH + 10)) ) 
+		{	//PCB板105度保护,绕组135度保护
+			if( (T_PCB < (TH - 20))&&(T_Coil < (TH + 10)) ) 
 			{
 				OT_Set_TimeCnt = HAL_GetTick();
 			}
 		}
 		//新板有MOS温度传感器,根据PCB温度、MOS温度、绕组温度
 		else
-		{ //单片机100度保护,绕组135度保护,MOS管105度保护
-			if( (T_PCB < (TH - 25))&&(T_Coil < (TH + 10))&&(T_MCU < (TH - 20)) ) 
+		{ //单片机105度保护,绕组135度保护,MOS管115度保护
+			if( (T_PCB < (TH - 20))&&(T_Coil < (TH + 10))&&(T_MCU < (TH - 10)) ) 
 			{
 				OT_Set_TimeCnt = HAL_GetTick();
 			}
@@ -296,7 +296,7 @@ void MC_Protect_OverHeat_Process(uint8_t T_MCU, uint8_t T_PCB, uint8_t T_Coil, u
 		}
 		else
 		{ //过热保护恢复 PCB温度小于80度,绕组温度小于105度,MOS管温度小于95度,且保护时间大于5分钟
-			if(( (T_PCB < (TH - 45)) && (T_Coil < (TH  - 20))&&(T_MCU < (TH  - 30)) ) && ((HAL_GetTick() - OT_Reset_TimeCnt) > 300000))
+			if(( (T_PCB < (TH - 35)) && (T_Coil < (TH  - 20)) && (T_MCU < (TH  - 30)) ) && ((HAL_GetTick() - OT_Reset_TimeCnt) > 300000))
 			{
 				p_MC_ErrorCode->ERROR_Bit.Protect_OverTemp = 0;
 				OT_Set_TimeCnt = HAL_GetTick();

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.