From: Your Name <you@example.com>
Date: Thu, 6 Mar 2014 10:17:09 +0000 (+0100)
Subject: updated monitoring registers
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=30ae2640054cdb917dc781b48a68753a25441c2d;p=daqtools.git

updated monitoring registers
---

diff --git a/web/htdocs/index.pl b/web/htdocs/index.pl
index 8af86d5..7c2c52c 100755
--- a/web/htdocs/index.pl
+++ b/web/htdocs/index.pl
@@ -84,6 +84,7 @@ The main documentation of the network can be found in these documents and locati
 <div class="index">
 <ul>
 <li><a href="tdc/tdcstatctrl.pl">TDC (xml-based)</a>
+<li><a href="tdc/inputmonitor.pl">Input Monitor</a>
 <li><a href="nxyter/index.pl">Nxyter Read-out</a>
 <li><a href="nxyter/index_a.pl">Nxyter Read-out (advanced)</a>
 <li><a href="mvd/jtag.pl">MVD Jtag Controller</a>
diff --git a/xml-db/database/InputMonitor.xml b/xml-db/database/InputMonitor.xml
index ab0ffcf..5ee7a84 100644
--- a/xml-db/database/InputMonitor.xml
+++ b/xml-db/database/InputMonitor.xml
@@ -10,22 +10,22 @@
     <description>Registers of the input monitoring</description>
     <register name="MonitorEnable" address="0000"  mode="rw" >
       <description>Enables individual inputs for monitoring</description>
-      <field  name="MonitorEnable" start="0" bits="31" format="bitmask" noflag="true">
+      <field  name="MonitorEnable" start="0" bits="32" format="bitmask" noflag="true">
       </field>
     </register>
     <register name="MonitorInvert" address="0001" mode="rw" >
       <description>Inverts individual inputs for monitoring</description>
-      <field  name="MonitorInvert" start="0" bits="31" format="bitmask" noflag="true">
+      <field  name="MonitorInvert" start="0" bits="32" format="bitmask" noflag="true">
       </field>
     </register>
     <register name="MonitorRate" address="0002" mode="rw" >
       <description>Sets the rate at which values are written to the fifo.</description>
-      <field  name="MonitorRate" start="0" bits="31" format="unsigned" unit="ns" scale="10" noflag="true">
+      <field  name="MonitorRate" start="0" bits="32" format="unsigned" unit="ns" scale="10" noflag="true">
       </field>
     </register>
     <register name="MonitorTimer" address="0003" mode="r" >
       <description>Current value of the timer</description>
-      <field  name="MonitorTimer" start="0"   bits="31" format="unsigned" unit="ns" scale="10">
+      <field  name="MonitorTimer" start="0"   bits="32" format="unsigned" unit="ns" scale="10">
       </field>
     </register>    
     <register name="MonitorStatus" address="0004" mode="r" >
@@ -47,10 +47,10 @@
     </register>    
     <register name="MonitorTrigger" address="000f" mode="w" >
       <description>Control signals for fifo and counters</description>
-      <field  name="MonitorRecord" start="0"   bits="1" format="binary">
+      <field  name="MonitorRecord" start="0"   bits="1" format="bitmask">
          <description>Start writing data to fifo</description>
       </field>
-      <field  name="MonitorResetCounters" start="1"   bits="1" format="binary">
+      <field  name="MonitorResetCounters" start="1"   bits="1" format="bitmask">
          <description>Reset all counters</description>
       </field>
     </register>        
@@ -60,7 +60,7 @@
     <description>Fifos for each input. 1024 words each.</description>  
     <fifo name="MonitorFifo" address="0000" mode="r" repeat="32" size="1024" >
       <description>Fifo with history of input edge counters.</description>
-      <field  name="MonitorFifo" start="0" bits="18" format="unsigned" noflag="true">
+      <field  name="MonitorFifo" start="0" bits="18" format="unsigned" noflag="true" rate="true">
       </field>
     </fifo>    
   </group>
@@ -69,31 +69,31 @@
     <description>Current counter value for each input</description>  
     <register name="MonitorCounter" address="0000" mode="r" repeat="32" >
       <description>Current value of the input edge counter</description>
-      <field  name="MonitorCounter" start="0" bits="24" format="unsigned" noflag="true" />
+      <field  name="MonitorCounter" start="0" bits="24" format="unsigned" noflag="true" rate="true" />
     </register>    
   </group>
 
-  <group name="Trigger" purpose="config" address="0000" size="32" mode="rw" continuous="true">
+  <group name="Trigger" purpose="config" address="0000" size="34" mode="rw" continuous="false">
     <description>Registers of the trigger generation logic</description>  
-    <group name="TriggerGeneration" purpose="config" address="0000" size="2" repeat="16">
+    <group name="TriggerGeneration" purpose="config" address="0000" size="2" repeat="16" continuous="true">
       <register name="TriggerEnable" address="0000"  mode="rw" >
          <description>Enables individual inputs for trigger generation. If enabled, the input adds to the common or</description>
-         <field  name="TriggerEnable" start="0" bits="31" format="bitmask" noflag="true">
+         <field  name="TriggerEnable" start="0" bits="32" format="bitmask" noflag="true">
          </field>
       </register>
       <register name="TriggerInvert" address="0001" mode="rw" >
          <description>Inverts individual inputs for trigger generation</description>
-         <field  name="TriggerInvert" start="0" bits="31" format="bitmask" noflag="true">
+         <field  name="TriggerInvert" start="0" bits="32" format="bitmask" noflag="true">
          </field>
       </register>
     </group>
-    <register name="TriggerInput" address="0040" mode="r" >
+    <register name="TriggerInput" address="0020" mode="r" >
       <description>Current status of all inputs</description>
-      <field  name="TriggerInput" start="0"   bits="31" format="bitmask" />
+      <field  name="TriggerInput" start="0"   bits="32" format="bitmask" />
     </register>         
-    <register name="TriggerOutput" address="0041" mode="r" >
+    <register name="TriggerOutput" address="0021" mode="r" >
       <description>Current status of all inputs</description>
-      <field  name="TriggerOutput" start="0"   bits="31" format="bitmask" />
+      <field  name="TriggerOutput" start="0"   bits="32" format="bitmask" />
     </register>         
     
   </group>  
diff --git a/xml-db/get.pl b/xml-db/get.pl
index d3dcb1d..706388a 100755
--- a/xml-db/get.pl
+++ b/xml-db/get.pl
@@ -346,6 +346,7 @@ sub generateoutput {
       foreach my $b (sort keys %{$lastboards}) {
         my $ttmp = "";
         my $sl;
+        next unless defined $data->{$addr}->{$b};
         $sl = sprintf("<td class=\"slice\"><div>%i<span class=\"tooltip\"><b>$name.$slice</b> (0x%04x)</span></div>",$slice,$addr) if ($once != 1 && defined $obj->{repeat});
         
         $ttmp .= sprintf("<tr><td><div>%04x<span class=\"tooltip\"><b>$name</b> on 0x%04x<br>raw: 0x%x</span></div>%s",$b,$b,$data->{$addr}->{$b},$sl);