Skip to content

F
FMC TDC 1ns 5cha - Gateware
Commit 0c3ceadb authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

leds_manager: fix channel handling and simplify code.

parent 57cd1fbe
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 131 deletions
hdl/rtl/fmc_tdc_core.vhd
View file @ 0c3ceadb
...@@ -267,10 +267,8 @@ architecture rtl of fmc_tdc_core is ...@@ -267,10 +267,8 @@ architecture rtl of fmc_tdc_core is
signal utc, wrabbit_ctrl_reg : std_logic_vector(g_width-1 downto 0); signal utc, wrabbit_ctrl_reg : std_logic_vector(g_width-1 downto 0);
-- LEDs -- LEDs
signal acam_channel : std_logic_vector(5 downto 0);
signal tdc_in_fpga_1, tdc_in_fpga_2, tdc_in_fpga_3 : std_logic_vector(1 downto 0); signal tdc_in_fpga_1, tdc_in_fpga_2, tdc_in_fpga_3 : std_logic_vector(1 downto 0);
signal tdc_in_fpga_4, tdc_in_fpga_5 : std_logic_vector(1 downto 0); signal tdc_in_fpga_4, tdc_in_fpga_5 : std_logic_vector(1 downto 0);
signal acam_tstamp_channel : std_logic_vector(2 downto 0);
signal rst_sys : std_logic; signal rst_sys : std_logic;
signal timestamp_valid : std_logic; signal timestamp_valid : std_logic;
...@@ -539,7 +537,7 @@ begin ...@@ -539,7 +537,7 @@ begin
rst_i => rst_tdc_i, rst_i => rst_tdc_i,
utc_p_i => local_utc_p, utc_p_i => local_utc_p,
acam_inputs_en_i => acam_inputs_en, acam_inputs_en_i => acam_inputs_en,
acam_channel_i => acam_channel, acam_channel_i => timestamp(98 downto 96),
tstamp_wr_p_i => timestamp_valid, tstamp_wr_p_i => timestamp_valid,
tdc_led_status_o => tdc_led_status_o, tdc_led_status_o => tdc_led_status_o,
tdc_led_trig1_o => tdc_led_trig1_o, tdc_led_trig1_o => tdc_led_trig1_o,
...@@ -548,8 +546,6 @@ begin ...@@ -548,8 +546,6 @@ begin
tdc_led_trig4_o => tdc_led_trig4_o, tdc_led_trig4_o => tdc_led_trig4_o,
tdc_led_trig5_o => tdc_led_trig5_o); tdc_led_trig5_o => tdc_led_trig5_o);
acam_channel <= "000" & acam_tstamp_channel;
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
-- ACAM start_dis, not used -- -- ACAM start_dis, not used --
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
......
hdl/rtl/leds_manager.vhd
View file @ 0c3ceadb
...@@ -108,7 +108,7 @@ entity leds_manager is ...@@ -108,7 +108,7 @@ entity leds_manager is
-- activation comes through dedicated reg c_ACAM_INPUTS_EN_ADR -- activation comes through dedicated reg c_ACAM_INPUTS_EN_ADR
-- Signal for debugging -- Signal for debugging
acam_channel_i : in std_logic_vector(5 downto 0); -- identification of the channel for which a timestamp has arrived acam_channel_i : in std_logic_vector(2 downto 0); -- identification of the channel for which a timestamp has arrived
tstamp_wr_p_i : in std_logic; -- pulse upon the writing of the timestamp in the circular buffer tstamp_wr_p_i : in std_logic; -- pulse upon the writing of the timestamp in the circular buffer
...@@ -131,12 +131,10 @@ architecture rtl of leds_manager is ...@@ -131,12 +131,10 @@ architecture rtl of leds_manager is
signal tdc_led_blink_done : std_logic; signal tdc_led_blink_done : std_logic;
signal visible_blink_length : std_logic_vector(g_width-1 downto 0); signal visible_blink_length : std_logic_vector(g_width-1 downto 0);
signal rst_n, blink_led1, blink_led2 : std_logic; signal rst_n : std_logic;
signal ch1, ch2, ch3, ch4, ch5 : std_logic; signal tstamp_wr_p : std_logic;
signal blink_led3, blink_led4, blink_led5 : std_logic; signal acam_channel : std_logic_vector(2 downto 0);
signal tstamp_wr_p, blink_led : std_logic; signal ch, blink_led, tdc_led_trig : std_logic_vector(1 to 5);
signal acam_channel : std_logic_vector(5 downto 0);
begin begin
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
...@@ -176,143 +174,66 @@ begin ...@@ -176,143 +174,66 @@ begin
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
rst_n <= not(rst_i); rst_n <= not(rst_i);
tdc_led_trig1_o <= tdc_led_trig(1);
tdc_led_trig2_o <= tdc_led_trig(2);
tdc_led_trig3_o <= tdc_led_trig(3);
tdc_led_trig4_o <= tdc_led_trig(4);
tdc_led_trig5_o <= tdc_led_trig(5);
led_1to5_outputs: process (clk_i) led_1to5_outputs: process (clk_i)
begin begin
if rising_edge (clk_i) then if rising_edge (clk_i) then
if acam_inputs_en_i(0) = '1' then for i in tdc_led_trig'range loop
tdc_led_trig1_o <= blink_led1; if acam_inputs_en_i(i - 1) = '1' then
else tdc_led_trig (i) <= blink_led(i);
tdc_led_trig1_o <= not blink_led1; else
end if; tdc_led_trig (i) <= not blink_led(i);
if acam_inputs_en_i(1) = '1' then end if;
tdc_led_trig2_o <= blink_led2; end loop;
else
tdc_led_trig2_o <= not blink_led2;
end if;
if acam_inputs_en_i(2) = '1' then
tdc_led_trig3_o <= blink_led3;
else
tdc_led_trig3_o <= not blink_led3;
end if;
if acam_inputs_en_i(3) = '1' then
tdc_led_trig4_o <= blink_led4;
else
tdc_led_trig4_o <= not blink_led4;
end if;
if acam_inputs_en_i(4) = '1' then
tdc_led_trig5_o <= blink_led5;
else
tdc_led_trig5_o <= not blink_led5;
end if;
end if; end if;
end process; end process;
pulse_generator: process (clk_i) pulse_generator: process (clk_i)
begin begin
if rising_edge (clk_i) then if rising_edge (clk_i) then
if rst_i = '1' then if rst_i = '1' then
acam_channel <= (others => '0'); acam_channel <= (others => '0');
tstamp_wr_p <= '0'; tstamp_wr_p <= '0';
ch1 <= '0'; ch <= (others => '0');
ch2 <= '0';
ch3 <= '0';
ch4 <= '0';
ch5 <= '0';
else else
acam_channel <= acam_channel_i; acam_channel <= acam_channel_i;
tstamp_wr_p <= tstamp_wr_p_i; tstamp_wr_p <= tstamp_wr_p_i;
ch <= (others => '0');
if tstamp_wr_p = '1' and acam_inputs_en_i(7) = '1' then if tstamp_wr_p = '1' and acam_inputs_en_i(7) = '1' then
if acam_channel(2 downto 0) = "000" then case acam_channel is
ch1 <= '1'; when "000" =>
ch2 <= '0'; ch(1) <= '1';
ch3 <= '0'; when "001" =>
ch4 <= '0'; ch(2) <= '1';
ch5 <= '0'; when "010" =>
elsif acam_channel(2 downto 0) = "001" then ch(3) <= '1';
ch1 <= '0'; when "011" =>
ch2 <= '1'; ch(4) <= '1';
ch3 <= '0'; when "100" =>
ch4 <= '0'; ch(5) <= '1';
ch5 <= '0'; when others =>
elsif acam_channel(2 downto 0) = "010" then null;
ch1 <= '0'; end case;
ch2 <= '0';
ch3 <= '1';
ch4 <= '0';
ch5 <= '0';
elsif acam_channel(2 downto 0) = "011" then
ch1 <= '0';
ch2 <= '0';
ch3 <= '0';
ch4 <= '1';
ch5 <= '0';
else
ch1 <= '0';
ch2 <= '0';
ch3 <= '0';
ch4 <= '0';
ch5 <= '1';
end if;
else
ch1 <= '0';
ch2 <= '0';
ch3 <= '0';
ch4 <= '0';
ch5 <= '0';
end if; end if;
end if; end if;
end if; end if;
end process; end process;
cmp_extend_ch1_pulse: gc_extend_pulse g_pulse: for i in tdc_led_trig'range generate
generic map cmp_extend_ch_pulse: gc_extend_pulse
(g_width => 5000000) generic map
port map (g_width => 5000000)
(clk_i => clk_i, port map
rst_n_i => rst_n, (clk_i => clk_i,
pulse_i => ch1, rst_n_i => rst_n,
extended_o => blink_led1); pulse_i => ch(i),
extended_o => blink_led(i));
cmp_extend_ch2_pulse: gc_extend_pulse end generate;
generic map
(g_width => 5000000)
port map
(clk_i => clk_i,
rst_n_i => rst_n,
pulse_i => ch2,
extended_o => blink_led2);
cmp_extend_ch3_pulse: gc_extend_pulse
generic map
(g_width => 5000000)
port map
(clk_i => clk_i,
rst_n_i => rst_n,
pulse_i => ch3,
extended_o => blink_led3);
cmp_extend_ch4_pulse: gc_extend_pulse
generic map
(g_width => 5000000)
port map
(clk_i => clk_i,
rst_n_i => rst_n,
pulse_i => ch4,
extended_o => blink_led4);
cmp_extend_ch5_pulse: gc_extend_pulse
generic map
(g_width => 5000000)
port map
(clk_i => clk_i,
rst_n_i => rst_n,
pulse_i => ch5,
extended_o => blink_led5);
end rtl; end rtl;
----------------------------------------------------------------------------------------------------
-- architecture ends
----------------------------------------------------------------------------------------------------
hdl/rtl/tdc_core_pkg.vhd
View file @ 0c3ceadb
...@@ -821,7 +821,7 @@ package tdc_core_pkg is ...@@ -821,7 +821,7 @@ package tdc_core_pkg is
rst_i : in std_logic; rst_i : in std_logic;
utc_p_i : in std_logic; utc_p_i : in std_logic;
acam_inputs_en_i : in std_logic_vector(g_width-1 downto 0); acam_inputs_en_i : in std_logic_vector(g_width-1 downto 0);
acam_channel_i : in std_logic_vector(5 downto 0); acam_channel_i : in std_logic_vector(2 downto 0);
tstamp_wr_p_i : in std_logic; tstamp_wr_p_i : in std_logic;
---------------------------------------------------------------------- ----------------------------------------------------------------------
tdc_led_status_o : out std_logic; tdc_led_status_o : out std_logic;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment