Diff of /branches/IoDrvMEGAIO/IoDrvMEGAIO.devdesc.xml [r65] .. [r66]  Maximize  Restore

Switch to side-by-side view

--- a/branches/IoDrvMEGAIO/IoDrvMEGAIO.devdesc.xml
+++ b/branches/IoDrvMEGAIO/IoDrvMEGAIO.devdesc.xml
@@ -148,61 +148,47 @@
 		  <VisibleName name="UINT7">UINT7</VisibleName>
 		</Component>
 	</StructType>
-    <StructType name="IoDrvInput">
-	  <Component identifier="dwOut" type="std:DWORD">
-        <Default />
-        <VisibleName name="local:Output">Output</VisibleName>
-	  </Component>
-	  <Component identifier="dacVoltage" type="std:REAL">
-        <Default />
-        <VisibleName name="local:dacVoltageInput">dacVoltage Input</VisibleName>
-      </Component>
-	  <Component identifier="relayState" type="local:Channel8BOOL">
-        <Default />
-        <VisibleName name="local:relayState">relayState</VisibleName>
-      </Component>
-	  <Component identifier="openDrainState" type="local:OpenDrainState">
-        <Default />
-        <VisibleName name="openDrain State">OpenDrain State</VisibleName>
-      </Component>
-	  <Component identifier="gpioDir" type="local:Ch5BOOL">
-        <Default />
-        <VisibleName name="gpioDir">GPIO Direction</VisibleName>
-      </Component>
-	  <Component identifier="gpioOut" type="local:Ch5BOOL">
-        <Default />
-        <VisibleName name="gpioOut">gpioOut</VisibleName>
+	<StructType name="IoDrvInput">
+	  <Component identifier="adcVoltages" type="local:Ch8REAL">
+        <Default />
+        <VisibleName name="adcVoltages">adcVoltages</VisibleName>
+      </Component>
+	  <Component identifier="adcRaw" type="local:Ch8UINT">
+        <Default />
+        <VisibleName name="adcRaw">adcRaw</VisibleName>
+      </Component>
+	  <Component identifier="optoIn" type="local:Channel8BOOL">
+        <Default />
+        <VisibleName name="local:optoIn">optoIn</VisibleName>
+      </Component>
+	  <Component identifier="gpioIn" type="local:Ch5BOOL">
+        <Default />
+        <VisibleName name="local:gpioIn">gpioIn</VisibleName>
       </Component>
     </StructType>
     <StructType name="IoDrvOutput">
-	  <Component identifier="dwIn" type="std:DWORD">
-        <Default />
-        <VisibleName name="local:Input">Input</VisibleName>
-      </Component>
-	  <Component identifier="adcVoltages" type="local:Ch8REAL">
-        <Default />
-        <VisibleName name="adcVoltages">adcVoltages</VisibleName>
-      </Component>
-	  <Component identifier="adcRaw" type="local:Ch8UINT">
-        <Default />
-        <VisibleName name="adcRaw">adcRaw</VisibleName>
-      </Component>
-	  <Component identifier="optoIn" type="local:Channel8BOOL">
-        <Default />
-        <VisibleName name="local:optoIn">optoIn</VisibleName>
-      </Component>
-	  <Component identifier="gpioIn" type="local:Ch5BOOL">
-        <Default />
-        <VisibleName name="local:gpioIn">gpioIn</VisibleName>
+	  <Component identifier="dacVoltage" type="std:REAL">
+        <Default />
+        <VisibleName name="local:dacVoltageInput">dacVoltage Input</VisibleName>
+      </Component>
+	  <Component identifier="relayState" type="local:Channel8BOOL">
+        <Default />
+        <VisibleName name="local:relayState">relayState</VisibleName>
+      </Component>
+	  <Component identifier="openDrainState" type="local:OpenDrainState">
+        <Default />
+        <VisibleName name="openDrain State">OpenDrain State</VisibleName>
+      </Component>
+	  <Component identifier="gpioOut" type="local:Ch5BOOL">
+        <Default />
+        <VisibleName name="gpioOut">gpioOut</VisibleName>
+      </Component>
+	  <Component identifier="gpioDir" type="local:Ch5BOOL">
+        <Default />
+        <VisibleName name="gpioDir">GPIO Direction</VisibleName>
       </Component>
     </StructType>
 	<StructType name="IoDrvConfig">
-	  <Component identifier="dwConfig" type="std:DWORD">
-        <Default>2</Default>
-        <VisibleName name="local:Config">Config</VisibleName>
-      </Component>
-	</StructType>
-	
 	  <!--
       <Component identifier="StackLevel" type="std:USINT">
         <Default>16#1</Default>
@@ -210,7 +196,7 @@
         <Description name="local:StackLevel.Desc">Stack level of MegaIO boards</Description>
       </Component>
 	  -->
-	  
+	</StructType>
   </Types>
   <Strings namespace="local">
     <Language lang="en">
@@ -262,24 +248,24 @@
 		  </Parameter>
 		</ParameterSection>
 		<ParameterSection>
-   	      <Name name="local:GeneralParameters">Inputs</Name>
+   	      <Name name="local:GeneralParameters">Input Channels</Name>
           <Parameter ParameterId="1000" type="local:IoDrvInput">
 		 	<Attributes channel="Input" />
-            <Name name="local:Input">Inputs</Name>
+            <Name name="local:Input">Input Channels</Name>
            </Parameter>
         </ParameterSection>
 		<ParameterSection>
-   	      <Name name="local:GeneralParameters">Outputs</Name>		
+   	      <Name name="local:GeneralParameters">Output Channels</Name>		
           <Parameter ParameterId="2000" type="local:IoDrvOutput">
             <Attributes channel="Output" />
-            <Name name="local:Output">Outputs</Name>
+            <Name name="local:Output">Output Channels</Name>
           </Parameter>
 		</ParameterSection>
 		<ParameterSection>
    	      <Name name="local:GeneralParameters">Configuration</Name>
 	  	  <Parameter ParameterId="3000" type="local:IoDrvConfig">
             <Attributes channel="none" />
-            <Name name="local:Config">Config</Name>
+            <Name name="local:Config">Configuration</Name>
           </Parameter>
 		</ParameterSection>
 	  </HostParameterSet>