]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
add default addresses in map if available
authorJan Michel <j.michel@gsi.de>
Tue, 1 Jun 2021 16:38:24 +0000 (18:38 +0200)
committerJan Michel <j.michel@gsi.de>
Tue, 1 Jun 2021 16:38:24 +0000 (18:38 +0200)
web/htdocs/network/map.pl

index 736a773686ffaaa80e96a7e91c849a2165496679..2439080a4c73fa045a4120b3487ee47d88cf7885 100755 (executable)
@@ -40,6 +40,7 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
   my $inclLow  = trb_register_read(0xffff,0x41);
   my $hardware = trb_register_read(0xffff,0x42);
   my $inclHigh = trb_register_read(0xffff,0x43);
+  my $addresses= trb_register_read(0xffff,0x44);
   my $hubbusy  = trb_register_read(0xfffe,0x81);
   my $portactive = trb_register_read(0xfffe,0x84);
 
@@ -140,6 +141,7 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
         
         }      
       my $feat = "";
+
       my $table = $inclHigh->{$addr}>>24&0xFF;
       if($table == 0) {
           my $hw = $hardware->{$addr};
@@ -266,8 +268,13 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
         $gbeval = ceil(min($gbeval,100));
         $gbelevel = 'style="background:linear-gradient(to right,rgba(0,0,255,0.3) '.($gbeval-1).'%,transparent '.$gbeval.'%);"' ;
         }
+
+      my $defaddr = "";
+      if($addresses->{$addr} != $ctime->{$addr}) {
+        $defaddr = sprintf("default address: %04x\nbroadcast fe%02x",$addresses->{$addr}>>16,$addresses->{$addr}&0xff);
+        }
         
-      printf("<tr class=\"level level%i%s%s\"><td><div>%i</div>0x%04x<td title=\"0x%08x\">%s<td title=\"0x%08x%08x\n%s\">%s<td title=\"0x%08x\">%s<td>%.1f°C<td>%016x&nbsp;-&nbsp;%i<td %s>%s<td %s>%s\n",
+      printf("<tr class=\"level level%i%s%s\"><td><div>%i</div>0x%04x<td title=\"0x%08x\">%s<td title=\"0x%08x%08x\n%s\">%s<td title=\"0x%08x\">%s<td>%.1f°C<td title=\"%s\">%016x&nbsp;-&nbsp;%i<td %s>%s<td %s>%s\n",
              $layer,
              ($layer!=$lastlayer?' newlevel':' oldlevel'),
              ($busy?' busy':''),
@@ -282,6 +289,7 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
              $ctime->{$addr},
              time2str('%Y-%m-%d %H:%M',$ctime->{$addr}),
              ($temp->{$addr}>>20)/16,
+             $defaddr,
              $uids->{$addr},
              $endpid->{$addr},
              $gbelevel,