nxyter register update

diff --git a/users/tum_e12/configure_cts.sh b/users/tum_e12/configure_cts.sh
index 614893ec73a6812b59fad7e56a9ec7d0f432c913..8d29ec4cb4830e72229ae59351a01488c553e41d 100755 (executable)
--- a/users/tum_e12/configure_cts.sh
+++ b/users/tum_e12/configure_cts.sh
@@ -13,9 +13,9 @@ trbcmd w 0x8000 0x830b 0x7
 trbcmd w 0x8000 0x830d 0x0
 
 # Pulser #0 Settings
-#trbcmd w 0x8000 0xa140  0x0001869f
+trbcmd w 0x8000 0xa140  0x0001869f
 #trbcmd clearbit 0x8000 0xa101 0x2
 
 # Pulser #0 Settings
-trbcmd w 0x8000 0xa137 0x0001869f #0x3e7
-trbcmd clearbit 0x8000 0xa101 0x2
+#trbcmd w 0x8000 0xa137 0x0001869f #0x3e7
+#trbcmd clearbit 0x8000 0xa101 0x2

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 465b64fbeb3d8543079f943f7a40cbbccbf581d8..2b9b9ce67b25eac57d0a977d2ba423ab974c99d6 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -7,7 +7,7 @@
   <description>Registers for the Nxyter Readout</description>
 
   <group name="DataValidate"
-         address="0120"  size="6"  purpose="status"  mode="r"  continuous="true">
+         address="0120"  size="9"  purpose="status"  mode="r"  continuous="true">
 
     <register name="InvalidFrames" address="0000" purpose="status">
       <description>Number of invalid frames</description>
@@ -42,6 +42,21 @@
       </register>
     </group>
 
+    <register name="ADCValue" address="0006" purpose="status" mode="r">
+      <description>Last valid ADC value</description>
+      <field name="ADCValue" start="0" bits="32" format="unsigned"/>
+    </register>
+
+    <register name="ADCAverage" address="0007" purpose="status" mode="r">
+      <description>Average of last valid ADC Values</description>
+      <field name="ADCAverage" start="0" bits="32" format="unsigned"/>
+    </register>
+    
+    <register name="ADCAverageNum" address="0008" purpose="config" mode="rw">
+      <description>Number of Averages, power of two (2^n)</description>
+      <field name="ADCAverageNum" start="0" bits="4" format="unsigned" />
+    </register>
+
   </group>
 
 
@@ -188,7 +203,7 @@
 
 
   <group name="DataReceiver"
-         address="0500"  size="18"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="19"  purpose="status"  mode="rw"  continuous="true">
 
     <register name="CurrentTimestamp" address="0000" purpose="status" mode="r">
       <description>Current Timestamp Value read from Fifo</description>
@@ -245,21 +260,21 @@
       <field name="PllFineDelb" start="0" bits="4" format="unsigned" scale="125" unit="ps" />
     </register>
 
-    <register name="ADCValue" address="0008" purpose="status" mode="r">
-      <description>Current ADC value</description>
-      <field name="ADCValue" start="0" bits="32" format="unsigned"/>
+    <register name="ADCRValue" address="0008" purpose="status" mode="r">
+      <description>Current ADC raw value</description>
+      <field name="ADCRValue" start="0" bits="32" format="unsigned"/>
     </register>
-    
-    <register name="ADCInputErrorEnable" address="0009" purpose="config" mode="rw">
-      <description>"ADC Input Error Enable</description>
-      <field name="ADCInputErrorEnable" start="0" bits="1" format="boolean" />
+
+    <register name="Reserved0" address="0009" purpose="status" mode="r">
+      <description></description>
+      <field name="Reserved0" start="0" bits="32" format="unsigned"/>
     </register>
     
-    <register name="ADCInputErrorCtr" address="000a" purpose="status" mode="r">
-      <description>ADC Input Error Counter</description>
-      <field name="ADCInputErrorCtr" start="0" bits="16" format="unsigned" />
+    <register name="Reserved1" address="000a" purpose="config" mode="r">
+      <description></description>
+      <field name="Reserved1" start="0" bits="4" format="unsigned" />
     </register>
-
+    
     <register name="ADCClockOK" address="000b" purpose="status" mode="r">
       <description>ADC Clock OK, Johnson counter is synced</description>
       <field name="ADCClockOK" start="0" bits="1" format="boolean" />
@@ -301,6 +316,11 @@
       <field name="ADCFrameRate" start="0" bits="27" format="unsigned" unit="Hz" />
     </register>
 
+    <register name="ADCTestValue" address="0012" purpose="status" mode="r">
+      <description>ADC Test Channel Value</description>
+      <field name="ADCTestValue" start="0" bits="12" format="unsigned"/>
+    </register>
+
   </group>
   
   <group name="NxyterI2C"