Merge pull request #16 from OpenCommissioning/development

Development

Author: Preliy

Artifacts/OC_EtherCAT.ethml

@@ -7,6 +7,16 @@
 		<Device ProductDescription="EL6910"/>
 		<Device ProductDescription="EL6631"/>
 	</Ignore>
+	<Device ProductDescription="EL1004">
+		<Declaration>
+			<![CDATA[{attribute 'TcLinkTo' := '
+			.bIn1 := TIIB($BOXNO$)^Channel 1^Input;
+			.bIn2 := TIIB($BOXNO$)^Channel 2^Input;
+			.bIn3 := TIIB($BOXNO$)^Channel 3^Input;
+			.bIn4 := TIIB($BOXNO$)^Channel 4^Input'}
+			$NAME$ : ST_Beckhoff_4DI;]]>
+		</Declaration>
+	</Device>
 	<Device ProductDescription="EL1008">
 		<Declaration>
 			<![CDATA[{attribute 'TcLinkTo' := '
@@ -21,6 +31,16 @@
 			$NAME$ : ST_Beckhoff_8DI;]]>
 		</Declaration>
 	</Device>	
+	<Device ProductDescription="EL2004">
+		<Declaration>
+			<![CDATA[{attribute 'TcLinkTo' := '
+			.bOut1 := TIIB($BOXNO$)^Channel 1^Output;
+			.bOut2 := TIIB($BOXNO$)^Channel 2^Output;
+			.bOut3 := TIIB($BOXNO$)^Channel 3^Output;
+			.bOut4 := TIIB($BOXNO$)^Channel 4^Output'}
+			$NAME$ : ST_Beckhoff_4DO;]]>
+		</Declaration>
+	</Device>
 	<Device ProductDescription="EL2008">
 		<Declaration>
 			<![CDATA[{attribute 'TcLinkTo' := '

Artifacts/OC_EtherCAT.library

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.13">
+  <DUT Name="ST_Beckhoff_4DI" Id="{737f44b3-4a70-053f-24c5-7288dc67582c}">
+    <Declaration><![CDATA[{attribute 'pack_mode' := '1'} 
+TYPE ST_Beckhoff_4DI :
+STRUCT
+	bIn1	AT %Q* : BIT;
+	bIn2	AT %Q* : BIT;
+	bIn3	AT %Q* : BIT;
+	bIn4	AT %Q* : BIT;	
+END_STRUCT
+END_TYPE]]></Declaration>
+  </DUT>
+</TcPlcObject>

Devices/Terminals/ST_Beckhoff_4DI.TcDUT

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.13">
+  <DUT Name="ST_Beckhoff_4DO" Id="{b39f1c57-dd52-0bc3-2b5c-80f2226e2c6a}">
+    <Declaration><![CDATA[{attribute 'pack_mode' := '1'} 
+TYPE ST_Beckhoff_4DO :
+STRUCT
+	bOut1	AT %I* : BIT;
+	bOut2	AT %I* : BIT;
+	bOut3	AT %I* : BIT;
+	bOut4	AT %I* : BIT;	
+END_STRUCT
+END_TYPE]]></Declaration>
+  </DUT>
+</TcPlcObject>

Devices/Terminals/ST_Beckhoff_4DO.TcDUT

@@ -19,7 +19,7 @@
     <Released>false</Released>
     <Company>Open Commissioning</Company>
     <Title>OC_EtherCAT</Title>
-    <ProjectVersion>1.1.7</ProjectVersion>
+    <ProjectVersion>1.1.8</ProjectVersion>
     <LibraryCategories>
       <LibraryCategory xmlns="">
         <Id>{41661a1f-00b4-4855-90c5-5a3bdd03b62b}</Id>
@@ -155,12 +155,18 @@
     <Compile Include="Devices\Terminals\ST_Beckhoff_8DI.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Devices\Terminals\ST_Beckhoff_4DI.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Devices\Terminals\ST_Beckhoff_8DI_8DO.TcDUT">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Devices\Terminals\ST_Beckhoff_8DO.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Devices\Terminals\ST_Beckhoff_4DO.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Devices\Terminals\ST_Beckhoff_EL3403.TcDUT">
       <SubType>Code</SubType>
     </Compile>