move broadcast address in map

diff --git a/web/htdocs/index.pl b/web/htdocs/index.pl
index 9e8ded6e88e1ae25beb01a1a1f2d94ecb7d6b161..313a611a52dad0f1486a78e8019aff9c5e280a05 100755 (executable)
--- a/web/htdocs/index.pl
+++ b/web/htdocs/index.pl
@@ -87,6 +87,7 @@ The main documentation of the network can be found in these documents and locati
 <div class="index">
 <ul>
 <li><a href="tdc/inputmonitor.pl">Input Monitor &amp; Trigger logic</a>
+<ul><li><a href="network/trigger.pl">Trigger logic "graphic"</a></ul>
 <li><a href="padiwa/padiwa.pl">Padiwa (xml-based, with thresholds)</a>
 <li><a href="tools/cbmmbs.pl">MBS Receiver</a>
 <li><a href="addons/adc.pl">48ch sampling ADC</a>

diff --git a/web/htdocs/network/map.pl b/web/htdocs/network/map.pl
index 2439080a4c73fa045a4120b3487ee47d88cf7885..ab103dbf72d849c22fccd5ba4fb6effd2f78c095 100755 (executable)
--- a/web/htdocs/network/map.pl
+++ b/web/htdocs/network/map.pl
@@ -274,10 +274,11 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
         $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 title=\"%s\">%016x&nbsp;-&nbsp;%i<td %s>%s<td %s>%s\n",
+      printf("<tr class=\"level level%i%s%s\"><td title=\"%s\"><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",
              $layer,
              ($layer!=$lastlayer?' newlevel':' oldlevel'),
              ($busy?' busy':''),
+             $defaddr,
              $p,
              $addr,
              $hardware->{$addr},
@@ -289,7 +290,6 @@ 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,