Update network map with new feature bits, e.g. AddOns for Trb3sc

diff --git a/web/htdocs/network/map.pl b/web/htdocs/network/map.pl
index 859fa7972f602e3d031c1ebc897e265dcc101498..3f6ba657ea3a1c17e517d59ac36c52a0c0f2d1a4 100755 (executable)
--- a/web/htdocs/network/map.pl
+++ b/web/htdocs/network/map.pl
@@ -79,12 +79,12 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
       my $btype = "";
       my $value = $hardware->{$addr}>>24&0xff;
       
-      if ($value==0xa5) {$btype= "Trb5Sc"; }      
-      if ($value==0x90) {$btype= "TRB3 central";}
-      if ($value==0x91) {$btype= "TRB3 periph";}
+      if ($value==0xa5) {$btype= "Trb5sc"; }      
+      if ($value==0x90) {$btype= "Trb3 central";}
+      if ($value==0x91) {$btype= "Trb3 periph";}
       if ($value==0x92) {$btype= "CBM-Rich";}
       if ($value==0x93) {$btype= "CBM-Tof";}
-      if ($value==0x95) {$btype= "TRB3sc";}
+      if ($value==0x95) {$btype= "Trb3sc";}
       if ($value==0x96) {$btype= "DiRich";}
       if ($value==0x97) {$btype= "DiRich Conc";}
       if ($value==0x83) {$btype= "TRB2 RPC";}
@@ -97,17 +97,20 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
       if ($value==0x12) {$btype= "MDC Hub"; }
       
       my $addontype = "";  
-      if(($hardware->{$addr}>>24&0xff) == 0x91) {
+      if(($hardware->{$addr}>>24&0xff) == 0x91 || ($hardware->{$addr}>>24&0xff) == 0x95 ) {
         $value= $hardware->{$addr}>>12 & 0xF; 
-        if ($value==0) {$addontype= " & ADA v1";}
-        if ($value==1) {$addontype= " & ADA v2";}
+        if ($value==0) {$addontype= "";}
+        if ($value==1) {$addontype= " & ADA";}
         if ($value==2) {$addontype= " & Multitest";}
         if ($value==3) {$addontype= " & SFP";}
-        if ($value==4) {$addontype= " & Padiwa";}
+        if ($value==4) {$addontype= " & 4conn";}
         if ($value==5) {$addontype= " & GPIN";}
         if ($value==6) {$addontype= " & Nxyter";}
         if ($value==7) {$addontype= " & 32PinAddOn";}
         if ($value==9) {$addontype= " & ADC AddOn";}
+        if ($value==10){$addontype= " & SFP v2";}
+        if ($value==11){$addontype= " & onboard con.";}
+        
         }      
       my $feat = "";
       my $table = $inclHigh->{$addr}>>24&0xFF;
@@ -281,6 +284,11 @@ sub GetTDCInfo {
       if ($value==1) {$feat .=", input 1-to-1";}
       if ($value==2) {$feat .=", on every second input";}
       if ($value==3) {$feat .=", on every fourth input";}
+      if ($value==128) {$feat .=", input from 32pin";}
+      if ($value==129) {$feat .=", input from 4conn";}
+      if ($value==130) {$feat .=", input from onboard KEL";}
+      if ($value==131) {$feat .=", input from ADA, w/ test signals";}
+      if ($value==132) {$feat .=", input from ADA, every fourth pair";}
       
       $value = $info>>8&0xF;
       if ($value==0) {$feat .=", single edge";}
@@ -293,6 +301,7 @@ sub GetTDCInfo {
       if ($value==1) {$feat .=", RingBuffer size: 44 words";}
       if ($value==2) {$feat .=", RingBuffer size: 76 words";}
       if ($value==3) {$feat .=", RingBuffer size: 108 words";}
+      if ($value==7) {$feat .=", RingBuffer size: dynamic";}
     }
       
     return $feat;
@@ -324,7 +333,7 @@ sub GetMac {
   my $btype = shift @_;
   $id = sprintf('%08x',$id);
   my $r = 'da:7a:3'.substr($id,7,1).':'.substr($id,8,2).':'.substr($id,10,2).':'.substr($id,12,2);
-  if ($btype =~ /TRB3sc/) {
+  if ($btype =~ /TRB3sc/i) {
      $r = 'da:7a:0'.substr($id,7,1).':'.substr($id,8,2).':'.substr($id,10,2).':'.substr($id,12,2);
      }
   return $r;