Update ADA AddOn to newer TDC files

diff --git a/ADA_Addon/compile.pl b/ADA_Addon/compile.pl
index 4456748979cd7c576d7f595d5f8ea8d132589393..8a19aa687e9ce69f56c9c1ed9bf6f366dcc1b061 120000 (symlink)
--- a/ADA_Addon/compile.pl
+++ b/ADA_Addon/compile.pl
@@ -1 +1 @@
-../scripts/compile.pl
\ No newline at end of file
+../../trb3sc/scripts/compile.pl
\ No newline at end of file

diff --git a/ADA_Addon/config.vhd b/ADA_Addon/config.vhd
index 5105add86d0dd3dae99ddb04fd36d4d5759f99e9..30ec9d724b4553347fdbed8c3e855138074e3d02 100644 (file)
--- a/ADA_Addon/config.vhd
+++ b/ADA_Addon/config.vhd
@@ -10,9 +10,10 @@ package config is
 ------------------------------------------------------------------------------
 
 --TDC settings
+  constant FPGA_TYPE               : integer  := 3;  --3: ECP3, 5: ECP5
   constant NUM_TDC_MODULES         : integer range 1 to 4  := 1;  -- number of tdc modules to implement
   constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 33;  -- number of tdc channels per module
-  constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 5;  --the nearest power of two, for convenience reasons 
+  constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 4;  --the nearest power of two, for convenience reasons 
   constant DOUBLE_EDGE_TYPE        : integer range 0 to 3  := 1;  --double edge type:  0, 1, 2,  3
   -- 0: single edge only,
   -- 1: same channel,
@@ -27,7 +28,9 @@ package config is
   -- 13: Debug - single fine time and the chain for the 0x3ff hits
   -- 14: Debug - single fine time and the ROM addresses for the two transitions
   -- 15: Debug - complete carry chain dump
-
+  constant USE_PINOUT : integer := 1; --1: normal, 3: every 4th channel (HPTDC)
+  
+  
   constant EVENT_BUFFER_SIZE       : integer range 9 to 13 := 13; -- size of the event buffer, 2**N
   constant EVENT_MAX_SIZE          : integer := 4096;             --maximum event size. Should not exceed EVENT_BUFFER_SIZE/2
 
@@ -40,7 +43,7 @@ package config is
 
 --Add logic to generate configurable trigger signal from input signals.
   constant INCLUDE_TRIGGER_LOGIC : integer := c_YES;
-  constant INCLUDE_STATISTICS    : integer := c_NO;  --Do histos of all inputs
+  constant INCLUDE_STATISTICS    : integer := c_YES;  --Do histos of all inputs
   constant PHYSICAL_INPUTS       : integer := 32;  --number of inputs connected
   constant TRIG_GEN_OUTPUT_NUM   : integer := 4;
   constant MONITOR_INPUT_NUM     : integer := PHYSICAL_INPUTS+TRIG_GEN_OUTPUT_NUM;    
@@ -92,7 +95,7 @@ function generateIncludedFeatures return std_logic_vector is
 begin
   t               := (others => '0');
   t(63 downto 56) := std_logic_vector(to_unsigned(2,8)); --table version 2
-  t(7 downto 0)   := std_logic_vector(to_unsigned(1,8));
+  t(7 downto 0)   := std_logic_vector(to_unsigned(USE_PINOUT,8));
   t(11 downto 8)  := std_logic_vector(to_unsigned(DOUBLE_EDGE_TYPE,4));
   t(14 downto 12) := std_logic_vector(to_unsigned(RING_BUFFER_SIZE,3));
   t(15)           := '1'; --TDC

diff --git a/ADA_Addon/config_compile_frankfurt.pl b/ADA_Addon/config_compile_frankfurt.pl
index b6d3aa7e13754b9c6ad3d2e7b8fd3c9b1f296d26..d2785ecca09d0507d6ce1f37e8f7696ce19e9b4c 100644 (file)
--- a/ADA_Addon/config_compile_frankfurt.pl
+++ b/ADA_Addon/config_compile_frankfurt.pl
@@ -2,8 +2,8 @@ TOPNAME                      => "trb3_periph_ADA",
 project_path                 => "ADA_Addon",
 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.6_x64',
-synplify_path                => '/d/jspc29/lattice/synplify/K-2015.09/',
+lattice_path                 => '/d/jspc29/lattice/diamond/3.9_x64',
+synplify_path                => '/d/jspc29/lattice/synplify/L-2016.09-1/',
 # 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",
 
@@ -13,7 +13,7 @@ pinout_file                  => 'trb3_periph_ada',
 
 #Include only necessary lpf files
 #pinout_file                  => '', #name of pin-out file, if not equal TOPNAME
-include_TDC                  => 0,
+include_TDC                  => 1,
 include_GBE                  => 0,
 
 #Report settings

diff --git a/ADA_Addon/trb3_periph_ADA.p2t b/ADA_Addon/trb3_periph_ADA.p2t
index 37870ba9559af2c429a33ef6644faf31f22b81f7..dd2df83c8871f9e8634dc6b35519686251a5e658 100644 (file)
--- a/ADA_Addon/trb3_periph_ADA.p2t
+++ b/ADA_Addon/trb3_periph_ADA.p2t
@@ -4,7 +4,7 @@
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 12
--t 1
+-t 4
 -c 1
 -e 2
 -i 15

diff --git a/ADA_Addon/trb3_periph_ADA.prj b/ADA_Addon/trb3_periph_ADA.prj
index 12f240ce916b3b5b14e47f38084d553d7d1c5873..a35de8422fadbab380c5c48d86bd5a6c1994075e 100644 (file)
--- a/ADA_Addon/trb3_periph_ADA.prj
+++ b/ADA_Addon/trb3_periph_ADA.prj
@@ -162,7 +162,7 @@ add_file -vhdl -lib work "tdc_release/bit_sync.vhd"
 add_file -vhdl -lib work "tdc_release/BusHandler_record.vhd"
 add_file -vhdl -lib work "tdc_release/Channel.vhd"
 add_file -vhdl -lib work "tdc_release/Channel_200.vhd"
-add_file -vhdl -lib work "tdc_release/Encoder_288_Bit.vhd"
+add_file -vhdl -lib work "tdc_release/Encoder_304_Bit.vhd"
 add_file -vhdl -lib work "tdc_release/fallingEdgeDetect.vhd"
 add_file -vhdl -lib work "tdc_release/hit_mux.vhd"
 add_file -vhdl -lib work "tdc_release/LogicAnalyser.vhd"