From: Jan Michel Date: Tue, 3 Nov 2015 12:07:47 +0000 (+0100) Subject: Adding settings for (unused) trigger logic to ADC AddOn X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1950258cd993419ec0f6fa255bd408b7b5bc39f4;p=trb3sc.git Adding settings for (unused) trigger logic to ADC AddOn --- diff --git a/adcaddon/config.vhd b/adcaddon/config.vhd index dc75654..cc5efa4 100644 --- a/adcaddon/config.vhd +++ b/adcaddon/config.vhd @@ -28,7 +28,12 @@ package config is constant INCLUDE_SPI : integer := c_YES; constant INCLUDE_LCD : integer := c_YES; - + --input monitor and trigger generation logic + constant INCLUDE_TRIGGER_LOGIC : integer := c_NO; + constant INCLUDE_STATISTICS : integer := c_NO; + constant TRIG_GEN_INPUT_NUM : integer := 18; + constant TRIG_GEN_OUTPUT_NUM : integer := 4; + constant MONITOR_INPUT_NUM : integer := 22; constant USE_DUMMY_READOUT : integer := c_NO; --use slowcontrol for readout, no trigger logic @@ -102,7 +107,7 @@ begin t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1)); t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1)); t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1)); - t(51 downto 48) := x"0";--std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4)); + t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4)); t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1)); t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1)); t(54 downto 54) := std_logic_vector(to_unsigned(USE_EXTERNAL_CLOCK,1));