Browse Source

修改AV79 interlock

jet-bym 4 months ago
parent
commit
08341d56d9

BIN
TIN001/TIN001/.vs/TIN001/v15/.suo


File diff suppressed because it is too large
+ 2 - 2
TIN001/TIN001/PLC/PLC.tmc


+ 6 - 6
TIN001/TIN001/PLC/POUs/_100_IOMapping/IOMapping.TcPOU

@@ -2091,7 +2091,7 @@ AV65Open
 	bInterlock4_In		:= TRUE ,	
 	bInterlock5_In		:= TRUE ,
 	bForceOpen_In		:= bForceAV65Open,	
-	bValveInterlock_In	:= aILK_AV[65] ,		
+	bValveInterlock_In	:= TRUE(*aILK_AV[65]*) ,		
 	bPMCCtrl_In			:= GVL.stPMCtoPLC.bAV65Open ,
 	bValveOpen_Out		=> GVL.bAV65Open 	
 );	
@@ -2104,7 +2104,7 @@ AV65Close
 	bInterlock4_In		:= TRUE ,	
 	bInterlock5_In		:= TRUE ,
 	bForceOpen_In		:= bForceAV65Close,	
-	bValveInterlock_In	:= aILK_AV[65] ,		
+	bValveInterlock_In	:= TRUE(*aILK_AV[65]*) ,		
 	bPMCCtrl_In			:= GVL.stPMCtoPLC.bAV65Close ,
 	bValveOpen_Out		=> GVL.bAV65Close 	
 );	
@@ -2299,8 +2299,8 @@ AV79Close
 	bInterlock4_In		:= TRUE ,	
 	bInterlock5_In		:= TRUE ,
 	bForceOpen_In		:= bForceAV79Close,	
-	bValveInterlock_In	:= aILK_AV[79] ,		
-	bPMCCtrl_In			:= GVL.stPMCtoPLC.bAV79Close ,
+	bValveInterlock_In	:= TRUE(*aILK_AV[79]*) ,		
+	bPMCCtrl_In			:= NOT aILK_AV[79] OR GVL.stPMCtoPLC.bAV79Close ,
 	bValveOpen_Out		=> GVL.bAV79Close 	
 );
 		
@@ -3287,7 +3287,7 @@ AV202Open
 	bInterlock4_In		:= TRUE ,	
 	bInterlock5_In		:= TRUE ,
 	bForceOpen_In		:= bForceAV202Open,	
-	bValveInterlock_In	:= aILK_AV[202] ,		
+	bValveInterlock_In	:= TRUE(*aILK_AV[202]*) ,		
 	bPMCCtrl_In			:= GVL.stPMCtoPLC.bAV202Open ,
 	bValveOpen_Out		=> GVL.bAV202Open 	
 );	
@@ -3300,7 +3300,7 @@ AV202Close
 	bInterlock4_In		:= TRUE ,	
 	bInterlock5_In		:= TRUE ,
 	bForceOpen_In		:= bForceAV202Close,	
-	bValveInterlock_In	:= aILK_AV[202] ,		
+	bValveInterlock_In	:= TRUE(*aILK_AV[202]*) ,		
 	bPMCCtrl_In			:= GVL.stPMCtoPLC.bAV202Close ,
 	bValveOpen_Out		=> GVL.bAV202Close 	
 );		]]></ST>

+ 2 - 2
TIN001/TIN001/PLC/POUs/_200_Interlock/Interlock.TcPOU

@@ -125,8 +125,8 @@ bMS2_MS2S_Status_Abnormal   := stGBI.I202_00 XOR GVL.stPMCtoPLC.MS2_S_gas_box_ex
 bMS11_MS11S_Status_Abnormal := stOPI.I600_10 XOR GVL.stPMCtoPLC.MS11_S_gas_box_exhaust_alarm ;
 bMS12_MS12S_Status_Abnormal := stOPI.I600_12 XOR GVL.stPMCtoPLC.MS12_S_gas_box_exhaust_alarm ;
 
-bGV_Open	:= stEXHI.I303_13 AND stEXHI.I303_15 ;
-bGV_Close	:= stEXHI.I303_12 AND stEXHI.I303_14 ;
+bGV_Open	:= stEXHI.I303_13 AND stEXHI.I303_14 ;
+bGV_Close	:= stEXHI.I303_12 AND stEXHI.I303_15 ;
 
 VG11_Warning.Data_UDINT := GVL.stPMCtoPLC.VG11_Active_Device_Warning_Details ;
 VG11_Error.Data_UDINT	:= GVL.stPMCtoPLC.VG11_Active_Device_Error_Details	 ;

+ 1 - 1
TIN001/TIN001/TIN001_PLC.tsproj

@@ -329,7 +329,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{DFAAB7BD-C0F0-4652-BE02-16AF7158E2F9}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{DC0609E2-465A-A457-628A-090201D064E3}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{4CE4CA3B-F808-02C5-C447-F5AC3D507C27}">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="1">

+ 1 - 1
TIN001/TIN001/TIN001_PLC.tsproj.bak

@@ -329,7 +329,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{DFAAB7BD-C0F0-4652-BE02-16AF7158E2F9}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{DC0609E2-465A-A457-628A-090201D064E3}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{80444F8B-871E-75FE-3D08-8FEAF694B534}">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="1">

BIN
TIN001/TIN001/_Boot/CurrentConfig/PLC.tpzip


BIN
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851.app


+ 1 - 1
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851.cid

@@ -1 +1 @@
-־‏�es°ּ.p);נאc
+ה¦'ת÷¡¹��„|׳`&

BIN
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851.crc


BIN
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851_boot.tizip