nxyter regs update

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 097cfba43f8dc419921621212cb9f9872f650f01..653c416bc9742a36e18b300e175552468ebd8f01 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -40,7 +40,7 @@ $setup[2]->{period}  = -1;
 $setup[2]->{address} = 1;
 
 $setup[3]->{name}    = "TriggerHandler";
-$setup[3]->{cmd}     = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse&Nxyter-0xfe49-EventBuffer";
+$setup[3]->{cmd}     = "Nxyter-0xfe49-TriggerHandler";
 $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 7a7dfbb0622d132b776455e3def355d9a46a51b9..820f96915b2c1262fe0d21b8bb8e0e96609dc9e5 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -10,7 +10,7 @@
   <!-- ##################################################################### -->
 
   <group name="TriggerHandler"
-         address="0160"  size="4"  purpose="config"  mode="rw"  continuous="true">
+         address="0160"  size="6"  purpose="config"  mode="rw"  continuous="true">
     
     <register name="TestPulseEnable" address="0000" purpose="config">
       <description>Enable test pulse</description>
@@ -18,39 +18,32 @@
     </register>  
 
     <register name="TestPulseDelay" address="0001" purpose="config">
-      <description>Delay of the testpulse after Trigger</description>
+      <description>Delay of the Testpulse after Trigger</description>
       <field name="TestPulseDelay" start="0" bits="12" format="unsigned" unit="ns" scale="4"/>
     </register>   
 
-    <register name="TriggerRate" address="0002" purpose="status" mode="r">
-      <description>Accepted incoming Trigger Rate</description>
-      <field name="TriggerRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+    <register name="TestPulseLength" address="0002" purpose="config">
+      <description>Length of Trigger TestPulse</description>
+      <field name="TestPulseLength" start="0" bits="12" format="unsigned" unit="ns" scale="4"/>
     </register>   
-
+    
     <register name="InvalidTriggerCount" address="0003" purpose="status" mode="r">
       <description>Invalid Timing Trigger counter</description>
       <field name="InvalidTriggerCount" start="0" bits="16" format="unsigned"/>
     </register>   
     
-  </group>  
-
-  <!-- ##################################################################### -->
-
-  <group name="TestPulse"
-         address="0140"  size="2"  purpose="config"  mode="rw"  continuous="true">
-    
-    <register name="TestPulseLength" address="0000" purpose="config">
-      <description>Length of Trigger TestPulse</description>
-      <field name="TestPulseLength" start="0" bits="12" format="unsigned" unit="ns" scale="4"/>
+    <register name="TriggerRate" address="0004" purpose="status" mode="r">
+      <description>Accepted incoming Trigger Rate (Hz)</description>
+      <field name="TriggerRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
     </register>   
 
-    <register name="TestPulseRate" address="0001" purpose="status" mode="r">
-      <description>Testpulse Rate</description>
-      <field name="TestPulseRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+    <register name="TestpulseRate" address="0005" purpose="status" mode="r">
+      <description>Outgoing Testpulse Rate (Hz)</description>
+      <field name="TestpulseRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
     </register>   
-    
-  </group> 
-  
+   
+  </group>  
+
   <!-- ##################################################################### -->
 
   <group name="TriggerValidate"
@@ -191,30 +184,34 @@
   
   <group name="DataReceiver"
          address="0500"  size="22"  purpose="status"  mode="rw"  continuous="true">
+    
     <register name="ErrorBits" address="0000" purpose="status" mode="r">
       <description>Status of Error Bits</description>
