修改INTERLOCK bypass逻辑

TIN001/TIN001/PLC/POUs/_100_IOMapping/IOMapping.TcPOU

@@ -2612,7 +2612,7 @@ AV[100]
 	bInterlock5_In		:= TRUE ,	
 	bForceOpen_In		:= aForceOpValve[100],
 	bValveInterlock_In	:= aILK_AV[100] ,		
-	bPMCCtrl_In			:= NOT GVL.stPMCtoPLC.T_MNT_sw OR ( GVL.stPMCtoPLC.T_MNT_sw AND GVL.stPMCtoPLC.T_REF_sw AND GVL.stPMCtoPLC.aAV[100] )(*GVL.stPMCtoPLC.aAV[100]*) ,
+	bPMCCtrl_In			:= TRUE ,
 	bValveOpen_Out		=> aAV[100] 	
 );				
 				
@@ -2625,7 +2625,7 @@ AV[101]
 	bInterlock5_In		:= TRUE ,	
 	bForceOpen_In		:= aForceOpValve[101],
 	bValveInterlock_In	:= aILK_AV[101] ,		
-	bPMCCtrl_In			:= NOT GVL.stPMCtoPLC.T_MNT_sw OR ( GVL.stPMCtoPLC.T_MNT_sw AND GVL.stPMCtoPLC.T_REF_sw AND GVL.stPMCtoPLC.aAV[101] )(*GVL.stPMCtoPLC.aAV[101]*) ,
+	bPMCCtrl_In			:= GVL.stPMCtoPLC.aAV[101](*GVL.stPMCtoPLC.aAV[101]*) ,
 	bValveOpen_Out		=> aAV[101] 	
 );				
 				

TIN001/TIN001/PLC/POUs/_900_FB/Valve.TcPOU

@@ -22,7 +22,7 @@ END_VAR
     <Implementation>
       <ST><![CDATA[IF bValveEnable_In THEN
 	IF bInterlock1_In AND bInterlock2_In AND bInterlock3_In AND bInterlock4_In AND bInterlock5_In THEN
-		IF bForceOpen_In OR ( bValveInterlock_In AND bPMCCtrl_In ) THEN
+		IF ( bForceOpen_In OR bValveInterlock_In ) AND bPMCCtrl_In  THEN
 			bValveOpen_Out := TRUE ;
 		ELSE
 			bValveOpen_Out := FALSE ;

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="{576D0E9E-8822-6AAB-1319-99DBC60376BE}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{056818E0-90C1-8B98-1899-7A8AEF3086E6}">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="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="{97FD4432-7E56-F48D-A15A-A96EEF8DBB42}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{2F13B7F9-CEF9-2FD0-BC98-801536DBDAB8}">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="1">

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

@@ -1 +1 @@
-�5Fq��Ι�"Dשׂ
+��u�J����`*���