gyj 1 month ago
parent
commit
5d4ec865bb

+ 1 - 1
TIN001-PLC/Jet_Furance_PMC/Jet_Furance_PMC/Jet_Furance_PMC/FurancePMC/ModuleMoniter.cpp

@@ -182,7 +182,7 @@ HRESULT CModuleMoniter::CycleUpdate(ITcTask* ipTask, ITcUnknown* ipCaller, ULONG
 	//m_Outputs.Value=m_counter;
 	//m_Outputs.TestMoniterValue = 
 	m_counter++;
-	if (m_counter % 100 == 0)
+	//if (m_counter % 50 == 0)
 	{
 		//Ö´ÐÐ RecipeContext;
 		RecipeContext::GetInstance()->ParseDataWithRawData();			//´Ó»º´æÇø½âÎöRawÊý¾Ý

+ 10 - 3
TIN001-PLC/Jet_Furance_PMC/Jet_Furance_PMC/Jet_Furance_PMC/FurancePMC/RecipeContext.cpp

@@ -33,7 +33,7 @@ void RecipeContext::deleteInstance()
 
 int RecipeContext::Moniter()
 {
-	EV->postInfoLog("RecipeContext::Moniter()");
+	//EV->postInfoLog("RecipeContext::Moniter()");
 	//if (RecipeExecState!= RecipeExecStateValue::Execteing)
 	//{
 	//	return 0;
@@ -206,7 +206,7 @@ int RecipeContext::Moniter()
 		return 0;
 	}
 
-	LOG->Log(tlInfo, FLEAVEA "RecipeContext::Moniter()");
+	//LOG->Log(tlInfo, FLEAVEA "RecipeContext::Moniter()");
 	return 0;
 }
 
@@ -1391,6 +1391,13 @@ void RecipeContext::ParseDataWithRawData()
 		{
 			TempCorrectionMsgContext tp = BytesToStruct<TempCorrectionMsgContext>::FromBytes(rawdata.data(), rawdata.size());
 
+			auto sub = tempCorrectionDic.getOrCreate(CovertIntToChar(tp.currentTempCorrectionKey1));
+			sub->set(tp.currentTempCorrectionKey2,tp.TmpCorrection);
+
+
+		     int len =	tempCorrectionDic.length;
+			
+
 			//if (tempCorrectionDic.find(tp.currentTempCorrectionKey1) == tempCorrectionDic.end())//²»´æÔÚkeyµÄÇé¿ö
 			//{
 			//	map<int, TempCorrection> acc;
@@ -1544,7 +1551,7 @@ void RecipeContext::PackageDataAndSendBufferData()
 
 	//}
 	//5 ×·¼Óµ½SendAllDataÖÐ
-	SendAllData.push(send1);
+	//SendAllData.push(send1);
 
 	
 	return;

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

@@ -69,7 +69,7 @@ struct AlarmConditionMsgContext
 {
 public:
 	int currentAlarmConditionKey1;
-	int currentAlarmConditionKey2;
+	char currentAlarmConditionKey2[100];
 	AlarmCondition AlarmCdt;
 };
 
@@ -78,7 +78,7 @@ struct TempProfileMsgContext
 {
 public:
 	int currentTempProfileKey1;
-	int currentTempProfileKey2;
+	char currentTempProfileKey2[100];
 	TempProfile TempPrf;
 };
 
@@ -86,7 +86,7 @@ struct TempPIDMsgContext
 {
 public:
 	int currentTempPIDKey1;
-	int currentTempPIDKey2;
+	char currentTempPIDKey2[100];
 	TempPID TmpPID;
 };
 
@@ -95,7 +95,7 @@ struct TempCorrectionMsgContext
 {
 public:
 	int currentTempCorrectionKey1;
-	int currentTempCorrectionKey2;
+	char  currentTempCorrectionKey2[100];
 	TempCorrection TmpCorrection;
 };
 
@@ -104,7 +104,7 @@ struct APCPIDMsgContext
 {
 public:
 	int currentAPCPIDKey1;
-	int currentAPCPIDKey2;
+	char currentAPCPIDKey2[100];
 	APCPID _apcpid;
 };
 
@@ -113,7 +113,7 @@ struct LeakCheckMsgContext
 {
 public:
 	int currentLeakCheckKey1;
-	int currentLeakCheckKey2;
+	char currentLeakCheckKey2[100];
 	LeakCheck Lkc;
 };
 

+ 1 - 1
TIN001-PLC/TIN001.project.~u

@@ -1,4 +1,4 @@
 JET-GYJ
 JET-GYJ
 41688
-638846124731502723
+638846880670105543

BIN
TIN001-PLC/TIN001/FurancePMC.pdb


BIN
TIN001-PLC/TIN001/FurancePMC.sys


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

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcBootProject CreateTime="2025-06-04T13:34:21">
+<TcBootProject CreateTime="2025-06-04T17:16:10">
 	<System>
 		<LockedMemSize>33554432</LockedMemSize>
 		<AffinityMask>#x1</AffinityMask>

BIN
TIN001-PLC/TIN001/_Boot/TwinCAT RT (x64)/CurrentConfig/FurancePMC.tczip


BIN
TIN001-PLC/TIN001/_Boot/TwinCAT RT (x64)/Plc/Port_851_boot.tizip


BIN
TIN001-PLC/TIN001/_Deployment/TwinCAT RT (x64)/FurancePMC.pdb


BIN
TIN001-PLC/TIN001/_Deployment/TwinCAT RT (x64)/FurancePMC.sys