From 660cad5c94374fded57d17883284791f37b52c2c Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Mon, 22 Jul 2024 09:25:56 +0200 Subject: [PATCH] updated 4conn design for optional additional trigger outputs --- base/trb3_periph_padiwa.lpf | 44 +++++++++++++++++++++++-------------- wasa/config.vhd | 9 ++++---- wasa/par.p2t | 2 +- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/base/trb3_periph_padiwa.lpf b/base/trb3_periph_padiwa.lpf index b61f29f..a2d23c9 100644 --- a/base/trb3_periph_padiwa.lpf +++ b/base/trb3_periph_padiwa.lpf @@ -135,27 +135,39 @@ LOCATE COMP "INP_44" SITE "W23"; LOCATE COMP "INP_45" SITE "AA25"; LOCATE COMP "INP_46" SITE "AA26"; LOCATE COMP "INP_47" SITE "W21"; -LOCATE COMP "INP_48" SITE "H24"; -LOCATE COMP "INP_49" SITE "L20"; -LOCATE COMP "INP_50" SITE "K24"; -LOCATE COMP "INP_51" SITE "M23"; -LOCATE COMP "INP_52" SITE "L24"; -LOCATE COMP "INP_53" SITE "M22"; -LOCATE COMP "INP_54" SITE "J26"; -LOCATE COMP "INP_55" SITE "N23"; -LOCATE COMP "INP_56" SITE "K19"; -LOCATE COMP "INP_57" SITE "P23"; -LOCATE COMP "INP_58" SITE "L25"; -LOCATE COMP "INP_59" SITE "P21"; -LOCATE COMP "INP_60" SITE "R25"; -LOCATE COMP "INP_61" SITE "T25"; -LOCATE COMP "INP_62" SITE "T26"; -LOCATE COMP "INP_63" SITE "V21"; + +# LOCATE COMP "INP_48" SITE "H24"; +# LOCATE COMP "INP_49" SITE "L20"; +# LOCATE COMP "INP_50" SITE "K24"; +# LOCATE COMP "INP_51" SITE "M23"; +# LOCATE COMP "INP_52" SITE "L24"; +# LOCATE COMP "INP_53" SITE "M22"; +# LOCATE COMP "INP_54" SITE "J26"; +# LOCATE COMP "INP_55" SITE "N23"; +# LOCATE COMP "INP_56" SITE "K19"; +# LOCATE COMP "INP_57" SITE "P23"; +# LOCATE COMP "INP_58" SITE "L25"; +# LOCATE COMP "INP_59" SITE "P21"; +# LOCATE COMP "INP_60" SITE "R25"; +# LOCATE COMP "INP_61" SITE "T25"; +# LOCATE COMP "INP_62" SITE "T26"; +# LOCATE COMP "INP_63" SITE "V21"; DEFINE PORT GROUP "INP_group" "INP*" ; IOBUF GROUP "INP_group" IO_TYPE=LVDS25 DIFFRESISTOR=100; +LOCATE COMP "ADDON_TRIGGER_OUT_0" SITE "M22"; #Pair 5 #counting from 0 +LOCATE COMP "ADDON_TRIGGER_OUT_1" SITE "N23"; #Pair 7 +LOCATE COMP "ADDON_TRIGGER_OUT_2" SITE "K19"; #Pair 8 +LOCATE COMP "ADDON_TRIGGER_OUT_3" SITE "P21"; #Pair 11 +LOCATE COMP "ADDON_TRIGGER_OUT_4" SITE "T25"; #Pair 13 +LOCATE COMP "ADDON_TRIGGER_OUT_5" SITE "C3"; #Pair 17 +LOCATE COMP "ADDON_TRIGGER_OUT_6" SITE "L5"; #Pair 18 +LOCATE COMP "ADDON_TRIGGER_OUT_7" SITE "K8"; #Pair 19 + +DEFINE PORT GROUP "ADDON_TRIGGER_OUT_group" "ADDON_TRIGGER_OUT*" ; +IOBUF GROUP "ADDON_TRIGGER_OUT_group" IO_TYPE=LVDS25 ; diff --git a/wasa/config.vhd b/wasa/config.vhd index f4e3ba0..6901402 100644 --- a/wasa/config.vhd +++ b/wasa/config.vhd @@ -37,19 +37,20 @@ package config is constant USE_PADIWA_FAST_ONLY : integer := c_NO; --Include SPI on AddOn connector - constant INCLUDE_UART : integer := c_YES; + constant INCLUDE_UART : integer := c_NO; constant INCLUDE_SPI : integer := c_YES; constant INCLUDE_LCD : integer := c_NO; - constant INCLUDE_DEBUG_INTERFACE: integer := c_YES; + constant INCLUDE_DEBUG_INTERFACE: integer := c_NO; --Add logic to generate configurable trigger signal from input signals. constant INCLUDE_TRIGGER_LOGIC : integer := c_YES; constant INCLUDE_STATISTICS : integer := c_YES; --Do histos of all inputs - constant PHYSICAL_INPUTS : integer := 52; --number of inputs connected - constant TRIG_GEN_OUTPUT_NUM : integer := 4; + constant PHYSICAL_INPUTS : integer := 48; --number of inputs connected + constant TRIG_GEN_OUTPUT_NUM : integer := 8; constant MONITOR_INPUT_NUM : integer := PHYSICAL_INPUTS+TRIG_GEN_OUTPUT_NUM; constant TRIG_GEN_INPUT_NUM : integer := PHYSICAL_INPUTS; constant USE_SINGLE_FIFO : integer := c_YES; -- single fifo for statistics + constant USE_ADDON_TRIGGER_OUT : integer := c_YES; --trigger out on 4th 40pin connector --Run wih 125 MHz instead of 100 MHz, use received clock from serdes or external clock input constant USE_125_MHZ : integer := c_NO; --not implemented yet! diff --git a/wasa/par.p2t b/wasa/par.p2t index 6788abc..17d0e60 100644 --- a/wasa/par.p2t +++ b/wasa/par.p2t @@ -4,7 +4,7 @@ #-m nodelist.txt # Controlled by the compile.pl script. #-n 1 # Controlled by the compile.pl script. -s 12 --t 23 +-t 24 -c 1 -e 2 -i 15 -- 2.43.0