修改TIME的报警，改为TIME_

.gitignore

@@ -7,3 +7,7 @@
 /TIN001-PLC/Jet_Furance_PMC/Jet_Furance_PMC/.vs/Jet_Furnace_PMC/v16
 /TIN001-PLC/TIN001.project.~u
 /TIN001-PLC/TIN001_PLC.tsproj.bak
+/TIN001-PLC/TIN001/_Boot
+/TIN001-PLC/TIN001/_Deployment/TwinCAT RT (x64)
+/TIN001-PLC/TIN001/FurancePMC.pdb
+/TIN001-PLC/TIN001/FurancePMC.sys

TIN001-PLC/Jet_Furance_PMC/Jet_Furance_PMC/Jet_Furance_PMC/FurancePMC/AlarmCondition.h

@@ -15,7 +15,7 @@
 #define EMPTY 1 
 #define PERCENT_SV 10 
 #define PERCENT_FS 11
-#define TIME 12 
+#define TIME_ 12 
 #define PERCENT 13 
 #define PERCENT_D 14
 #define DEGREE 15 

TIN001-PLC/Jet_Furance_PMC/Jet_Furance_PMC/Jet_Furance_PMC/FurancePMC/RecipeContext.cpp

@@ -97,6 +97,8 @@ int RecipeContext::Moniter()
 		}
 	}
 
+
+	//	2.如果当前状态recipeExecuteStatus == TimeWait
 	if (recipeExecuteStatus == recipeExecuteStatusValue::TimeWait)
 	{
 		char jumpRecipeCmd[32];
@@ -112,16 +114,15 @@ int RecipeContext::Moniter()
 		}
 		else if (status == OperatorStatusEnum::ALARM) {
 			//TODO：这里发生了ALARM，且alarm condition处理未能挽回
+		//增加上报上位机信息
 
 		}
 		else {
 			//TODO：命令执行过程中
 		}
-	}
-//	2.如果当前状态recipeExecuteStatus == TimeWait
 
-	if (recipeExecuteStatus == recipeExecuteStatusValue::TimeWait)
-	{
+
+
 		updateTime(FALSE);
 		//2.依次执行RecipeChecker列表中每个检查器的check函数
 		//	i.如果有AlarmRecipeChecker被触发，则进行alarm condition相关处理并返回
@@ -161,7 +162,7 @@ int RecipeContext::Moniter()
 		}
 
 		//	4.如果所有StableRecipeChecker都满足条件且elapsedStepTime到达或超过了step.time设置的时间
-		if (elapsedStepTime >= getStepTime())
+		if (status == OperatorStatusEnum::SUCCESS && elapsedStepTime >= getStepTime())
 		{
 			//	1.设置设置recipeExecuteStatus = StepCompleted
 			recipeExecuteStatus = recipeExecuteStatusValue::StepCompleted;
@@ -1351,7 +1352,7 @@ void RecipeContext::executeNextStep()
 			recipeExecuteStatus = recipeExecuteStatusValue::StepCompleted;
 			//数据上报，本步结束
 			ReoprtStepCompleted();
-
+			OP->reset();
 		}
 
 
@@ -1455,6 +1456,11 @@ void RecipeContext::ReportStepNotify()
 
 }
 
+void RecipeContext::ReportAlarm()
+{
+
+}
+
 
 
 void RecipeContext::ParseDataWithRawData()

TIN001-PLC/Jet_Furance_PMC/Jet_Furance_PMC/Jet_Furance_PMC/FurancePMC/RecipeContext.h

@@ -429,6 +429,7 @@ public:
 		void ReoprtStepCompleted();
 		void ReportRuningState(RunningStateValue state);
 		void ReportStepNotify();
+		void ReportAlarm();
 
 };