From: Jan Michel Date: Tue, 3 Nov 2015 12:05:27 +0000 (+0100) Subject: Adding LCD information to template, changing to Diamond 3.6 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=60236a99552b79c2240d7fb23b6156865ab5a129;p=trb3sc.git Adding LCD information to template, changing to Diamond 3.6 --- diff --git a/template/config.vhd b/template/config.vhd index 60e0801..8302114 100644 --- a/template/config.vhd +++ b/template/config.vhd @@ -50,8 +50,10 @@ package config is 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"55", x"49", x"44", x"20", x"20", x"89", x"88", x"87", x"86", 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"54", x"65", x"6d", x"70", x"65", x"72", x"61", x"74", x"75", x"72", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"85", x"0a", others => x"00"); ------------------------------------------------------------------------------ diff --git a/template/config_compile_frankfurt.pl b/template/config_compile_frankfurt.pl index 877b174..d3aaf19 100644 --- a/template/config_compile_frankfurt.pl +++ b/template/config_compile_frankfurt.pl @@ -1,9 +1,9 @@ TOPNAME => "trb3sc_basic", 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/template/trb3sc_basic.vhd b/template/trb3sc_basic.vhd index 216dc8c..f5252b1 100644 --- a/template/trb3sc_basic.vhd +++ b/template/trb3sc_basic.vhd @@ -383,7 +383,10 @@ THE_ENDPOINT : entity work.trb_net16_endpoint_hades_full_handler_record 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(91 downto 80) <= timer.temperature; + lcd_data(95 downto 92) <= x"0"; + lcd_data(159 downto 96) <= timer.uid; + lcd_data(511 downto 160) <= (others => '0'); --------------------------------------------------------------------------- -- LED