few changes to config files and ports in the template

diff --git a/tdctemplate/config_compile_frankfurt.pl b/tdctemplate/config_compile_frankfurt.pl
index 3aa417ea48e528a1a8cbdc70c574506196cb30ad..60f50cd5ef0a0f579be4b24446d0d9d679b52003 100644 (file)
--- a/tdctemplate/config_compile_frankfurt.pl
+++ b/tdctemplate/config_compile_frankfurt.pl
@@ -3,7 +3,7 @@ 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.10_x64',
 synplify_path                => '/d/jspc29/lattice/synplify/N-2017.09-1/',
-nodelist_file                => 'nodes_tdctemplate.txt',
+nodelist_file                => '../tdctemplate/nodes_tdctemplate.txt',
 #Include only necessary lpf files
 #pinout_file                  => 'trb3sc_32pin', #name of pin-out file, if not equal TOPNAME
 pinout_file                  => 'trb3sc_padiwa', #name of pin-out file, if not equal TOPNAME

diff --git a/tdctemplate/par.p2t b/tdctemplate/par.p2t
index 1a65a74dd45dd47c90ef61b943ff2e98d914ff55..9263f7d1a741fb250be9eee90b8dfea0760879a5 100644 (file)
--- a/tdctemplate/par.p2t
+++ b/tdctemplate/par.p2t
@@ -13,8 +13,8 @@
 -w
 -l 5
 -i 6
--t 26
+-t 37
 # -s 1 #save how many
--c 0
--e 0
--exp parUseNBR=1:parCDP=auto:parCDR=1:parPathBased=OFF:parHold=ON:parHoldLimit=10000
+-c 1
+-e 1
+-exp parUseNBR=1:parCDP=auto:parCDR=1:parPathBased=OFF:parHold=2:parHoldLimit=10000

diff --git a/template/config.vhd b/template/config.vhd
index d7270365b87635fb88b4935a9be94388c2e87359..76b65f1783f30c2727deb0408803ee393c355e60 100644 (file)
--- a/template/config.vhd
+++ b/template/config.vhd
@@ -25,22 +25,22 @@ package config is
    
 --Address settings   
     constant INIT_ADDRESS           : std_logic_vector := x"F3CC";
-    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"60";
+    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"69";
    
 --set to 0 for backplane serdes, set to 3 for front SFP serdes
     constant SERDES_NUM             : integer := 3;
    
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
-    constant INCLUDE_LCD            : integer  := c_YES;
+    constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
     constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
     constant INCLUDE_STATISTICS     : integer  := c_YES;
-    constant TRIG_GEN_INPUT_NUM     : integer  := 32;
-    constant TRIG_GEN_OUTPUT_NUM    : integer  := 2;
-    constant MONITOR_INPUT_NUM      : integer  := 32;        
+    constant TRIG_GEN_INPUT_NUM     : integer  := 64;
+    constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
+    constant MONITOR_INPUT_NUM      : integer  := 64;        
     
 ------------------------------------------------------------------------------
 --End of design configuration

diff --git a/template/trb3sc_basic.vhd b/template/trb3sc_basic.vhd
index 859f2295b53d10a55bd101f4a3d427cfe6be2c2a..458db4dae437a7468e5c7eec19bd699f00f1a15e 100644 (file)
--- a/template/trb3sc_basic.vhd
+++ b/template/trb3sc_basic.vhd
@@ -37,10 +37,11 @@ entity trb3sc_basic is
     BACK_GPIO            : inout std_logic_vector(3 downto 0);
     
     --AddOn Connector
-    --to be added
+    INP                  : in    std_logic_vector(63 downto 0);
     
     --KEL Connector
     KEL                  : inout std_logic_vector(40 downto 1);
+    X                    : out std_logic_vector(12 downto 1);
     
     --Additional IO
     HDR_IO               : inout std_logic_vector(10 downto 1);
@@ -355,9 +356,9 @@ THE_ENDPOINT : entity work.trb_net16_endpoint_hades_full_handler_record
       ADC_MISO    => ADC_DOUT,
       ADC_CLK     => ADC_CLK,
       --Trigger & Monitor 
-      MONITOR_INPUTS   => KEL(32 downto 1),--(others => '0'),
-      TRIG_GEN_INPUTS  => KEL(32 downto 1),--(others => '0'),
-      TRIG_GEN_OUTPUTS => BACK_GPIO(3 downto 2),--open,
+      MONITOR_INPUTS   => INP,--KEL(32 downto 1),--(others => '0'),
+      TRIG_GEN_INPUTS  => INP,--KEL(32 downto 1),--(others => '0'),
+      TRIG_GEN_OUTPUTS => X(4 downto 1),--open,
       --SED
       SED_ERROR_OUT => sed_error_i,
       --Slowcontrol
@@ -493,7 +494,7 @@ THE_RDO : process begin
       end if;
       data_counter <= 0;
     when WRITE =>
-      readout_tx(0).data  <= timer.microsecond;
+      readout_tx(0).data  <= timer.microsecond(15 downto 0) & std_logic_vector(data_counter);
       readout_tx(0).data_write <= '1';
       data_counter <= data_counter + 1;
       if data_counter = data_amount then