added temperature to network map

diff --git a/web/htdocs/commands/nettrace.pl b/web/htdocs/commands/nettrace.pl
index fa15ca4abe192f264e3da10625a7361317d6c1d8..7396b298a45c326519a2fd45f1a8ba1bef4599c2 100755 (executable)
--- a/web/htdocs/commands/nettrace.pl
+++ b/web/htdocs/commands/nettrace.pl
@@ -11,10 +11,10 @@ use Data::Dumper;
    die("can not connect to trbnet-daemon on the $ENV{'DAQOPSERVER'}");
  }
 
-
+my $temps  = trb_register_read(0xffff,0);
 my $boards = trb_read_uid(0xffff);
-my $types = trb_register_read(0xffff,0x42);
-my $ctime = trb_register_read(0xffff,0x40);
+my $types  = trb_register_read(0xffff,0x42);
+my $ctime  = trb_register_read(0xffff,0x40);
 my @store;
 
 foreach my $id (sort keys %{$boards}) {
@@ -33,6 +33,7 @@ foreach my $id (sort keys %{$boards}) {
     $o->{ctime}  = $ctime->{$addr};
     $o->{type}   = $types->{$addr};
     $o->{addr}   = $addr;
+    $o->{temp}   = $temps->{$addr};
     push (@store,$o);
     }
   }
@@ -46,7 +47,7 @@ sub printlist {
   my @o;
   foreach my $b (@store) {
     if ($b->{parent} == $parent) {
-      push(@o,sprintf("%04x#%d#%d#%04x#%d#%s&",$b->{parent},$b->{port},$layer,$b->{addr},$b->{type},time2str('%Y-%m-%d %H:%M',$b->{ctime})));      
+      push(@o,sprintf("%04x#%d#%d#%04x#%d#%s#%.1f&",$b->{parent},$b->{port},$layer,$b->{addr},$b->{type},time2str('%Y-%m-%d %H:%M',$b->{ctime}),($b->{temp}>>20)/16));      
       $o[-1] .= printlist($b->{addr},$layer+1);
       }
     }

diff --git a/web/htdocs/network/map.htm b/web/htdocs/network/map.htm
index 26241bca8e99c052e0e07abaa65afb0a3354cb5e..a1ab2037d545ffe824213a992d88def69226cdcc 100644 (file)
--- a/web/htdocs/network/map.htm
+++ b/web/htdocs/network/map.htm
@@ -28,7 +28,7 @@ function update(data) {
   var b = data.split("&");
   var c = {};
   var lastlevel = 1;
-  o = "<tr class=\"head map\"><th>Board<th>Hardware<th>AddOn<th>Design<th>Compile Time";
+  o = "<tr class=\"head map\"><th>Board<th>Hardware<th>AddOn<th>Design<th>Compile Time<th>Temperature";
 
   for(j=0;j<b.length-1;j++) {
     c[j] = b[j].split("#");
@@ -91,6 +91,7 @@ function update(data) {
       }
 
     o += "<td>"+c[j][5];
+    o += "<td>"+c[j][6]+"°C";
     
     lastlevel = c[j][2];
     }