update config files

diff --git a/cts/config_compile_frankfurt.pl b/cts/config_compile_frankfurt.pl
index c16d10fb4de903511a569d046f1ec834628bad8a..7714c11f938124706bab5093b90958a6bdb1a055 100644 (file)
--- a/cts/config_compile_frankfurt.pl
+++ b/cts/config_compile_frankfurt.pl
@@ -1,7 +1,7 @@
 TOPNAME                      => "trb3sc_cts",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1702\@hadeb05.gsi.de",
-lattice_path                 => '/d/jspc29/lattice/diamond/3.12',
+lattice_path                 => '/d/jspc29/lattice/diamond/3.11_x64',
 synplify_path                => '/d/jspc29/lattice/synplify/T-2022.09-SP2',
 #synplify_command             => "/d/jspc29/lattice/diamond/3.5_x64/bin/lin64/synpwrap -fg -options",
 #synplify_command             => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp",
@@ -9,8 +9,8 @@ synplify_path                => '/d/jspc29/lattice/synplify/T-2022.09-SP2',
 nodelist_file                => 'nodelist_frankfurt.txt',
 
 
-#pinout_file                  => 'trb3sc_hub_ctsrj',     #with RJ adapter for I/O
- pinout_file                  => 'trb3sc_hub_kelpadiwa', #with SPI on KEL connectors
+# pinout_file                  => 'trb3sc_hub_ctsrj',     #with RJ adapter for I/O
+pinout_file                  => 'trb3sc_hub_kelpadiwa', #with SPI on KEL connectors
 # pinout_file                  => 'trb3sc_master',        #with backplane
 
 

diff --git a/hub/config.vhd b/hub/config.vhd
index 93fa61d8b1137eada9c547850e51c8fb01c37ffe..cfb15658ba1bd29d282ac2f4a44bb61d00c013c6 100644 (file)
--- a/hub/config.vhd
+++ b/hub/config.vhd
@@ -12,10 +12,10 @@ package config is
 ------------------------------------------------------------------------------
 
 --design options: backplane or front SFP, with or without GBE
-    constant USE_BACKPLANE : integer := c_YES;
+    constant USE_BACKPLANE : integer := c_NO;
     constant INCLUDE_GBE   : integer := c_YES;
 
-    constant FPGA_TYPE               : integer  := 5;  --3: ECP3, 5: ECP5
+    constant FPGA_TYPE               : integer  := 3;  --3: ECP3, 5: ECP5
 
 --Runs with 120 MHz instead of 100 MHz     
     constant USE_120_MHZ            : integer := c_NO; 
@@ -35,7 +35,7 @@ package config is
     constant INCLUDE_SPI            : integer  := c_YES;
     constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_I2C            : integer  := c_NO;
-    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
+    constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
     constant INCLUDE_TRIGGER_LOGIC  : integer  := c_NO;

diff --git a/tdctemplate/config_48_crate_4conn_ecal.vhd b/tdctemplate/config_48_crate_4conn_ecal.vhd
index 977f1c1ff026fb52dfe915790fa4cf193ab9e6fd..71dafa62d5f5463f12b38abe72094b86896e6cba 100644 (file)
--- a/tdctemplate/config_48_crate_4conn_ecal.vhd
+++ b/tdctemplate/config_48_crate_4conn_ecal.vhd
@@ -57,7 +57,7 @@ package config is
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
     constant INCLUDE_ADC            : integer  := c_YES; 
-    constant INCLUDE_LCD            : integer  := c_NO;
+    constant INCLUDE_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    
     --input monitor and trigger generation logic
@@ -78,23 +78,6 @@ package config is
 ------------------------------------------------------------------------------
 
 
-  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"54", x"72", x"62", x"33", x"73", x"63", 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",
-      x"85",x"0a",
-      x"86",x"0a",
-      x"87",x"0a",
-      others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -138,11 +121,11 @@ function generateIncludedFeatures return std_logic_vector is
     t(15)           := '1'; --TDC
     t(17 downto 16) := std_logic_vector(to_unsigned(NUM_TDC_MODULES-1,2));
     t(28 downto 28) := std_logic_vector(to_unsigned(3-SERDES_NUM,1));
-    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(45 downto 45) := std_logic_vector(to_unsigned(USE_GBE,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));

diff --git a/tdctemplate/config_compile_frankfurt.pl b/tdctemplate/config_compile_frankfurt.pl
index 0faf42b2f2eadb56044267711c376dfbafa513a3..a0a40b4487109e44127f862ae0b31fefea6e5510 100644 (file)
--- a/tdctemplate/config_compile_frankfurt.pl
+++ b/tdctemplate/config_compile_frankfurt.pl
@@ -1,8 +1,8 @@
 TOPNAME                      => "trb3sc_tdctemplate",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1702\@hadeb05.gsi.de",
-lattice_path                 => '/d/jspc29/lattice/diamond/3.11_x64',
-synplify_path                => '/d/jspc29/lattice/synplify/P-2019.09-SP1/',
+lattice_path                 => '/d/jspc29/lattice/diamond/3.13',
+synplify_path                => '/d/jspc29/lattice/synplify/T-2022.09-SP2/',
 nodelist_file                => '../tdctemplate/nodes_tdctemplate.txt',
 
 #Include only necessary lpf file

diff --git a/triggerbox/config_compile_frankfurt.pl b/triggerbox/config_compile_frankfurt.pl
index 3a5aa215391bfdf7caeacaad3b4f25e7b1ac90ef..7c800a12cdf2e8d691f0b9827985721b6a5be9d8 100644 (file)
--- a/triggerbox/config_compile_frankfurt.pl
+++ b/triggerbox/config_compile_frankfurt.pl
@@ -1,8 +1,8 @@
 TOPNAME                      => "trb3sc_triggerbox",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1702\@hadeb05.gsi.de",
-lattice_path                 => '/d/jspc29/lattice/diamond/3.11_x64',
-synplify_path                => '/d/jspc29/lattice/synplify/R-2020.09-SP1/',
+lattice_path                 => '/d/jspc29/lattice/diamond/3.13',
+synplify_path                => '/d/jspc29/lattice/synplify/T-2022.09-SP2/',
 #synplify_command             => "/d/jspc29/lattice/diamond/3.6_x64/bin/lin64/synpwrap -fg -options",
 # synplify_command             => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp",