From: Jan Michel Date: Tue, 12 Mar 2024 10:09:05 +0000 (+0100) Subject: cts config files update X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=2621d90f99619053e05d77a80c2bc6444242f269;p=trb3sc.git cts config files update --- diff --git a/cts/config_8SFP_RJAdapter.vhd b/cts/config_8SFP_RJAdapter.vhd index 7118a90..d03a374 100644 --- a/cts/config_8SFP_RJAdapter.vhd +++ b/cts/config_8SFP_RJAdapter.vhd @@ -34,7 +34,7 @@ package config is constant INCLUDE_UART : integer := c_YES; constant INCLUDE_SPI : integer := c_YES; constant INCLUDE_ADC : integer := c_YES; - constant INCLUDE_I2C : integer := c_NO; + constant INCLUDE_I2C : integer := c_YES; constant INCLUDE_DEBUG_INTERFACE: integer := c_YES; --input monitor and trigger generation logic @@ -67,21 +67,21 @@ package config is constant GEN_BUSY_OUTPUT : integer := c_NO; constant TRIGGER_COIN_COUNT : integer := 4; - constant TRIGGER_PULSER_COUNT : integer := 3; + constant TRIGGER_PULSER_COUNT : integer := 2; constant TRIGGER_RAND_PULSER : integer := 1; - constant TRIGGER_ADDON_COUNT : integer := 6; + constant TRIGGER_ADDON_COUNT : integer := 9; constant PERIPH_TRIGGER_COUNT : integer := 0; constant ADDON_LINE_COUNT : integer := 36 - USE_RJADAPT*12; --36 with Padiwa, 22 with RJ-adapter constant CTS_OUTPUT_MULTIPLEXERS : integer := 2; --TODO: -- constant INCLUDE_MBS_MASTER : integer range c_NO to c_YES := c_NO; --Which external trigger module (ETM) to use? - constant INCLUDE_ETM : integer range c_NO to c_YES := c_YES; + constant INCLUDE_ETM : integer range c_NO to c_YES := c_NO; type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B); constant ETM_CHOICE : ETM_CHOICE_type := ETM_CHOICE_MBS_VULOM; constant ETM_ID : std_logic_vector(7 downto 0); - constant INCLUDE_TIMESTAMP_GENERATOR : integer := c_NO; + constant INCLUDE_TIMESTAMP_GENERATOR : integer := c_YES; diff --git a/cts/config_simple.vhd b/cts/config_simple.vhd index 2dad47b..05867f0 100644 --- a/cts/config_simple.vhd +++ b/cts/config_simple.vhd @@ -71,7 +71,7 @@ package config is constant TRIGGER_COIN_COUNT : integer := 2; constant TRIGGER_PULSER_COUNT : integer := 3; constant TRIGGER_RAND_PULSER : integer := 1; - constant TRIGGER_ADDON_COUNT : integer := 10; + constant TRIGGER_ADDON_COUNT : integer := 9; constant PERIPH_TRIGGER_COUNT : integer := 0; constant ADDON_LINE_COUNT : integer := 36 - USE_RJADAPT*12; --36 with Padiwa, 22 with RJ-adapter constant CTS_OUTPUT_MULTIPLEXERS : integer := 2;