Merge pull request #10 from OpenCommissioning/development

Development

Author: Preliy

Artifacts/OC_EtherCAT.ethml

@@ -46,7 +46,7 @@
 			.nValue3 := TIIB($BOXNO$)^AI Standard Channel 3^Value;
 			.nStatus4 := TIIB($BOXNO$)^AI Standard Channel 4^Status;
 			.nValue4 := TIIB($BOXNO$)^AI Standard Channel 4^Value'}
-			$NAME$ : FB_Beckhoff_4AI;]]>
+			$NAME$ : ST_Beckhoff_4AI;]]>
 		</Declaration>
 	</Device>
 	<Device ProductDescription="EP3314">
@@ -60,7 +60,7 @@
 			.nValue3 := TIIB($BOXNO$)^TC Inputs Channel 3^Value;
 			.nStatus4 := TIIB($BOXNO$)^TC Inputs Channel 4^Status;
 			.nValue4 := TIIB($BOXNO$)^TC Inputs Channel 4^Value'}
-			$NAME$ : FB_Beckhoff_4AI;]]>
+			$NAME$ : ST_Beckhoff_4AI;]]>
 		</Declaration>
 	</Device>	
 	<Device ProductDescription="EL3202">
@@ -70,7 +70,7 @@
 			.nValue1 := TIIB($BOXNO$)^RTD Inputs Channel 1^Value;
 			.nStatus2 := TIIB($BOXNO$)^RTD Inputs Channel 2^Status;
 			.nValue2 := TIIB($BOXNO$)^RTD Inputs Channel 2^Value'}
-			$NAME$ : FB_Beckhoff_2AI;]]>
+			$NAME$ : ST_Beckhoff_2AI;]]>
 		</Declaration>
 	</Device>	
 	<Device ProductDescription="EL3403">
@@ -251,7 +251,7 @@
 			.nValue3 := TIIB($BOXNO$)^AI Standard Channel 3^Value;
 			.nStatus4 := TIIB($BOXNO$)^AI Standard Channel 4^Status;
 			.nValue4 := TIIB($BOXNO$)^AI Standard Channel 4^Value'}
-			$NAME$ : FB_Beckhoff_4AI;]]>
+			$NAME$ : ST_Beckhoff_4AI;]]>
 		</Declaration>
 	</Device>
 	<Device ProductDescription="EL1809">

Artifacts/OC_EtherCAT.library

@@ -19,7 +19,7 @@
     <Released>false</Released>
     <Company>Open Commissioning</Company>
     <Title>OC_EtherCAT</Title>
-    <ProjectVersion>1.1.2</ProjectVersion>
+    <ProjectVersion>1.1.3</ProjectVersion>
     <LibraryCategories>
       <LibraryCategory xmlns="">
         <Id>{41661a1f-00b4-4855-90c5-5a3bdd03b62b}</Id>
@@ -266,8 +266,8 @@
   <ProjectExtensions>
     <PlcProjectOptions>
       <XmlArchive>
-  <Data>
-    <o xml:space="preserve" t="OptionKey">
+        <Data>
+          <o xml:space="preserve" t="OptionKey">
       <v n="Name">"&lt;ProjectRoot&gt;"</v>
       <d n="SubKeys" t="Hashtable" ckt="String" cvt="OptionKey">
         <v>{192FAD59-8248-4824-A8DE-9177C94C195A}</v>
@@ -481,16 +481,16 @@
       </d>
       <d n="Values" t="Hashtable" />
     </o>
-  </Data>
-  <TypeList>
-    <Type n="Boolean">System.Boolean</Type>
-    <Type n="ExactVersionConstraintToSave">{f9079115-a4ba-4f30-bf7c-9e76613146fc}</Type>
-    <Type n="Hashtable">System.Collections.Hashtable</Type>
-    <Type n="Int32">System.Int32</Type>
-    <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
-    <Type n="String">System.String</Type>
-  </TypeList>
-</XmlArchive>
+        </Data>
+        <TypeList>
+          <Type n="Boolean">System.Boolean</Type>
+          <Type n="ExactVersionConstraintToSave">{f9079115-a4ba-4f30-bf7c-9e76613146fc}</Type>
+          <Type n="Hashtable">System.Collections.Hashtable</Type>
+          <Type n="Int32">System.Int32</Type>
+          <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
+          <Type n="String">System.String</Type>
+        </TypeList>
+      </XmlArchive>
     </PlcProjectOptions>
   </ProjectExtensions>
 </Project>