nxyter, new nx_data_receiver registers

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 6cdc8a33566b05908df034252d0cfed11e8d0dc6..3dda6a57bd28d4353396f301ac97057b919be35a 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -25,7 +25,7 @@ $page->{link}  = "../";
 my @setup;
 
 $setup[0]->{name}    = "Status";
-$setup[0]->{cmd}     = "Nxyter-0xfe49-NXStatus&Nxyter-0xfe49-Status";
+$setup[0]->{cmd}     = "Nxyter-0xfe49-NXStatus&Nxyter-0xfe49-ADCStatus";
 $setup[0]->{period}  = -1;
 $setup[0]->{generic} = 1;
 

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index c564ae786bc5f26f41279c77c44281aee0c82eb0..aac5d590372d229e03127840b2e08f8264fbd54e 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -257,7 +257,7 @@
   <!-- ##################################################################### -->
   
   <group name="DataReceiver"
-         address="0500"  size="24"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="19"  purpose="status"  mode="rw"  continuous="true">
     
     <register name="ErrorBits" address="0000" purpose="status" mode="r">
       <description>Status of Error Bits</description>
@@ -348,71 +348,39 @@
       <field name="PllFineDelb" start="0" bits="4" format="unsigned" scale="125" unit="ps" />
     </register>
  
-    <register name="JohnsonCtrSync" address="000f" purpose="config" mode="rw">
-      <description>johnson_counter_sync (experts only)</description>
-      <field name="JohnsonCtrSync" start="0" bits="2" format="unsigned"/>
-    </register>
-    
-    <register name="TSDelay" address="0010" purpose="config" mode="rw">
+    <register name="TSDelay" address="000f" purpose="config" mode="rw">
       <description>Delay of Timestamp Fifo</description>
       <field name="TSDelayAdjust" start="15" bits="1" format="boolean" purpose="config"/>
       <field name="TSDelayACtr" start="16" bits="16" format="unsigned" purpose="status" mode="r"/>
-      <field name="TSDelayB" start="0" bits="3" format="unsigned"  purpose="config" />
-      <field name="TSDelayF" start="4" bits="2" format="unsigned" purpose="status" mode="r"/>
+      <field name="TSDelay" start="0" bits="3" format="unsigned" purpose="config" />
     </register>
 
-    <register name="TimestampFifoStatus" address="0011" purpose="status" mode="r">
-      <description>Status of the timestamp Fifo</description>
-      
-      <field name="TSFifoFull" start="0" bits="1" format="boolean" errorflag="true" mode="r">
-        <description>Timestamp Fifo full</description>
-      </field>  
-      
-      <field name="TSFifoEmpty" start="1" bits="1" format="boolean" mode="r">
-        <description>Timestamp Fifo Empty</description>
-      </field>  
-      
-      <field name="NxFrameSynced" start="31" bits="1" format="boolean" mode="r">
-        <description>Synchronized to Nxyter Frame</description>
-      </field>        
-    </register>   
-    
-    <register name="ADCBShift" address="0012" purpose="config" mode="rw">
-      <description>ADC Bit Shift</description>
-      
-      <field name="ShiftDir" start="3" bits="1" format="unsigned">
-        <description>ADC Bit Shift Direction (0=ror, 1=rol)</description>
-      </field>
-      <field name="ShiftValue" start="0" bits="3" format="unsigned">
-        <description>ADC Bit Shift value</description>    
-      </field>
-    </register>
-    
-    <register name="CurrentTimestamp" address="0013" purpose="status" mode="r">
-      <description>Current Timestamp Value read from Fifo</description>
-      <field name="CurrentTimestamp" start="0" bits="32" format="unsigned" />
-    </register>
-
-    <register name="ADCDTErrorCtr" address="0014" purpose="status" mode="r">
+    <register name="ADCDTErrorCtr" address="0010" purpose="status" mode="r">
       <description>ADC Data Rate Error Counter</description>
       <field name="ADCDTErrorCtr" start="0" bits="11" format="unsigned" />
     </register>
 
-    <register name="TSDTErrorCtr" address="0015" purpose="status" mode="r">
+    <register name="TSDTErrorCtr" address="0011" purpose="status" mode="r">
       <description>Timestamp Data Rate Error Counter</description>
       <field name="TSDTErrorCtr" start="0" bits="11" format="unsigned" />
     </register>
     
-    <register name="ADCNLockCtr" address="0016" purpose="status" mode="r">
+    <register name="ADCNLockCtr" address="0012" purpose="status" mode="r">
       <description>ADC Not Locked counter</description>
       <field name="ADCNLockCtr" start="0" bits="28" format="unsigned" rate="1" />
     </register>
-
-    <register name="ADCErrorCtr" address="0017" purpose="status" mode="r">
+   
+    <!--  
+    <register name="ADCErrorCtr" address="0014" purpose="status" mode="r">
       <description>ADC Error Counter</description>
       <field name="ADCErrorCtr" start="0" bits="28" format="unsigned" rate="1" />
     </register>
-    
+
+    <register name="ADCErrorUndefCtr" address="0015" purpose="status" mode="r">
+      <description>ADC Error Undef Counter</description>
+      <field name="ADCErrorUndefCtr" start="0" bits="28" format="unsigned" rate="1" />
+    </register>
+    -->
 </group>
   
   <!-- ##################################################################### -->
@@ -876,7 +844,7 @@
   
   <!-- ##################################################################### -->
 
-  <group name="Status"
+  <group name="ADCStatus"
          address="0280"  size="4"  purpose="status"  mode="r" continuous="true">
 
     <register name="NXSlow" address="0000" purpose="status" mode="r" >