]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
added registers of ADC data checker
authorJan Michel <j.michel@gsi.de>
Sun, 26 Oct 2014 18:28:48 +0000 (19:28 +0100)
committerJan Michel <j.michel@gsi.de>
Sun, 26 Oct 2014 18:29:39 +0000 (19:29 +0100)
web/htdocs/addons/adc.pl
xml-db/database/ADC.xml

index c530f8cc46b45925d4649e66a2c1c5fae8413e46..f282473a7365c0804a75df88f46f0cd34f9f1375 100755 (executable)
@@ -30,7 +30,7 @@ push(@setup,({name      => "Control",
               address   => 1}));
 
 push(@setup,({name      => "Input", 
-              cmd       => "ADC-0xfe4b-InputHandler",
+              cmd       => "ADC-0xfe4b-InputHandler&ADC-0xfe4b-InvalidWords",
               period    => 1000,
               address   => 1}));              
               
index 25ef6a8b5b012358c15965289f930a92f3870cdd..26dd43bf5bf5c9de04f9e23991f2e47aaec147c7 100644 (file)
         <description>Trigger enable for channels 47 - 32</description>
         <field  name="TriggerEnable1" start="0"   bits="16"  format="bitmask" noflag="true" />
       </register>
-      
+      <register name="WordChecker" address="0009" >
+        <description>Check incoming words for validity. Two accepted words can be specified.</description>
+        <field  name="Word1Check" start="0"   bits="10"   format="hex" noflag="true" />
+        <field  name="Word2Check" start="16"   bits="10"  format="hex" noflag="true" />
+      </register>
+            
 </group>  
 
 <group name="ProcessorConfig" address="0020"  size="12"  purpose="config" mode="rw" continuous="true">
         <field  name="Baseline" start="0"   bits="18"  format="unsigned" noflag="true" />
       </register>
 </group>
+<group name="InvalidWordsg" address="08C0"  size="48"  purpose="status" mode="r" continuous="true">
+      <register name="InvalidWords" address="0000" repeat="48" >
+        <description>Number of words not matching the given pattern </description>
+        <field  name="InvalidWords" start="0"   bits="32"  format="unsigned" errorflag="true" rate="true" />
+      </register>
+</group> 
 </TrbNetEntity>