From 90a5fc322840e3c5921dab7c011144535a763124 Mon Sep 17 00:00:00 2001 From: Maps Date: Tue, 21 Feb 2023 16:18:02 +0100 Subject: [PATCH] add second Trb5sc to setup --- trbnet/addresses.sh | 5 ++++- trbnet/register_configgbe.db | 2 ++ trbnet/register_configgbe_ip.db | 1 + trbnet/start.sh | 14 +++++++------- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/trbnet/addresses.sh b/trbnet/addresses.sh index e6b4132..0ca54a0 100755 --- 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 9fb3022..54aa6f9 100644 --- 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 5eab02f..2be9f0d 100644 --- 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 9864be4..f53f4b7 100755 --- 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" -- 2.43.0