Parcourir la source

修改Interlock逻辑(50%)

bianym il y a 4 mois
Parent
commit
b6d4600715

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


Fichier diff supprimé car celui-ci est trop grand
+ 4 - 4
TIN001/TIN001/PLC/PLC.tmc


+ 1 - 1
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			:= TRUE ,
+	bPMCCtrl_In			:= GVL.stPMCtoPLC.aAV[100] ,
 	bValveOpen_Out		=> aAV[100] 	
 );				
 				

Fichier diff supprimé car celui-ci est trop grand
+ 6628 - 2285
TIN001/TIN001/PLC/POUs/_200_Interlock/Interlock.TcPOU


+ 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="{C5FD5DF6-EE8D-E036-5CB8-AE8D15EEA953}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{A0320871-C78E-9716-F347-5848FFA985C6}">
 					<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="{6A064E41-6B28-23D5-51A6-5348AEF23898}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{F39AE5FF-0F54-5EE9-CDAE-667683D79C50}">
 					<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 @@
-Y½=VÜDáó×U~z
+ŸWb=µå¡Eù%_ldloB

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


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


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