From e23e01c7407ff5ff4593793ec83cde6843445c0d Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 2 Dec 2015 18:57:46 +0100 Subject: [PATCH] Adding some test signals to TDC Template design --- tdctemplate/config.vhd | 5 ++++- tdctemplate/config_compile_frankfurt.pl | 4 ++-- tdctemplate/trb3sc_tdctemplate.vhd | 10 ++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tdctemplate/config.vhd b/tdctemplate/config.vhd index a91b01b..ae25d2d 100644 --- a/tdctemplate/config.vhd +++ b/tdctemplate/config.vhd @@ -12,7 +12,7 @@ package config is --TDC settings 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 := 41; -- number of tdc channels per module + constant NUM_TDC_CHANNELS : integer range 1 to 65 := 2; -- 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 DOUBLE_EDGE_TYPE : integer range 0 to 3 := 3; --double edge type: 0, 1, 2, 3 -- 0: single edge only, @@ -66,6 +66,9 @@ package config is 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"); ------------------------------------------------------------------------------ diff --git a/tdctemplate/config_compile_frankfurt.pl b/tdctemplate/config_compile_frankfurt.pl index 40016de..35eaff7 100644 --- a/tdctemplate/config_compile_frankfurt.pl +++ b/tdctemplate/config_compile_frankfurt.pl @@ -1,9 +1,9 @@ TOPNAME => "trb3sc_tdctemplate", lm_license_file_for_synplify => "1702\@hadeb05.gsi.de", #"27000\@lxcad01.gsi.de"; lm_license_file_for_par => "1702\@hadeb05.gsi.de", -lattice_path => '/d/jspc29/lattice/diamond/3.5_x64', +lattice_path => '/d/jspc29/lattice/diamond/3.6_x64', synplify_path => '/d/jspc29/lattice/synplify/J-2014.09-SP2/', -synplify_command => "/d/jspc29/lattice/diamond/3.5_x64/bin/lin64/synpwrap -fg -options", +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", nodelist_file => 'nodelist_frankfurt.txt', diff --git a/tdctemplate/trb3sc_tdctemplate.vhd b/tdctemplate/trb3sc_tdctemplate.vhd index 0fea34d..f92a939 100644 --- a/tdctemplate/trb3sc_tdctemplate.vhd +++ b/tdctemplate/trb3sc_tdctemplate.vhd @@ -395,7 +395,11 @@ begin lcd_data(15 downto 0) <= timer.network_address; lcd_data(47 downto 16) <= timer.microsecond; lcd_data(79 downto 48) <= std_logic_vector(to_unsigned(VERSION_NUMBER_TIME, 32)); - lcd_data(511 downto 80) <= (others => '0'); + lcd_data(95 downto 80) <= med2int(0).data; + lcd_data(111 downto 96) <= int2med(0).data; + lcd_data(115 downto 112) <= med2int(0).packet_num & med2int(0).dataready; + lcd_data(119 downto 116) <= int2med(0).packet_num & int2med(0).dataready; + lcd_data(511 downto 120) <= (others => '0'); --------------------------------------------------------------------------- -- LED @@ -423,7 +427,9 @@ begin end process; - +TEST_LINE <= med2int(0).dataready & int2med(0).dataready & med2int(0).data(6 downto 0) & int2med(0).data(6 downto 0); + + ------------------------------------------------------------------------------- -- TDC ------------------------------------------------------------------------------- -- 2.43.0