update CTS config files

diff --git a/cts/config_8SFP_KEL.vhd b/cts/config_8SFP_KEL.vhd
index d0135617a15ca255d3454aa548ffbb8f4b4f1052..826c4feb96a981271fb936b2c14f9a7647de0057 100644 (file)
--- a/cts/config_8SFP_KEL.vhd
+++ b/cts/config_8SFP_KEL.vhd
@@ -72,7 +72,7 @@ package config is
     constant TRIGGER_ADDON_COUNT     : integer := 4;
     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 := 1;
+    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?

diff --git a/cts/config_8SFP_RJAdapter.vhd b/cts/config_8SFP_RJAdapter.vhd
index 1b72012cc58c45290d66f1e20d20231d477a4dc0..7118a90a2f63bd13ab8600dc57bb5a63f46a82d1 100644 (file)
--- a/cts/config_8SFP_RJAdapter.vhd
+++ b/cts/config_8SFP_RJAdapter.vhd
@@ -72,7 +72,7 @@ package config is
     constant TRIGGER_ADDON_COUNT     : integer := 6;
     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 := 1;
+    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?

diff --git a/cts/config_8TDC_R3B.vhd b/cts/config_8TDC_R3B.vhd
index 1caf3df67ae8e1ce938f414677c0c3e48a9dd4aa..5cfa7b0faa4cac40e71d0d27663314372455c1f2 100644 (file)
--- a/cts/config_8TDC_R3B.vhd
+++ b/cts/config_8TDC_R3B.vhd
@@ -72,7 +72,7 @@ package config is
     constant TRIGGER_ADDON_COUNT     : integer := 4;
     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 := 1;
+    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?

diff --git a/cts/config_backplane_KEL.vhd b/cts/config_backplane_KEL.vhd
index c984096f9aea8ef5d4793c7d09dd9982d8e70b26..a22ad342fdbef8ec4976adc1908eb4b098af7ebc 100644 (file)
--- a/cts/config_backplane_KEL.vhd
+++ b/cts/config_backplane_KEL.vhd
@@ -72,7 +72,7 @@ package config is
     constant TRIGGER_ADDON_COUNT     : integer := 4;
     constant PERIPH_TRIGGER_COUNT    : integer := 0;      
     constant ADDON_LINE_COUNT        : integer := 36 - USE_RJADAPT*12 + USE_BACKPLANE*18;  --36 with Padiwa, 22 with RJ-adapter, 54 with backplane
-    constant CTS_OUTPUT_MULTIPLEXERS : integer := 1;
+    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?

diff --git a/cts/config_simple.vhd b/cts/config_simple.vhd
index ba64819cfb6442191fb793964047cabb5c1ac2cc..3cd126b6e3f014090f47e0bd397add6fe4773007 100644 (file)
--- a/cts/config_simple.vhd
+++ b/cts/config_simple.vhd
@@ -33,8 +33,8 @@ package config is
 
     constant INCLUDE_UART            : integer  := c_YES;
     constant INCLUDE_SPI             : integer  := c_YES;
-    constant INCLUDE_ADC            : integer  := c_YES; 
-    constant INCLUDE_LCD             : integer  := c_NO;
+    constant INCLUDE_ADC             : integer  := c_YES; 
+    constant INCLUDE_I2C             : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE : integer  := c_YES;
 
 --input monitor and trigger generation logic
@@ -74,7 +74,7 @@ package config is
     constant TRIGGER_ADDON_COUNT     : integer := 4;
     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 := 1;
+    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?
@@ -91,20 +91,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"48", x"75", x"62", x"41", x"64", x"64", x"4f", x"6e", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      others => x"00");
-
 
     type hub_mii_t is array(0 to 3) of integer;    
     type hub_ct    is array(0 to 16) of integer;
@@ -209,10 +195,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
     t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
-    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(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     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));