From 305e768021ad62b54c7b68eacdbfa3a5a678fa9c Mon Sep 17 00:00:00 2001 From: HADES DAQ Date: Mon, 20 Nov 2023 13:36:11 +0100 Subject: [PATCH] dirich5s1 fixes, mt --- dirich5s/dirich5s.prj | 8 ++++---- dirich5s/dirich5s.vhd | 2 +- dirich5s/nodelist_hades69.txt | 2 +- dirich5s/par.p2t | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dirich5s/dirich5s.prj b/dirich5s/dirich5s.prj index 52dc594..682e225 100644 --- a/dirich5s/dirich5s.prj +++ b/dirich5s/dirich5s.prj @@ -131,10 +131,10 @@ add_file -vhdl -lib work "../../trbnet/trb_net16_addresses.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/med_sync_define.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/rx_control.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/tx_control.vhd" -#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/rx_reset_fsm.vhd" -#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/tx_reset_fsm.vhd" -add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_rx_reset_RS.vhd" -add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_tx_reset_RS.vhd" +add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/rx_reset_fsm.vhd" +add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/tx_reset_fsm.vhd" +#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_rx_reset_RS.vhd" +#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_tx_reset_RS.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/sci_reader.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/med_sync_control.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/med_ecp5_sfp_sync.vhd" diff --git a/dirich5s/dirich5s.vhd b/dirich5s/dirich5s.vhd index e070043..935f5f5 100644 --- a/dirich5s/dirich5s.vhd +++ b/dirich5s/dirich5s.vhd @@ -410,7 +410,7 @@ port map ( TEST_LINE(1) <= med_stat_debug(15); -- RX_CV_ERROR, same as rx_error TEST_LINE(2) <= med_stat_debug(2); -- RX_LOS TEST_LINE(3) <= med_stat_debug(13); -- RX_LSM - TEST_LINE(4) <= med_stat_debug(14); -- CDR_LOL +-- TEST_LINE(4) <= med_stat_debug(14); -- CDR_LOL -- TEST_LINE(8 downto 5) <= med_stat_debug(19 downto 16); -- rx_fsm_state diff --git a/dirich5s/nodelist_hades69.txt b/dirich5s/nodelist_hades69.txt index 3e2ff5b..3a168d7 100644 --- a/dirich5s/nodelist_hades69.txt +++ b/dirich5s/nodelist_hades69.txt @@ -4,4 +4,4 @@ SYSTEM = linux CORENUM = 24 ENV = /home/hadaq/bin/diamond_env -WORKDIR = /home/hadaq/vhdl_new_serdes_reset/dirich/dirich5s/workdir +WORKDIR = /home/hadaq/vhdl_dirich5d1/dirich/dirich5s/workdir diff --git a/dirich5s/par.p2t b/dirich5s/par.p2t index 02a5867..c523797 100644 --- a/dirich5s/par.p2t +++ b/dirich5s/par.p2t @@ -4,7 +4,7 @@ #-m nodelist.txt # Controlled by the compile.pl script. #-n 2 # Controlled by the compile.pl script. -s 10 --t 1 +-t 25 -c 2 -e 2 -i 10 -- 2.43.0