From: Jan Michel <j.michel@gsi.de>
Date: Mon, 14 Oct 2013 12:06:03 +0000 (+0200)
Subject: small change in xml-GUI
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1461c8b2cc7eae3ce16679a2de1b87ca27c30328;p=daqtools.git

small change in xml-GUI
---

diff --git a/web/htdocs/layout/blue.css b/web/htdocs/layout/blue.css
index c84a02f..b8f38b8 100644
--- a/web/htdocs/layout/blue.css
+++ b/web/htdocs/layout/blue.css
@@ -220,10 +220,10 @@ div.header span{
   float:left;
   position:relative;
   top:-2px;
-  margin:0 10px 0 0;
+  margin:0 25px 0 0;
   padding:2px 0px 0 0px;
   border:0px solid transparent;
-  width:100px;
+/*   width:100px; */
   list-style:none;
   cursor:hand;
 /*   text-align:center; */
diff --git a/web/htdocs/network/trbnet.pl b/web/htdocs/network/trbnet.pl
index 9571455..3d177a5 100755
--- a/web/htdocs/network/trbnet.pl
+++ b/web/htdocs/network/trbnet.pl
@@ -16,6 +16,10 @@ $setup[0]->{cmd}     = "TrbNet-0xffff-StatusRegisters";
 $setup[0]->{refresh} = 1;
 $setup[0]->{period}  = 0;
 
+$setup[1]->{name}    = "BoardInfo";
+$setup[1]->{cmd}     = "TrbNet-0xffff-BoardInformation";
+$setup[1]->{refresh} = 1;
+$setup[1]->{period}  = 0;
 
 
 xmlpage::initPage(\@setup);
diff --git a/xml-db/database/TrbNet.xml b/xml-db/database/TrbNet.xml
index f54ec9d..301fb2d 100644
--- a/xml-db/database/TrbNet.xml
+++ b/xml-db/database/TrbNet.xml
@@ -89,16 +89,23 @@
         <description>Number of retransmit requests sent</description>
       </field>
     </register>
+  </group>
 
 
 
-
-
-    <register name="CompileTime" address="0040" purpose="status">
+  <group name="BoardInformation" address="0040">
+    <register name="CompileTime" address="0000" purpose="status">
       <description>Compilation Time</description>
       <field name="CompileTime" start="0" bits="32" format="time" />
     </register>
-
-</group>
+    <register name="DesignVersion" address="0001" purpose="status">
+      <description>Version identifier of the design</description>
+      <field name="DesignVersion" start="0" bits="32" format="hex" />
+    </register>
+    <register name="HardwareInfo" address="0002" purpose="status">
+      <description>Definition of the board hardware the design is intended to be load onto and basic design information</description>
+      <field name="HardwareInfo" start="0" bits="32" format="hex" />
+    </register>
+  </group>
 
 </TrbNetEntity>
diff --git a/xml-db/get.pl b/xml-db/get.pl
index 6ab5ccd..02dcd49 100755
--- a/xml-db/get.pl
+++ b/xml-db/get.pl
@@ -112,7 +112,7 @@ sub FormatPretty {
   my ($value,$obj,$cont) = @_;
   $value  = $value >> ($obj->{start});
   $value &= ((1<<$obj->{bits})-1);
-  $value = $value * ($obj->{scale}||1);
+  $value = $value * ($obj->{scale}||1) + ($obj->{scaleoffset}||0);
   
   my $ret, my $cl;
   if (defined $cont) {
@@ -226,7 +226,7 @@ sub generateoutput {
       }
     }
   elsif($obj->{type} eq "register" || $obj->{type} eq "registerfield" || $obj->{type} eq "field") {
-    $t = "<table class='queryresult'>";
+    $t = "<hr class=\"queryresult\"><table class='queryresult'>";
     my $stepsize = $obj->{stepsize} || 1;
        $slice = 0 unless defined $slice;
 
@@ -261,7 +261,7 @@ sub generateoutput {
         }
       
       } while($once != 1 && defined $obj->{repeat} && ++$slice < $obj->{repeat});
-    $t .= "</table><hr class=\"queryresult\">";
+    $t .= "</table>";
     }
   print $t;
   }