added another TRB to Frankfurt test

diff --git a/users/frankfurt_test/evtbuilder_start.sh b/users/frankfurt_test/evtbuilder_start.sh
index ff08751f57de212d332bc4fd8e8b19298848c857..66eda7d63e7ade5418c2fc4936e96755c97aff8d 100755 (executable)
--- a/users/frankfurt_test/evtbuilder_start.sh
+++ b/users/frankfurt_test/evtbuilder_start.sh
@@ -47,8 +47,8 @@ extraopts="--online"
 cd $tmpdir
 
 
-#exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 2 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file 
-exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 1 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file 
+#exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 1 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file 
+exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 2 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file \
 ${extraopts}; 
 read; bash" &
 pid=$!
@@ -56,8 +56,8 @@ echo $pid > $tmpdir/.daq_evtbuild.pid
 
 sleep 1
 
-#exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 2 -i UDP:0.0.0.0:50000 -i UDP:0.0.0.0:50002 -q 32 -d 1 -S test ;  " &
-exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 1 -i UDP:0.0.0.0:50000 -q 32 -d 1 -S test ;  " &
+#exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 1 -i UDP:0.0.0.0:50000 -q 32 -d 1 -S test ;  " &
+exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 2 -i UDP:0.0.0.0:50000 -i UDP:0.0.0.0:50003 -q 32 -d 1 -S test ;  " &
 pid=$!
 echo $pid > $tmpdir/.daq_netmem.pid
 

diff --git a/users/frankfurt_test/register_configgbe.db b/users/frankfurt_test/register_configgbe.db
index 695028336e980d46add08133b08e893c60af8fb7..be145980fdaadec6aa5e3974823e1d49e8b996ea 100755 (executable)
--- a/users/frankfurt_test/register_configgbe.db
+++ b/users/frankfurt_test/register_configgbe.db
@@ -17,5 +17,6 @@
   0x8000      0       0x8000     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
   0x8100      0       0x8100     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
   0x8200      0       0x8200     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
+  0x8820      0       0x8200     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
 
 

diff --git a/users/frankfurt_test/register_configgbe_ip.db b/users/frankfurt_test/register_configgbe_ip.db
index 4159086f8df5ccc549c07b8f86fe256f10f3d25b..a9aec07a08e2572387c24b3c3d820776a67ff0a8 100755 (executable)
--- a/users/frankfurt_test/register_configgbe_ip.db
+++ b/users/frankfurt_test/register_configgbe_ip.db
@@ -31,4 +31,5 @@
  0x8000                0   0x546C5E8B    0x0008      0xc0a800fe      0xc350     0xdead8000     0x0230   0xc0a80007      0xc350     0x0578
  0x8100                0   0x546C5E8B    0x0008      0xc0a800fe      0xc352     0xdead8100     0x0230   0xc0a80088      0xc350     0x0578
  0x8200                0   0x546C5E8B    0x0008      0xc0a800fe      0xc353     0xdead8200     0x0230   0xc0a80089      0xc350     0x0578
+ 0x8820                0   0x546C5E8B    0x0008      0xc0a800fe      0xc354     0xdead8820     0x0230   0xc0a8008a      0xc350     0x0578
 

diff --git a/users/frankfurt_test/startup.sh b/users/frankfurt_test/startup.sh
index 601bf61995155e8ceb97c58916fa5fe62208113d..492a211dab33935b7152e48d536eaaaf2ae54643 100755 (executable)
--- a/users/frankfurt_test/startup.sh
+++ b/users/frankfurt_test/startup.sh
@@ -23,6 +23,12 @@ trbcmd s  0xa50000046f398628  0x00 0x5000
 trbcmd s  0x220000046f399228  0x02 0x5002
 trbcmd s  0x290000046f075428  0x03 0x5003
 
+#82
+trbcmd s  0xa300000313233628  0x05 0x8820
+trbcmd s  0x8d000003133e5a28  0x00 0x5820
+trbcmd s  0x9400000313233728  0x01 0x5821
+trbcmd s  0x4e000003131c0328  0x02 0x5822
+trbcmd s  0xa0000003133cae28  0x03 0x5823
 
 echo "Hubs"
 trbcmd w 0xfffe 0xc5 0x50ff

diff --git a/web/htdocs/network/map.pl b/web/htdocs/network/map.pl
new file mode 100755 (executable)
index 0000000..8c84b68
--- /dev/null
+++ b/web/htdocs/network/map.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print "Content-type: text/html\r\n\r\n";
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
+
+use CGI ':standard';
+use POSIX;
+use CGI::Carp qw(fatalsToBrowser);
+
+use lib qw|../commands htdocs/commands|;
+use xmlpage;
+
+
+###############################################################################  
+##  Network Map
+###############################################################################  
+if($ENV{'QUERY_STRING'} =~ /getmap/) {
+  print "Getting map";
+  }
+  
+###############################################################################  
+##  Main page
+###############################################################################  
+else {
+  my $page;
+  $page->{title} = "TrbNet Network Setup";
+  $page->{link}  = "../";
+  $page->{getscript} = "map.pl";
+
+  my @setup;
+  $setup[0]->{name}    = "NetworkMap";
+  $setup[0]->{cmd}     = "getmap";
+  $setup[0]->{period}  = -1;
+  $setup[0]->{noaddress} = 0;
+  $setup[0]->{generic}   = 0;
+
+  xmlpage::initPage(\@setup,$page);
+  } 
+
+ 
+
+1;
+
+