[Rojav-commits] rocrail/public wrapper.xml,1.67,1.68

[rob v. <ro...@us...>]

Update of /cvsroot/rojav/rocrail/public
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28118

Modified Files:
	wrapper.xml 
Log Message:
turntable modifications

Index: wrapper.xml
===================================================================
RCS file: /cvsroot/rojav/rocrail/public/wrapper.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** wrapper.xml	29 Nov 2005 20:37:32 -0000	1.67
--- wrapper.xml	30 Nov 2005 20:42:11 -0000	1.68
***************
*** 334,342 ****
        <tt cardinality="n" wrappername="Turntable" remark="Turntable definition.">
          <var name="id" vt="string" defval="" range="*" required="true"/>
          <var name="desc" vt="string" defval="" range="*" remark="description"/>
          <var name="x" vt="int" defval="0" range="0-*"/>
          <var name="y" vt="int" defval="0" range="0-*"/>
          <var name="z" vt="int" defval="0" range="0-*"/>
-         <var name="ori" vt="string" defval="NULL" range="north,south,west,east"/>
          <const name="next" vt="string" val="next" remark="Go to next track."/>
          <const name="prev" vt="string" val="prev" remark="Go to previous track."/>
--- 334,343 ----
        <tt cardinality="n" wrappername="Turntable" remark="Turntable definition.">
          <var name="id" vt="string" defval="" range="*" required="true"/>
+         <var name="iid" vt="string" defval="NULL" range="*" remark="Interface ID."/>
+         <var name="addr" vt="int" defval="0" range="0-255" required="true" remark="Digital address."/>
          <var name="desc" vt="string" defval="" range="*" remark="description"/>
          <var name="x" vt="int" defval="0" range="0-*"/>
          <var name="y" vt="int" defval="0" range="0-*"/>
          <var name="z" vt="int" defval="0" range="0-*"/>
          <const name="next" vt="string" val="next" remark="Go to next track."/>
          <const name="prev" vt="string" val="prev" remark="Go to previous track."/>
***************
*** 344,348 ****
          <const name="m7687" vt="string" val="m7687" remark="The original Maerklin turntable device."/>
          <const name="m6082" vt="string" val="m6082" remark="Modified analog turntable."/>
!         <var name="type" vt="string" defval="m7687" range="m7687,m6082"/>
          <track cardinality="n" wrappername="TTTrack" remark="Turntable track.">
            <var name="posfb" vt="string" defval="" range="*" required="true" remark="Feedback ID for positioning the TT."/>
--- 345,349 ----
          <const name="m7687" vt="string" val="m7687" remark="The original Maerklin turntable device."/>
          <const name="m6082" vt="string" val="m6082" remark="Modified analog turntable."/>
!         <var name="type" vt="string" defval="m6082" range="m7687,m6082"/>
          <track cardinality="n" wrappername="TTTrack" remark="Turntable track.">
            <var name="posfb" vt="string" defval="" range="*" required="true" remark="Feedback ID for positioning the TT."/>
***************
*** 350,353 ****
--- 351,355 ----
            <var name="nr" vt="int" defval="0" range="0-*" required="true" remark="Track number."/>
            <var name="block" vt="string" defval="NULL" range="*" remark="Connected to block."/>
+           <var name="state" vt="bool" defval="false" remark="pos feedback state."/>
          </track>
        </tt>