V7r2r0_20221011

优化掉电保护函数；

Core/Src/adc.c

@@ -773,18 +773,35 @@ void MOS_NTC_Init( void )
 
 void PowerDownProtection( uint16_t BusVoltage_AD )
 {
-	static uint16_t powerdowncount=0;
+	static uint16_t poweroncount=0, powerdowncount=0;
+	static TrueOrFalse_Flag_Struct_t poweronFlag = FALSE;
 	
-	if( BusVoltage_AD < 1393 )  //1393对应的母线电压为25V
+	if(poweronFlag == FALSE)
 	{
-		if( ++powerdowncount > 60 ) //电压小于20V并连续60次，大约持续20ms左右
+		if( BusVoltage_AD > 1671 )  //1671对应的母线电压为30V
 		{
-			Disable_PwmGpio_Out();
+			if( ++poweroncount > 30000 ) //电压大于30V并持续10s左右
+			{
+				poweroncount=0;
+				poweronFlag = TRUE;
+			}
 		}
+		else poweroncount=0;
 	}
 	else
 	{
-		powerdowncount=0;
+		if( BusVoltage_AD < 1504 )  //1504对应的母线电压为27V
+		{
+			if( ++powerdowncount > 60 ) //电压小于27V并连续60次，大约持续20ms左右
+			{
+				Disable_PwmGpio_Out();
+				poweronFlag = FALSE;
+			}
+		}
+		else
+		{
+			powerdowncount=0;
+		}
 	}
 }
 /* USER CODE END 1 */

J-scope.jscope

@@ -6,7 +6,7 @@
             <JLink>
                 <Options IsRTTSession="0" IsRTTWithTimeStamp="1" SamplingPeriod="100" Connection="1" SerialNo="0" IP="" TargetDevice="Cortex-M3" TargetInterface="SWD" InterfaceSpeed="4000" />
             </JLink>
-            <ElfFile Name="D:\MOTINOVAϵͳ\Motor\TTKZ019A\TT-KZ-010A_CTRL_APP\MDK-ARM\QD007A_CTL_APP\QD007A_CTL_APP.axf" />
+            <ElfFile Name="D:\MOTINOVAϵͳ\Motor\TTKZ019X\Volans\QD007E_CTRL_APP\MDK-ARM\QD007A_CTL_APP\QD007A_CTL_APP.axf" />
             <DataFile Name="" />
             <RawFile Name="" />
             <Scope>
@@ -17,37 +17,6 @@
             <Graph Show="1" />
             <Watch Show="1" />
         </Windows>
-        <SelectedSymbols>
-            <Symbol>
-                <Options Name="ADC1_Result[0]" Address="0x20001584" Type="ushort" TypeID="11" Size="2" GraphColorRed="255" GraphColorGreen="215" GraphColorBlue="0" YMinSampled="3066" YMaxSampled="3096" YAvgSampled="3076" Offset="4" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="2000" MaxValue="4000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[1]" Address="0x20001586" Type="ushort" TypeID="11" Size="2" GraphColorRed="0" GraphColorGreen="255" GraphColorBlue="0" YMinSampled="2711" YMaxSampled="2722" YAvgSampled="2716" Offset="6" ShowInGraph="1" YOffset="200" IsAutoConfig="1" YResolution="2000" MaxValue="4000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[2]" Address="0x20001588" Type="ushort" TypeID="11" Size="2" GraphColorRed="0" GraphColorGreen="0" GraphColorBlue="176" YMinSampled="3022" YMaxSampled="3089" YAvgSampled="3084" Offset="8" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="2000" MaxValue="4000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[3]" Address="0x2000158A" Type="ushort" TypeID="11" Size="2" GraphColorRed="160" GraphColorGreen="32" GraphColorBlue="240" YMinSampled="2050" YMaxSampled="2059" YAvgSampled="2054" Offset="10" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="1000" MaxValue="2000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[4]" Address="0x2000158C" Type="ushort" TypeID="11" Size="2" GraphColorRed="255" GraphColorGreen="0" GraphColorBlue="0" YMinSampled="1315" YMaxSampled="1323" YAvgSampled="1318" Offset="12" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="1000" MaxValue="2000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[5]" Address="0x2000158E" Type="ushort" TypeID="11" Size="2" GraphColorRed="0" GraphColorGreen="191" GraphColorBlue="255" YMinSampled="1433" YMaxSampled="1444" YAvgSampled="1437" Offset="14" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="1000" MaxValue="2000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[6]" Address="0x20001590" Type="ushort" TypeID="11" Size="2" GraphColorRed="0" GraphColorGreen="100" GraphColorBlue="0" YMinSampled="1442" YMaxSampled="1451" YAvgSampled="1445" Offset="16" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="1000" MaxValue="2000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[7]" Address="0x20001592" Type="ushort" TypeID="11" Size="2" GraphColorRed="205" GraphColorGreen="133" GraphColorBlue="63" YMinSampled="1099" YMaxSampled="1106" YAvgSampled="1102" Offset="18" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="1000" MaxValue="2000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[8]" Address="0x20001594" Type="ushort" TypeID="11" Size="2" GraphColorRed="255" GraphColorGreen="215" GraphColorBlue="0" YMinSampled="663" YMaxSampled="3378" YAvgSampled="667" Offset="20" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="2000" MaxValue="4000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-            <Symbol>
-                <Options Name="ADC1_Result[9]" Address="0x20001596" Type="ushort" TypeID="11" Size="2" GraphColorRed="0" GraphColorGreen="255" GraphColorBlue="0" YMinSampled="3041" YMaxSampled="3124" YAvgSampled="3118" Offset="22" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="2000" MaxValue="4000" File="..\Core\Src\adc.c" Scope="0" DrawStyle="0" />
-            </Symbol>
-        </SelectedSymbols>
+        <SelectedSymbols />
     </Project>
 </JScopeProject>

User/Src/var.c

@@ -500,7 +500,7 @@ void Var_Init(void)
 		
 	//MC版本信息初始化，Mode和SN从EEPROM读取
 	strncpy(MC_VerInfo.HW_Version, (char*)"TTKZ010D.       ", 16);
-	strncpy(MC_VerInfo.FW_Version, (char*)"V7r2r0_20221009C", 16);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V7r2r0_20221011C", 16);
   #if NormalWork
 	MC_VerInfo.FW_Version[15] = '.';
   #endif