update

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

@@ -9,20 +9,11 @@
 
 static RecipeContext _g_pRecipeContext;
 
-//RecipeContext *RecipeContext::g_pRecipeContext= &_g_pRecipeContext;
-
 RecipeContext* RecipeContext::GetInstance()
 {
 	return &_g_pRecipeContext;
 }
 
-//RecipeContext* RecipeContext::GetInstanceSetLog(CTcTrace* _cTrack)
-//{
-//	
-//	SetCTcTrace(_cTrack);
-//	return g_pRecipeContext;
-//}
-
 void RecipeContext::deleteInstance()
 {
 	EV->postInfoLog("RecipeContext::deleteInstance()");
@@ -41,15 +32,7 @@ int RecipeContext::Moniter()
 	//	return 0;
 	//}
 
-	
-
-	//if (!DataRecive.empty())
-	//{
-	//	string Recv = DataRecive.front();
-	//	LOG->Log(tlInfo, FLEAVEA "RecipeContext::Moniter()==DataRecive.front() = '%s'", Recv.c_str());
-	//	DataRecive.pop();
-	//}
-
+		
 	//LOG->Log(tlInfo, FLEAVEA "RecipeContext::Moniter() Start");
 
 	//处理流程：
@@ -428,6 +411,7 @@ BOOL RecipeContext::judgeStep()
 				mainStepList.get(currentStepNo)->elapsedLoopCount = 0;
 			}
 		}
+
 		//	d)currentStepNo指定的当前步骤的isCallSubStep为TRUE
 		//	i.当前步骤的elapsedSubRecipeLoopCount < subRecipeLoopCount
 		//	1.elapsedSubRecipeLoopCount++
@@ -768,6 +752,7 @@ BOOL RecipeContext::jumpTo(string toStepName)
 			}
 		}
 	}
+
 	//	3.currentRecipeType == AbortRecipe（abort recipe）
 	//	a)根据toStepName（在abort recipe中）找到jumpStepNo
 	//	b)jumpStepNo合法

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

@@ -171,14 +171,9 @@ class RecipeContext
 public:
 	//获取单例
 	static RecipeContext* GetInstance();
-	//static RecipeContext* GetInstanceSetLog(CTcTrace* _cTrack);
 	//释放单例，进程退出时调用
 	static void deleteInstance();
 	//static	CTcTrace* cTrack;
-	//vector <RecipeStepInfo> mainStepList;
-	//map<int, vector<RecipeStepInfo>> subStepListMap;  //sub recipe对照表
-	//map<int, vector<RecipeStepInfo>> abortStepListMap;//	abort recipe对照表
-	//map<int, vector<RecipeStepInfo>> alarmStepListMap;//	alarm recipe对照表
 	List<RecipeStepInfo, MAX_MAIN_STEP_LIST> mainStepList;
 	int mainStepListStepCount;
 	Dictionary<List<RecipeStepInfo,50>, 20> subStepListMap;
@@ -283,7 +278,7 @@ public:
 
 	void executeStep();
 
-	//int TM = 100;
+
 	void ParseDataWithRawData();
 	void PackageDataAndSendBufferData();
 
@@ -294,10 +289,6 @@ public:
 	RecipeContext();
 	~RecipeContext();
 
-	//RecipeContext(const RecipeContext& recipecont);
-	//const RecipeContext& operator=(const RecipeContext& recipecont);
-
-	//static RecipeContext* g_pRecipeContext;
 	static void SetCTcTrace(CTcTrace* _cTrack);
 #pragma region 解析Recipe
 
@@ -316,6 +307,7 @@ public:
 	
 	
 	BOOL judgeStep();
+
 	/*************************************************
 	 * @brief 将小端字节序的byte数组转换为大端字节序
 	 * @param data 输入的byte数组（小端格式）

TIN001-PLC/TIN001.project.~u

@@ -1,4 +1,4 @@
 JET-GYJ
 JET-GYJ
-51356
-638859257780778249
+29104
+638862391404156007

TIN001-PLC/TIN001/_Boot/TwinCAT RT (x64)/CurrentConfig.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcBootProject CreateTime="2025-06-19T17:48:52">
+<TcBootProject CreateTime="2025-06-19T18:38:48">
 	<System>
 		<LockedMemSize>33554432</LockedMemSize>
 		<AffinityMask>#x1</AffinityMask>