From: Ludwig Maier <lmaier@bia.e12.ph.tum.de>
Date: Mon, 28 Apr 2014 07:39:03 +0000 (+0200)
Subject: nxyter register update
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7be7f605d314d4046393a1c7ab3e4ec8b451786c;p=daqtools.git

nxyter register update
---

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 653c416..2981b31 100755
--- 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";
+$setup[3]->{cmd}     = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TriggerGenerator";
 $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 
diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 67bf7dd..a851636 100644
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -44,6 +44,39 @@
    
   </group>  
 
+  <!-- ##################################################################### -->
+  <group name="TriggerGenerator"
+         address="0140"  size="5"  purpose="status"  mode="rw"  continuous="true">
+     
+    <register name="TrigSetup" address="0000" purpose="config" mode="rw">
+      <description>Trigger Selection</description>
+      <field name="InternOut"  start="2" bits="1" format="bitmask"/>
+      <field name="PulserOn"   start="1" bits="1" format="bitmask"/>
+      <field name="SelfTrigOn" start="0" bits="1" format="bitmask"/>
+    </register>
+    
+    <register name="PulserT" address="0001" purpose="config" mode="rw">
+      <description>Pulser Period (10ns)</description>
+      <field name="PulserT" start="0" bits="28" format="unsigned"/>
+    </register>
+
+    <register name="SelfTrigRate" address="0002" purpose="status" mode="r">
+      <description>Self Trigger Rate (Hz)</description>
+      <field name="SelfTrigRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+    </register>
+
+    <register name="PulserRate" address="0003" purpose="status" mode="r">
+      <description>Pulser Trigger Rate (Hz)</description>
+      <field name="PulserRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+    </register>   
+    
+    <register name="OutTriggerRate" address="0004" purpose="status" mode="r">
+      <description>Outgoing Trigger Rate (Hz)</description>
+      <field name="OutTriggerRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+    </register>   
+
+  </group> 
+
   <!-- ##################################################################### -->
 
   <group name="TriggerValidate"