-      <field name="NX_Offline"     start="0" bits="1" format="bitmask" purpose="status" mode="r"/>    
-      <field name="Frame_Rate"     start="1" bits="1" format="bitmask" purpose="status" mode="r"/>            
-      <field name="NX_Rate"        start="2" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_Rate"       start="3" bits="1" format="bitmask" purpose="status" mode="r"/>      
-      <field name="Parity"         start="4" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="NX_Sync"        start="5" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_Err"        start="6" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_PLL"        start="7" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_CLK"        start="8" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="NX_Off"         start="0"  bits="1" format="bitmask" purpose="status" mode="r"/>    
+      <field name="FR_Rate"        start="1"  bits="1" format="bitmask" purpose="status" mode="r"/>            
+      <field name="NX_Rate"        start="2"  bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_Rate"       start="3"  bits="1" format="bitmask" purpose="status" mode="r"/>      
+      <field name="Parity"         start="4"  bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="NX_Sync"        start="5"  bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_Err"        start="6"  bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_PLL"        start="7"  bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_CLK"        start="8"  bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="TS_DT"          start="9"  bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_DT"         start="10" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="RS"             start="11" bits="1" format="bitmask" purpose="status" mode="r"/>
     </register>
     
     <register name="ResetStatus" address="0001" purpose="status" mode="r">
       <description>Reset Busy Status, Click to force reset</description>
-      <field name="RTimeout" start="0" bits="1" format="bitmask"  purpose="status" mode="r"/>
-      <field name="ResetBusy" start="1" bits="1" format="bitmask" purpose="status" mode="rw"/>
-      </register>
+      <field name="RTimeout" start="1" bits="1" format="bitmask"  purpose="status" mode="r"/>
+      <field name="ResetBusy" start="0" bits="1" format="bitmask" purpose="status" mode="rw"/>
+    </register>
 
-      <register name="MFrameRate" address="0002" purpose="status" mode="r">
+    <register name="MFrameRate" address="0002" purpose="status" mode="r">
       <description>Merge of Nxyter and ADC Frame Rates, must be 31.25&amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
       <field name="MFrameRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
     </register>
-
+    
     <register name="NXFrameRate" address="0003" purpose="status" mode="r">
       <description>Nxyter Timestamp Frame Rate, must be 31.25&amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
       <field name="NXFrameRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
@@ -282,7 +279,7 @@
     
     <register name="TSDelay" address="0010" purpose="config" mode="rw">
       <description>Delay of Timestamp Fifo</description>
-      <field name="TSDelayB" start="0" bits="4" format="unsigned" />
+      <field name="TSDelayB" start="0" bits="3" format="unsigned" />
       <field name="TSDelayF" start="4" bits="2" format="unsigned" purpose="status" mode="r"/>
     </register>
 
@@ -318,14 +315,14 @@
       <field name="CurrentTimestamp" start="0" bits="32" format="unsigned" />
     </register>
 
-    <register name="ADCRateDTError" address="0014" purpose="status" mode="r">
+    <register name="ADCDTErrorCtr" address="0014" purpose="status" mode="r">
       <description>ADC Data Rate Error Counter</description>
-      <field name="ADCRateDTError" start="0" bits="11" format="unsigned" />
+      <field name="ADCDTErrorCtr" start="0" bits="11" format="unsigned" />
     </register>
 
-    <register name="TSRateDTError" address="0015" purpose="status" mode="r">
+    <register name="TSDTErrorCtr" address="0015" purpose="status" mode="r">
       <description>Timestamp Data Rate Error Counter</description>
-      <field name="TSRateDTError" start="0" bits="11" format="unsigned" />
+      <field name="TSDTErrorCtr" start="0" bits="11" format="unsigned" />
     </register>
 
   </group>
@@ -375,15 +372,17 @@
       <field name="ADCTRErrorRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
     </register>
 
-    <register name="ADCTRAverage" address="0008" purpose="status" mode="r">
+    <register name="ADCTRValue" address="0008" purpose="status" mode="r">
       <description>Average of last Token Return ADC Values</description>
-      <field name="ADCTRAverage" start="0" bits="12" format="unsigned"/>
+      <field name="ADCTRValue" start="0" bits="12" format="unsigned"/>
     </register>
     
-    <register name="ADCTRMean" address="0009" purpose="config" mode="rw">
-      <description>ADCTR Mean</description>
-      <field name="ADCTRMean" start="0" bits="32" format="unsigned"/>
+
+    <register name="ParityErrCtr" address="0009" purpose="status" mode="r">
+      <description>Parity Error Counter</description>
+      <field name="ParityErrCtr" start="0" bits="15" format="unsigned"/>
     </register>
+
     
     <register name="ADCTRLimit" address="000a" purpose="config" mode="rw">
       <description>ADCTR Limit</description>