]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
nxyter register updates
authorLudwig Maier <lmaier@bia.e12.ph.tum.de>
Sun, 24 Nov 2013 19:10:11 +0000 (20:10 +0100)
committerLudwig Maier <lmaier@bia.e12.ph.tum.de>
Sun, 24 Nov 2013 19:10:11 +0000 (20:10 +0100)
xml-db/database/Nxyter.xml

index 6ea1545ab07565f697edf63b7028fa2e7d32cc5c..0242d1f1fadb00d22429e60526bfb0b732698687 100644 (file)
@@ -37,7 +37,7 @@
       </register>
 
       <register name="FrameRate" address="0001" purpose="status">
-        <description>Rate of Incoming Nxyter Frames, must be 31.25MHz</description>
+        <description>Rate of Incoming Nxyter + ADC Frames, must be 31.25MHz</description>
         <field name="FrameRate" start="0" bits="32" format="unsigned" unit="Hz"/>
       </register>
     </group>
 
 
   <group name="DataReceiver"
-         address="0500"  size="15"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="18"  purpose="status"  mode="rw"  continuous="true">
 
     <register name="CurrentTimestamp" address="0000" purpose="status" mode="r">
       <description>Current Timestamp Value read from Fifo</description>
       <field name="ShiftValue" start="0" bits="3" format="unsigned">
         <description>ADC Bit Shift value</description>    
       </field>
-      
+    </register>
+    
+    <register name="ADCFNLockCtr" address="000f" purpose="status" mode="r">
+      <description>ADC Frame Not Lock Counter</description>
+      <field name="ADCFNLockCtr" start="0" bits="8" format="unsigned" />
+    </register>
+    
+    <register name="NXFrameRate" address="0010" purpose="status" mode="r">
+      <description>Nxyter Timestamp Frame Rate, must be 31.25 MHz</description>
+      <field name="NXFrameRate" start="0" bits="27" format="unsigned" unit="Hz" />
+    </register>
+
+    <register name="ADCFrameRate" address="0011" purpose="status" mode="r">
+      <description>ADC Data Frame Rate, must be 31.25 MHz</description>
+      <field name="ADCFrameRate" start="0" bits="27" format="unsigned" unit="Hz" />
     </register>
 
   </group>