add second Trb5sc to setup

diff --git a/trbnet/addresses.sh b/trbnet/addresses.sh
index e6b4132ca0a5315661b14e7d2e241d8addeaa2e2..0ca54a05903047a64eea2499c6805405c1930c64 100755 (executable)
--- a/trbnet/addresses.sh
+++ b/trbnet/addresses.sh
@@ -4,8 +4,11 @@
 
 ### set addresses of FPGAs ###
 
-trbcmd s  0x6c00000a62958028  0x01 0xc000
+#trbcmd s  0x6c00000a62958028  0x01 0xc000
+trbcmd s  0x4f0000094093c328  0x01 0xc000
 trbcmd s  0x0000719900202941  0x01 0xa000
+trbcmd s  0x0000509f00202941  0x01 0xa001
+#trbcmd s  0x0000719900202941  0x01 0xa000
 
 
 

diff --git a/trbnet/register_configgbe.db b/trbnet/register_configgbe.db
index 9fb30222851dc32104dd9dac9c90143f21df2528..54aa6f9cf55cad2454e01dd444ef25d3c3807357 100644 (file)
--- a/trbnet/register_configgbe.db
+++ b/trbnet/register_configgbe.db
@@ -14,6 +14,7 @@
 ##################################################################################
   0xc000      0       0xc000        1            0        0xffffff         1
   0xa000      0       0xa000        1            0        0xffffff         1
+  0xa001      0       0xa001        1            0        0xffffff         1
 
   
 
@@ -23,4 +24,5 @@
 ##########################################################################################################################
 # 0xff7f      1      0x00020001   0x00030062     0x578         1         59800         200        32000         60000
   0xa000      1      0x00020009   0x00030062     0x578         1         59800         200        32000         60000
+  0xa001      1      0x00020009   0x00030062     0x578         1         59800         200        32000         60000
 

diff --git a/trbnet/register_configgbe_ip.db b/trbnet/register_configgbe_ip.db
index 5eab02f2a509d7942aaf9c15999871bee91c2a62..2be9f0de3090e97e3fa372185c486a1865f6798f 100644 (file)
--- a/trbnet/register_configgbe_ip.db
+++ b/trbnet/register_configgbe_ip.db
@@ -30,6 +30,7 @@
 
  0xc000        0    0xbacdb959     0x90e2     0xc0a80025     50301      0xc350
  0xa000        0    0xbacdb959     0x90e2     0xc0a80025     50302      0xc350
+ 0xa001        0    0xbacdb959     0x90e2     0xc0a80025     50303      0xc350
 
 
 

diff --git a/trbnet/start.sh b/trbnet/start.sh
index 9864be4d3cb618bef64f4d5163066c4f9ff8b7aa..f53f4b709a201e274e07a809794954cde98913b8 100755 (executable)
--- a/trbnet/start.sh
+++ b/trbnet/start.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-export DAQOPSERVER=jspc29:31
+export DAQOPSERVER=jspc29:150
 export PATH=$PATH:/local/trbsoft/trbnettools/bin/
 
 trbcmd reset
@@ -14,17 +14,17 @@ sleep 1
 
 trbcmd w 0xc000 0xa13b 0x000186a0   #1 kHz pulser
 trbcmd w 0xc000 0xa144 0x80         #use trigger type 8
-trbcmd clearbit 0xa000 0x22 0x80000000  #no ref time
-trbcmd w 0xa000 0x7111 0x2ee0     # max 12000 words
+trbcmd clearbit 0xfe82 0x22 0x80000000  #no ref time
+trbcmd w 0xfe82 0x7111 0x2ee0     # max 12000 words
 
 #../scripts/basicsettings.sh
 
-trbcmd w 0xa000 0xa100 0x000 #enable word alignment
+trbcmd w 0xfe82 0xa100 0x000 #enable word alignment
 sleep .2
-trbcmd setbit 0xa000 0xa100 0x100   #Word alignment off
+trbcmd setbit 0xfe82 0xa100 0x100   #Word alignment off
 
-trbcmd w 0xa000 0xde00 30 #I2C speed
-trbcmd w 0xa000 0xde05 0x100  #Mimosis reset
+trbcmd w 0xfe82 0xde00 30 #I2C speed
+trbcmd w 0xfe82 0xde05 0x100  #Mimosis reset
 
 echo "done"