From 073dcadd3a8d99b2e6365ef3f2f5a729fdb9b1a0 Mon Sep 17 00:00:00 2001 From: gianmarcogirau Date: Fri, 17 Jan 2020 10:05:42 +0000 Subject: [PATCH] CORE-73 - Verified Drop-Watch functionality, integrated LEDs generation block from the SMB --- .../fire_pulse_manager/5/doc/fpm_ctrl_5.json | 79 ++++ .../fire_pulse_manager/5/doc/fpm_diags_5.json | 2 +- .../fire_pulse_manager/5/sim/com_fpm.do | 1 + .../fire_pulse_manager/5/sim/wave_fpm.do | 20 +- .../5/src/fire_pulse_ctrl_5.vhd | 9 +- .../5/src/fire_pulse_ctrl_5_pkg.vhd | 3 +- .../5/src/fire_pulse_manager_5.vhd | 82 +++- .../5/src/seb_epd_led_gen_5.vhd | 390 ++++++++++++++++++ .../5/src/test/fire_pulse_manager_5_tb.vhd | 33 +- .../src/test/fire_pulse_manager_5_tb_pkg.vhd | 49 ++- 10 files changed, 651 insertions(+), 17 deletions(-) create mode 100644 generic_ip/fire_pulse_manager/5/src/seb_epd_led_gen_5.vhd diff --git a/generic_ip/fire_pulse_manager/5/doc/fpm_ctrl_5.json b/generic_ip/fire_pulse_manager/5/doc/fpm_ctrl_5.json index d42a3fc..ab2cafe 100644 --- a/generic_ip/fire_pulse_manager/5/doc/fpm_ctrl_5.json +++ b/generic_ip/fire_pulse_manager/5/doc/fpm_ctrl_5.json @@ -360,6 +360,85 @@ "description": "Drop-Watch pulse width, expressed as clock cycles @100MHz" } } + }, + "seb_epd_led_status": { + "address": "15", + "width": "12", + "description": "SEB-EPD LED status", + "fields": { + "led_pd_g": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED PD Green" + }, + "led_pd_y": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED PD Yellow" + }, + "led_pd_r": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED PD Red" + }, + "led_enc_p1_g": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED Encoder-Phase-1 Green" + }, + "led_enc_p1_y": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED Encoder-Phase-1 Yellow" + }, + "led_enc_p1_r": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED Encoder-Phase-1 Red" + }, + "led_enc_p2_g": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED Encoder-Phase-2 Green" + }, + "led_enc_p2_y": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED Encoder-Phase-2 Yellow" + }, + "led_enc_p2_r": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED Encoder-Phase-2 Red" + }, + "led_pof_in_g": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED POF-In Green" + }, + "led_pof_in_y": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED POF-In Yellow" + }, + "led_pof_in_r": { + "type": "r", + "bit_len": "1", + "reset": "0x0", + "description": "LED POF-In Red" + } + } } } }] \ No newline at end of file diff --git a/generic_ip/fire_pulse_manager/5/doc/fpm_diags_5.json b/generic_ip/fire_pulse_manager/5/doc/fpm_diags_5.json index 0ec64dd..bb9da79 100644 --- a/generic_ip/fire_pulse_manager/5/doc/fpm_diags_5.json +++ b/generic_ip/fire_pulse_manager/5/doc/fpm_diags_5.json @@ -380,7 +380,7 @@ "type": "w", "bit_len": "1", "reset": "0x0", - "description": "PD log source: 0 => PD-FIFO associated to Filtered-PD input, 1 => PD-FIFO associated to PD-out input" + "description": "PD log source: 0 => PD-FIFO associated to PD pulse at the input of the Pulse-Generator, 1 => PD-FIFO associated to output of the PD Queue on the first channel" }, "fifo_level": { "type": "r", diff --git a/generic_ip/fire_pulse_manager/5/sim/com_fpm.do b/generic_ip/fire_pulse_manager/5/sim/com_fpm.do index 1db2616..a2bf9ed 100644 --- a/generic_ip/fire_pulse_manager/5/sim/com_fpm.do +++ b/generic_ip/fire_pulse_manager/5/sim/com_fpm.do @@ -97,5 +97,6 @@ vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_5_pkg.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_ctrl_5_pkg.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_ctrl_5.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_ext_5.vhd +vcom -2008 -work $WORKLIB $SRC_PATH/seb_epd_led_gen_5.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_manager_5.vhd diff --git a/generic_ip/fire_pulse_manager/5/sim/wave_fpm.do b/generic_ip/fire_pulse_manager/5/sim/wave_fpm.do index c1089b9..a61228b 100644 --- a/generic_ip/fire_pulse_manager/5/sim/wave_fpm.do +++ b/generic_ip/fire_pulse_manager/5/sim/wave_fpm.do @@ -41,6 +41,9 @@ add wave -noupdate -group TB /fire_pulse_manager_5_tb/sel_slave_0 add wave -noupdate -group TB /fire_pulse_manager_5_tb/sel_slave_1 add wave -noupdate -group TB /fire_pulse_manager_5_tb/pd_cnt add wave -noupdate -group TB /fire_pulse_manager_5_tb/fp_cnt +add wave -noupdate -group TB /fire_pulse_manager_5_tb/run_dw +add wave -noupdate -group TB /fire_pulse_manager_5_tb/dw +add wave -noupdate -group TB /fire_pulse_manager_5_tb/dw_cnt add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/reset_n add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/clk add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/rx_clk @@ -163,6 +166,19 @@ add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/ext_fp_det add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/ext_fp_gen add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/pof_rx_regen add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/log_data_src +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_pd_g +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_pd_y +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_pd_r +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_enc_p1_g +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_enc_p1_y +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_enc_p1_r +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_enc_p2_g +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_enc_p2_y +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_enc_p2_r +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_pof_g +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_pof_y +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_pof_r +add wave -noupdate -group {FPM top} /fire_pulse_manager_5_tb/iDUT/led_status add wave -noupdate -group {POF RX} /fire_pulse_manager_5_tb/iDUT/gPOF/iPOF_RX/reset_n add wave -noupdate -group {POF RX} /fire_pulse_manager_5_tb/iDUT/gPOF/iPOF_RX/clk add wave -noupdate -group {POF RX} /fire_pulse_manager_5_tb/iDUT/gPOF/iPOF_RX/init @@ -689,7 +705,7 @@ add wave -noupdate -group EMS /fire_pulse_manager_5_tb/iDUT/gEMS/iEMS/abs_pos_in add wave -noupdate -group EMS /fire_pulse_manager_5_tb/iDUT/gEMS/iEMS/abs_pos_vel add wave -noupdate -group EMS /fire_pulse_manager_5_tb/iDUT/gEMS/iEMS/delta_t TreeUpdate [SetDefaultTree] -WaveRestoreCursors {{Cursor 1} {8565000 ps} 0} +WaveRestoreCursors {{Cursor 1} {2100245000 ps} 0} quietly wave cursor active 1 configure wave -namecolwidth 223 configure wave -valuecolwidth 100 @@ -705,4 +721,4 @@ configure wave -griddelta 40 configure wave -timeline 0 configure wave -timelineunits ps update -WaveRestoreZoom {709687556 ps} {758321708 ps} +WaveRestoreZoom {404659377 ps} {453293529 ps} diff --git a/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5.vhd b/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5.vhd index 1107ac4..7a1b075 100644 --- a/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5.vhd +++ b/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2017-09-06 --- Last update: 2020-01-13 +-- Last update: 2020-01-16 -- SVN ID : Git -- Standard : VHDL'08 ------------------------------------------------------------------------------- @@ -46,6 +46,7 @@ entity fire_pulse_ctrl_5 is ext_fp_gen : out std_logic_vector(15 downto 0); dw_src : out std_logic_vector( 3 downto 0); dw_pulse_width : out std_logic_vector(15 downto 0); + led_status : in std_logic_vector(11 downto 0); -- Interrupt Senders ins_fpm_irq_0 : out std_logic; -- Avalon MM Interface @@ -250,8 +251,8 @@ begin ext_fp_det_i <= avs_writedata(15 downto 0); ext_fp_gen_i <= avs_writedata(31 downto 16); when DW_CFG_REG => - dw_src_i <= avs_writedata( 3 downto 0); - dw_pulse_width_i <= avs_writedata(15 downto 0); + dw_src_i <= avs_writedata( 3 downto 0); + dw_pulse_width_i <= avs_writedata(31 downto 16); when others => null; end case; end if; @@ -289,6 +290,8 @@ begin avs_readdata <= ext_fp_gen_i & ext_fp_det_i; when DW_CFG_REG => avs_readdata <= dw_pulse_width_i & X"000" & dw_src_i; + when LED_STATUS_REG => + avs_readdata <= 20x"0" & led_status; when others => avs_readdata <= X"BAD1BAD0"; end case; diff --git a/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5_pkg.vhd b/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5_pkg.vhd index 3c1c2b2..839f1c1 100644 --- a/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5_pkg.vhd +++ b/generic_ip/fire_pulse_manager/5/src/fire_pulse_ctrl_5_pkg.vhd @@ -6,7 +6,7 @@ -- Author : GMG -- Company : Global Inkjet Systems -- Created : 2018-05-24 --- Last update: 2019-12-18 +-- Last update: 2020-01-16 -- SVN ID : Git -- Standard : VHDL'2008 ------------------------------------------------------------------------------- @@ -36,5 +36,6 @@ package fire_pulse_ctrl_5_pkg is constant IRQ_MNG_REG : std_logic_vector(3 downto 0) := X"C"; constant EXT_FP_CTRL_REG : std_logic_vector(3 downto 0) := X"D"; constant DW_CFG_REG : std_logic_vector(3 downto 0) := X"E"; + constant LED_STATUS_REG : std_logic_vector(3 downto 0) := X"F"; end package fire_pulse_ctrl_5_pkg; diff --git a/generic_ip/fire_pulse_manager/5/src/fire_pulse_manager_5.vhd b/generic_ip/fire_pulse_manager/5/src/fire_pulse_manager_5.vhd index 06e2e91..73e0550 100644 --- a/generic_ip/fire_pulse_manager/5/src/fire_pulse_manager_5.vhd +++ b/generic_ip/fire_pulse_manager/5/src/fire_pulse_manager_5.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2017-09-06 --- Last update: 2020-01-14 +-- Last update: 2020-01-16 -- SVN ID : Git -- Standard : VHDL'08 ------------------------------------------------------------------------------- @@ -169,6 +169,7 @@ architecture rtl of fire_pulse_manager_5 is signal enc_p2_mux : std_logic; signal enc_p1_ie : std_logic; signal enc_p2_ie : std_logic; + signal ems_filt_pd : std_logic; signal ems_filt_p1 : std_logic; signal ems_filt_p2 : std_logic; -- @@ -178,6 +179,8 @@ architecture rtl of fire_pulse_manager_5 is signal dw_pulse_i : std_logic; signal rst_dw_pulse : std_logic; signal set_dw_pulse : std_logic; + signal dw_trigger : std_logic; + signal dw_trigger_d : std_logic; signal dw_pulse_cnt : std_logic_vector(15 downto 0); -- signal ch_pd, ch_pulse_out : std_logic_vector(CH_NUM - 1 downto 0); @@ -197,6 +200,20 @@ architecture rtl of fire_pulse_manager_5 is signal ext_fp_gen : std_logic_vector(15 downto 0); signal pof_rx_regen : std_logic; signal log_data_src : std_logic_vector(31 downto 0); + -- + signal led_pd_g : std_logic; + signal led_pd_y : std_logic; + signal led_pd_r : std_logic; + signal led_enc_p1_g : std_logic; + signal led_enc_p1_y : std_logic; + signal led_enc_p1_r : std_logic; + signal led_enc_p2_g : std_logic; + signal led_enc_p2_y : std_logic; + signal led_enc_p2_r : std_logic; + signal led_pof_g : std_logic; + signal led_pof_y : std_logic; + signal led_pof_r : std_logic; + signal led_status : std_logic_vector(11 downto 0); begin @@ -302,6 +319,7 @@ begin ext_fp_gen => ext_fp_gen, dw_src => dw_src, dw_pulse_width => dw_pulse_width, + led_status => led_status, ins_fpm_irq_0 => ins_fpm_irq_0, avs_address => cs_addr(3 downto 0), avs_write => cs_ctrl_write_en, @@ -383,7 +401,7 @@ begin begin if(clk = '1' and clk'Event) then if(src_sel(1) = '0') then - init <= fpm_init or (not enable_rx) or remote_init; + init <= fpm_init or (not src_sel(2) and (not enable_rx or remote_init)); else init <= fpm_init or set_pos_ie; end if; @@ -595,7 +613,7 @@ begin filt_p1 => ems_filt_p1, filt_p2 => ems_filt_p2, filt_zp => open, - filt_pd => open); + filt_pd => ems_filt_pd); pd_pulse_mux <= seb_epd_pd when src_sel(1) = '0' else pd_pulse_ie; enc_p1_mux <= seb_epd_enc_p1 when src_sel(1) = '0' else enc_p1_ie; @@ -657,6 +675,57 @@ begin end generate gPOF_TX; + ----------------------------------------------------------------------------- + -- SEB-EPD LEDs + ----------------------------------------------------------------------------- + + iLED_GEN: entity work.seb_epd_led_gen_5 + port map ( + reset_n => reset_n, + clk => clk, + init => init, + ld_pd_max_t => '0', + ld_pd_end_g_t => '0', + ld_enc_max_t => '0', + ld_enc_end_g_t => '0', + ld_pof_g_t => '0', + timing_value => (others => '0'), + host_pwr_is_up => '1', + p_good => '1', + p_in_good => '1', + p_host_good => '1', + pg_iso_5v => '1', + pg_iso_12v => '1', + rs422_pd => ems_filt_pd, + rs422_p1 => ems_filt_p1, + rs422_p2 => ems_filt_p2, + ttl_pd => '0', + ttl_pd_npn => '0', + ttl_p1 => '0', + ttl_p2 => '0', + pof_out => pof_rx, + smb_ok => '1', + led_pwr_g => open, + led_pwr_y => open, + led_pwr_r => open, + led_pd_g => led_pd_g, + led_pd_y => led_pd_y, + led_pd_r => led_pd_r, + led_enc_p1_g => led_enc_p1_g, + led_enc_p1_y => led_enc_p1_y, + led_enc_p1_r => led_enc_p1_r, + led_enc_p2_g => led_enc_p2_g, + led_enc_p2_y => led_enc_p2_y, + led_enc_p2_r => led_enc_p2_r, + led_pof_g => led_pof_g, + led_pof_y => led_pof_y, + led_pof_r => led_pof_r); + + led_status( 2 downto 0) <= led_pd_r & led_pd_y & led_pd_g; + led_status( 5 downto 3) <= led_enc_p1_r & led_enc_p1_y & led_enc_p1_g; + led_status( 8 downto 6) <= led_enc_p2_r & led_enc_p2_y & led_enc_p2_g; + led_status(11 downto 9) <= led_pof_r & led_pof_y & led_pof_g; + ----------------------------------------------------------------------------- -- Diagnostic block ----------------------------------------------------------------------------- @@ -701,7 +770,7 @@ begin pos_step => inc_pos, neg_step => dec_pos, drop_watch => '0', - fire_req => fire_pulse_i(0), + fire_req => ch_pulse_out(0), fine_time => fine_time, coarse_time => coarse_time, abs_position => open, @@ -792,6 +861,7 @@ begin pGEN_DW: process(clk) begin if(clk = '1' and clk'event) then + dw_trigger_d <= dw_trigger; if(rst_dw_pulse = '1') then dw_pulse_i <= '0'; elsif(set_dw_pulse = '1') then @@ -805,8 +875,10 @@ begin end if; end process pGEN_DW; + dw_trigger <= ch_pulse_out(to_integer(unsigned(dw_src(log2(CH_NUM)-1 downto 0)))); + rst_dw_pulse <= '1' when init = '1' or unsigned(dw_pulse_cnt) = unsigned(dw_pulse_width) else '0'; - set_dw_pulse <= '1' when fire_pulse_i(to_integer(unsigned(dw_src(log2(CH_NUM)-1 downto 0)))) = '1' else '0'; + set_dw_pulse <= dw_trigger and not dw_trigger_d; dw_pulse <= dw_pulse_i; diff --git a/generic_ip/fire_pulse_manager/5/src/seb_epd_led_gen_5.vhd b/generic_ip/fire_pulse_manager/5/src/seb_epd_led_gen_5.vhd new file mode 100644 index 0000000..5c6d888 --- /dev/null +++ b/generic_ip/fire_pulse_manager/5/src/seb_epd_led_gen_5.vhd @@ -0,0 +1,390 @@ +------------------------------------------------------------------------------- +-- Title : seb_epd_led_gen_5 +-- Project : SMB +------------------------------------------------------------------------------- +-- File : seb_epd_led_gen_5.vhd +-- Author : Gianmarco Girau +-- Company : Global Inkjet Systems +-- Created : 2018-08-06 +-- Last update: 2020-01-16 +-- SVN ID : Git +-- Standard : VHDL'08 +------------------------------------------------------------------------------- +-- Description: +-- Generate signals for driving the SMB LEDs. +-- Note: those signals can still be overwritten by software through the +-- SMB-Ctrl block. +------------------------------------------------------------------------------- + +library ieee; +use ieee.std_logic_1164.all; +use ieee.numeric_std.all; + +entity seb_epd_led_gen_5 is + port( + reset_n : in std_logic; + clk : in std_logic; + -- config + init : in std_logic; + ld_pd_max_t : in std_logic; + ld_pd_end_g_t : in std_logic; + ld_enc_max_t : in std_logic; + ld_enc_end_g_t : in std_logic; + ld_pof_g_t : in std_logic; + timing_value : in std_logic_vector(31 downto 0); + -- input status signals + host_pwr_is_up : in std_logic; + p_good : in std_logic; + p_in_good : in std_logic; + p_host_good : in std_logic; + pg_iso_5v : in std_logic; + pg_iso_12v : in std_logic; + rs422_pd : in std_logic; + rs422_p1 : in std_logic; + rs422_p2 : in std_logic; + ttl_pd : in std_logic; + ttl_pd_npn : in std_logic; + ttl_p1 : in std_logic; + ttl_p2 : in std_logic; + pof_out : in std_logic; + smb_ok : in std_logic; + -- LEDs outputs values + led_pwr_g : out std_logic; + led_pwr_y : out std_logic; + led_pwr_r : out std_logic; + led_pd_g : out std_logic; + led_pd_y : out std_logic; + led_pd_r : out std_logic; + led_enc_p1_g : out std_logic; + led_enc_p1_y : out std_logic; + led_enc_p1_r : out std_logic; + led_enc_p2_g : out std_logic; + led_enc_p2_y : out std_logic; + led_enc_p2_r : out std_logic; + led_pof_g : out std_logic; + led_pof_y : out std_logic; + led_pof_r : out std_logic); +end entity seb_epd_led_gen_5; + +architecture rtl of seb_epd_led_gen_5 is + + signal power_good, rs422_pd_i, ttl_pd_i, ttl_npn_pd_i : std_logic; + signal rs422_pd_d, ttl_pd_d, ttl_npn_pd_d : std_logic; + signal pd_cnt_zero_flag, rst_pd_green, pd_red, pd_green : std_logic; + signal rs422_p1_i, rs422_p2_i, ttl_p1_i, ttl_p2_i : std_logic; + signal rs422_p1_d, rs422_p2_d, ttl_p1_d, ttl_p2_d : std_logic; + signal rs422_p1_event, rs422_p2_event, p1_cnt_zero_flag : std_logic; + signal ttl_p1_event, ttl_p2_event, p2_cnt_zero_flag : std_logic; + signal rst_p1_green, rst_p2_green, p1_red, p2_red : std_logic; + signal p1_green, p2_green, pof_green, pof_out_d : std_logic; + signal pof_event, pof_cnt_zero_flag, pd_multiple_event : std_logic; + signal smb_ok_d, alert_cnt_zero_flag : std_logic; + signal pd_active, p1_active, p2_active : std_logic; + -- + signal p1_event, p2_event : std_logic_vector( 1 downto 0); + signal p1_prev_event, p2_prev_event : std_logic_vector( 1 downto 0); + signal pd_event, pd_previous_event : std_logic_vector( 2 downto 0); + signal alert_led : std_logic_vector( 3 downto 0); + signal pd_max_period, pd_end_green_t, pd_cnt : std_logic_vector(29 downto 0); + signal enc_max_period, enc_end_green_t : std_logic_vector(29 downto 0); + signal pof_green_t : std_logic_vector(29 downto 0); + signal p1_cnt, p2_cnt, pof_cnt, alert_cnt : std_logic_vector(29 downto 0); + +begin + + ----------------------------------------------------------------------------- + -- Power LED + ----------------------------------------------------------------------------- + + power_good <= '0' when p_good = '0' or p_in_good = '0' or p_host_good = '0' or pg_iso_12v = '0' or pg_iso_5v = '0' else '1'; + + led_pwr_r <= '1' when power_good = '0' and host_pwr_is_up = '1' else '0'; + + led_pwr_y <= '1' when host_pwr_is_up = '0' else '0'; + + led_pwr_g <= '1' when power_good = '1' and host_pwr_is_up = '1' else '0'; + + ----------------------------------------------------------------------------- + -- PD LEDs + ----------------------------------------------------------------------------- + + -- synchronize to the local clock and generate a pulse on the rising edge + iRS422_PD_SYNC: entity work.sync_wire + generic map (rst_val => '0', sync_stages => 3) + port map (rstN => reset_n, clk => clk, async_in => rs422_pd, sync_out => rs422_pd_i); + + iTTL_PNP_PD_SYNC: entity work.sync_wire + generic map (rst_val => '0', sync_stages => 3) + port map (rstN => reset_n, clk => clk, async_in => ttl_pd, sync_out => ttl_pd_i); + + iTTL_NPN_PD_SYNC: entity work.sync_wire + generic map (rst_val => '0', sync_stages => 3) + port map (rstN => reset_n, clk => clk, async_in => ttl_pd_npn, sync_out => ttl_npn_pd_i); + + pd_event <= (ttl_npn_pd_i xor ttl_npn_pd_d) & (ttl_pd_i xor ttl_pd_d) & (rs422_pd_i xor rs422_pd_d); + + pPD_LEDs : process(reset_n, clk) is + begin -- process + if(reset_n = '0') then + rs422_pd_d <= '0'; + ttl_pd_d <= '0'; + ttl_npn_pd_d <= '0'; + pd_previous_event <= "000"; + pd_max_period <= std_logic_vector(to_unsigned(100000000-1, 30)); + pd_end_green_t <= std_logic_vector(to_unsigned( 50000000-1, 30)); + pd_cnt <= (others => '0'); + pd_previous_event <= "000"; + pd_red <= '0'; + pd_green <= '0'; + led_pd_r <= '0'; + led_pd_y <= '0'; + led_pd_g <= '0'; + pd_active <= '0'; + elsif(clk = '1' and clk'event) then + rs422_pd_d <= rs422_pd_i; + ttl_pd_d <= ttl_pd_i; + ttl_npn_pd_d <= ttl_npn_pd_i; + if(ld_pd_max_t = '1') then + pd_max_period <= timing_value(pd_max_period'range); + end if; + if(ld_pd_end_g_t = '1') then + pd_end_green_t <= timing_value(pd_end_green_t'range); + end if; + if(init = '1' or (pd_cnt_zero_flag = '1' and pd_event = "000")) then + pd_previous_event <= "000"; + elsif(pd_event /= "000") then + pd_previous_event <= pd_event; + end if; + if(init = '1') then + pd_cnt <= (others => '0'); + elsif(pd_event /= "000" and pd_red = '0') then + pd_cnt <= pd_max_period; + elsif(pd_cnt_zero_flag = '0') then + pd_cnt <= std_logic_vector(unsigned(pd_cnt)-1); + end if; + if(init = '1' or (pd_cnt_zero_flag = '1' and pd_event = "000")) then + pd_red <= '0'; + elsif((pd_event /= "000" and pd_previous_event /= "000" and pd_event /= pd_previous_event) or pd_multiple_event = '1') then + pd_red <= '1'; + end if; + if(pd_red = '1' or rst_pd_green = '1' or init = '1') then + pd_green <= '0'; + elsif(pd_event = "001" or pd_event = "010" or pd_event = "100") then + pd_green <= '1'; + end if; + led_pd_r <= smb_ok and power_good and pd_red; + led_pd_y <= (smb_ok and power_good and pd_cnt_zero_flag and pd_active) or alert_led(0); + led_pd_g <= smb_ok and power_good and pd_green; + if(pd_event(0) = '1' or pd_event(1) = '1' or pd_event(2) = '1') then + pd_active <= '1'; + end if; + end if; + end process pPD_LEDs; + + pd_cnt_zero_flag <= '1' when unsigned(pd_cnt) = 0 else '0'; + + rst_pd_green <= '1' when unsigned(pd_cnt) = unsigned(pd_end_green_t) else '0'; + + pd_multiple_event <= '1' when pd_event = "011" or pd_event = "101" or pd_event = "110" or pd_event = "111" else '0'; + + ----------------------------------------------------------------------------- + -- Encoder LEDs + ----------------------------------------------------------------------------- + + -- synchronize the signals to the local clock domain + iRS422_P1_SYNC: entity work.sync_wire + generic map (rst_val => '0', sync_stages => 3) + port map (rstN => reset_n, clk => clk, async_in => rs422_p1, sync_out => rs422_p1_i); + + iRS422_P2_SYNC: entity work.sync_wire + generic map (rst_val => '0', sync_stages => 3) + port map (rstN => reset_n, clk => clk, async_in => rs422_p2, sync_out => rs422_p2_i); + + iTTL_P1_SYNC: entity work.sync_wire + generic map (rst_val => '0', sync_stages => 3) + port map (rstN => reset_n, clk => clk, async_in => ttl_p1, sync_out => ttl_p1_i); + + iTTL_P2_SYNC: entity work.sync_wire + generic map (rst_val => '0', sync_stages => 3) + port map (rstN => reset_n, clk => clk, async_in => ttl_p2, sync_out => ttl_p2_i); + + pENC_LEDs : process(reset_n, clk) + begin + if(reset_n = '0') then + enc_max_period <= std_logic_vector(to_unsigned(100000000-1, 30)); + enc_end_green_t <= std_logic_vector(to_unsigned( 50000000-1, 30)); + p1_cnt <= (others => '0'); + p2_cnt <= (others => '0'); + p1_red <= '0'; + p1_green <= '0'; + p2_red <= '0'; + p2_green <= '0'; + p1_prev_event <= "00"; + p2_prev_event <= "00"; + p1_active <= '0'; + p2_active <= '0'; + elsif(clk = '1' and clk'event) then + if(ld_enc_max_t = '1') then + enc_max_period <= timing_value(enc_max_period'range); + end if; + if(ld_enc_end_g_t = '1') then + enc_end_green_t <= timing_value(enc_end_green_t'range); + end if; + if(init = '1' or (p1_cnt_zero_flag = '1' and p1_event = "00")) then + p1_prev_event <= "00"; + elsif(p1_event(0) = '1' or p1_event(1) = '1') then + p1_prev_event <= p1_event; + end if; + if(init = '1' or (p2_cnt_zero_flag = '1' and p2_event = "00")) then + p2_prev_event <= "00"; + elsif(p2_event(0) = '1' or p2_event(1) = '1') then + p2_prev_event <= p2_event; + end if; + if(init = '1') then + p1_cnt <= (others => '0'); + elsif((p1_event(0) = '1' or p1_event(1) = '1') and p1_red = '0') then + p1_cnt <= enc_max_period; + elsif(p1_cnt_zero_flag = '0') then + p1_cnt <= std_logic_vector(unsigned(p1_cnt)-1); + end if; + if(init = '1') then + p2_cnt <= (others => '0'); + elsif((p2_event(0) = '1' or p2_event(1) = '1') and p2_red = '0') then + p2_cnt <= enc_max_period; + elsif(p2_cnt_zero_flag = '0') then + p2_cnt <= std_logic_vector(unsigned(p2_cnt)-1); + end if; + if(init = '1' or (p1_cnt_zero_flag = '1' and p1_event = "00")) then + p1_red <= '0'; + elsif((p1_event(0) = '1' and ((p2_event(0) ='1' or p2_event(1) = '1') or p1_event(1) = '1' or p1_prev_event(1) = '1' or p2_prev_event(1) = '1')) or (p1_event(1) = '1' and (p1_event(0) = '1' or p1_prev_event(0) = '1' or p2_prev_event(0) = '1'))) then + p1_red <= '1'; + end if; + if(init = '1' or (p2_cnt_zero_flag = '1' and p2_event = "00")) then + p2_red <= '0'; + elsif((p2_event(0) = '1' and ((p1_event(0) ='1' or p1_event(1) = '1') or p2_event(1) = '1' or p2_prev_event(1) = '1' or p1_prev_event(1) = '1')) or (p2_event(1) = '1' and (p2_event(0) = '1' or p2_prev_event(0) = '1' or p1_prev_event(0) = '1'))) then + p2_red <= '1'; + end if; + if(p1_red = '1' or rst_p1_green = '1' or init = '1') then + p1_green <= '0'; + elsif(p1_event = "01" or p1_event = "10") then + p1_green <= '1'; + end if; + if(p2_red = '1' or rst_p2_green = '1' or init = '1') then + p2_green <= '0'; + elsif(p2_event = "01" or p2_event = "10") then + p2_green <= '1'; + end if; + if(p1_event(0) = '1' or p1_event(1) = '1') then + p1_active <= '1'; + end if; + if(p2_event(0) = '1' or p2_event(1) = '1') then + p2_active <= '1'; + end if; + end if; + end process pENC_LEDs; + + pENC_LEDs_NR : process(clk) + begin + if(clk = '1' and clk'event) then + rs422_p1_d <= rs422_p1_i; + rs422_p2_d <= rs422_p2_i; + ttl_p1_d <= ttl_p1_i; + ttl_p2_d <= ttl_p2_i; + p1_event <= ttl_p1_event & rs422_p1_event; + p2_event <= ttl_p2_event & rs422_p2_event; + led_enc_p1_r <= smb_ok and power_good and p1_red; + led_enc_p1_y <= (smb_ok and power_good and p1_cnt_zero_flag and not p1_red and p1_active) or alert_led(1); + led_enc_p1_g <= smb_ok and power_good and p1_green and not p1_red; + led_enc_p2_r <= smb_ok and power_good and p2_red; + led_enc_p2_y <= (smb_ok and power_good and p2_cnt_zero_flag and not p2_red and p2_active) or alert_led(2); + led_enc_p2_g <= smb_ok and power_good and p2_green and not p2_red; + end if; + end process pENC_LEDs_NR; + + rs422_p1_event <= rs422_p1_i xor rs422_p1_d; + rs422_p2_event <= rs422_p2_i xor rs422_p2_d; + ttl_p1_event <= ttl_p1_i xor ttl_p1_d; + ttl_p2_event <= ttl_p2_i xor ttl_p2_d; + + p1_cnt_zero_flag <= '1' when unsigned(p1_cnt) = 0 else '0'; + p2_cnt_zero_flag <= '1' when unsigned(p2_cnt) = 0 else '0'; + + rst_p1_green <= '1' when unsigned(p1_cnt) = unsigned(enc_end_green_t) else '0'; + rst_p2_green <= '1' when unsigned(p2_cnt) = unsigned(enc_end_green_t) else '0'; + + ----------------------------------------------------------------------------- + -- POF LEDs + ----------------------------------------------------------------------------- + + pPOF_LED : process(reset_n, clk) + begin + if(reset_n = '0') then + pof_green_t <= std_logic_vector(to_unsigned( 50000000-1, 30)); + pof_cnt <= (others => '0'); + pof_out_d <= '0'; + pof_green <= '0'; + led_pof_g <= '0'; + elsif(clk = '1' and clk'event) then + if(ld_pof_g_t = '1') then + pof_green_t <= timing_value(pof_green_t'range); + end if; + pof_out_d <= pof_out; + if(init = '1') then + pof_cnt <= (others => '0'); + elsif(pof_event = '1') then + pof_cnt <= pof_green_t; + elsif(pof_cnt_zero_flag = '0') then + pof_cnt <= std_logic_vector(unsigned(pof_cnt)-1); + end if; + if(init = '1' or (pof_cnt_zero_flag = '1' and pof_event = '0')) then + pof_green <= '0'; + elsif(pof_event = '1') then + pof_green <= '1'; + end if; + led_pof_g <= smb_ok and power_good and pof_green; + end if; + end process pPOF_LED; + + -- create event only on the rising edge + pof_event <= pof_out and not pof_out_d; + + pof_cnt_zero_flag <= '1' when unsigned(pof_cnt) = 0 else '0'; + + led_pof_y <= alert_led(3); + led_pof_r <= '0'; + + + ----------------------------------------------------------------------------- + -- Emergency Flashing + ----------------------------------------------------------------------------- + + -- when the smb_ctrl watchdog is triggered (smb_ok deasserted), all the LEDs, + -- apart from the power LED, needs to start flashing + + pEMERGENCY_FLASH : process(clk) + begin + if(clk = '1' and clk'event) then + smb_ok_d <= smb_ok; + if(smb_ok = '1') then + alert_led <= "0000"; + elsif(smb_ok = '0' and smb_ok_d = '1') then + alert_cnt <= std_logic_vector(to_unsigned( 50000000-1, 30)); + else + if(alert_cnt_zero_flag = '1') then + if(alert_led = "1111") then + alert_led <= "0000"; + else + alert_led <= alert_led(2 downto 0) & '1'; + end if; + alert_cnt <= std_logic_vector(to_unsigned( 50000000-1, 30)); + else + alert_cnt <= std_logic_vector(unsigned(alert_cnt)-1); + end if; + end if; + end if; + end process pEMERGENCY_FLASH; + + alert_cnt_zero_flag <= '1' when unsigned(alert_cnt) = 0 else '0'; + + +end architecture rtl; diff --git a/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb.vhd b/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb.vhd index 18c2aa9..baefd3d 100644 --- a/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb.vhd +++ b/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb.vhd @@ -6,7 +6,7 @@ -- Author : Christos Spirotis -- Company : Global Inkjet Systems -- Created : 2018-08-10 --- Last update: 2020-01-08 +-- Last update: 2020-01-16 -- SVN ID : Git -- Standard : VHDL'08 ------------------------------------------------------------------------------- @@ -56,6 +56,10 @@ architecture behav of fire_pulse_manager_5_tb is constant SWATHE_LEN : integer := 600; constant IMAGE_SIZE : integer := 100; constant START_DIR : enc_dir_t := DIR_0; + + -- when DRIVE_DROP_WATCH is true, FPM output pof_tx is driven with the + -- drop-watch signal + constant DRIVE_DROP_WATCH : boolean := true; constant VERBOSITY_LEVEL : verb_level_t := VMEDIUM; @@ -131,6 +135,11 @@ architecture behav of fire_pulse_manager_5_tb is signal loc_fp_cnt : fp_cnt_t; signal ch_pulse_out_d : std_logic_vector(CH_NUM-1 downto 0); -- + signal run_dw : std_logic; + signal dw : std_logic; + signal dw_d : std_logic; + signal dw_cnt : natural; + -- signal input_mode : fpm_input_type_t; @@ -376,11 +385,15 @@ begin -- behav -- Testbench Control ----------------------------------------------------------------------------- + dw <= pof_tx when run_dw = '1' else '0'; + pOUT_CHECK_REGs : process(reset_n, clk) begin if(reset_n = '0') then ch_pulse_out_d <= (others => '0'); loc_fp_cnt <= (others => 0); + dw_d <= '0'; + dw_cnt <= 0; elsif(clk = '1' and clk'event) then ch_pulse_out_d <= ch_pulse_out; for n in 0 to CH_NUM-1 loop @@ -397,6 +410,12 @@ begin -- behav end if; end loop; -- n end if; + dw_d <= dw; + if(run_dw = '0') then + dw_cnt <= 0; + elsif(dw = '1' and dw_d = '0') then + dw_cnt <= dw_cnt + 1; + end if; end if; end process pOUT_CHECK_REGs; @@ -545,6 +564,8 @@ begin -- behav input_mode <= POF_INPUT; + run_dw <= '0'; + -- Initialize avalon mm interfaces mm_m_init(avs_m, use_waitrequest => true); @@ -587,6 +608,10 @@ begin -- behav fpm_input_config(input_mode, avs_s, avs_m); + if(DRIVE_DROP_WATCH = true) then + drop_watch_config('1', "0001", 15, avs_s, avs_m); + end if; + while stimuli_completed = false loop wait until reprogram_offset = true or stimuli_completed = true; if (stimuli_completed) then @@ -615,6 +640,12 @@ begin -- behav input_mode <= EPD_INPUT; wait until clk = '1' and clk'event; fpm_input_config(input_mode, avs_s, avs_m); + + if(DRIVE_DROP_WATCH = true) then + drop_watch_config('1', "0001", 15, avs_s, avs_m); + end if; + + run_dw <= '1'; end if; log("Reprogramming offset ... ", VLOW, true); diff --git a/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb_pkg.vhd b/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb_pkg.vhd index 8113ba2..9e33064 100644 --- a/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb_pkg.vhd +++ b/generic_ip/fire_pulse_manager/5/src/test/fire_pulse_manager_5_tb_pkg.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2020-01-02 --- Last update: 2020-01-07 +-- Last update: 2020-01-16 -- SVN ID : Git -- Standard : VHDL'2008 ------------------------------------------------------------------------------- @@ -117,6 +117,13 @@ package fire_pulse_manager_5_tb_pkg is signal mm_s : in mm_s_rec_t; signal mm_m : out mm_m_rec_t); + procedure drop_watch_config( + enable : in std_logic; + src : in std_logic_vector(3 downto 0); + pulse_witdth : in natural; + signal mm_s : in mm_s_rec_t; + signal mm_m : out mm_m_rec_t); + ----------------------------------------------------------------------------- -- ENC/PD Emulator Configuration ----------------------------------------------------------------------------- @@ -284,9 +291,11 @@ package body fire_pulse_manager_5_tb_pkg is -- Enable the POF-Rx data := X"0000_0001"; fpm_reg_write(FP_CTRL_ID, POF_RX_CTRL, data, mm_s, mm_m); + + fpm_reg_read(FP_CTRL_ID, SRC_SEL_REG, data, mm_s, mm_m); -- Select the input source - data := X"0000_0001"; + data(2 downto 0) := b"001"; fpm_reg_write(FP_CTRL_ID, SRC_SEL_REG, data, mm_s, mm_m); -- Config external fire pulses @@ -450,15 +459,19 @@ package body fire_pulse_manager_5_tb_pkg is begin + + if(input_type = POF_INPUT) then - data := X"0000_0001"; + fpm_reg_read(FP_CTRL_ID, SRC_SEL_REG, data, mm_s, mm_m); + + data(2 downto 0) := b"001"; fpm_reg_write(FP_CTRL_ID, SRC_SEL_REG, data, mm_s, mm_m); log("FPM input set to POF. ", VLOW, true); elsif(input_type = EPD_INPUT) then - data := X"0000_0005"; + data(2 downto 0) := b"101"; fpm_reg_write(FP_CTRL_ID, SRC_SEL_REG, data, mm_s, mm_m); log("FPM input set to EPD. ", VLOW, true); @@ -491,6 +504,34 @@ package body fire_pulse_manager_5_tb_pkg is end procedure fpm_ems_config; + procedure drop_watch_config( + enable : in std_logic; + src : in std_logic_vector(3 downto 0); + pulse_witdth : in natural; + signal mm_s : in mm_s_rec_t; + signal mm_m : out mm_m_rec_t) is + + variable data : std_logic_vector(31 downto 0); + + begin + + -- configure the drop-watch + data := std_logic_vector(to_unsigned(pulse_witdth, 16)) & X"000" & src; + fpm_reg_write(FP_CTRL_ID, work.fire_pulse_ctrl_5_pkg.DW_CFG_REG, data, mm_s, mm_m); + + -- Enable/disable the drop-watch + fpm_reg_read(FP_CTRL_ID, work.fire_pulse_ctrl_5_pkg.SRC_SEL_REG, data, mm_s, mm_m); + data(3) := enable; + fpm_reg_write(FP_CTRL_ID, work.fire_pulse_ctrl_5_pkg.SRC_SEL_REG, data, mm_s, mm_m); + + if(enable = '1') then + log("Drop-Watch output enable on channel " & to_string(to_integer(unsigned(src))) & ".", VMEDIUM, true); + else + log("Drop-Watch output disabled.", VMEDIUM, true); + end if; + + end procedure drop_watch_config; + ----------------------------------------------------------------------------- -- ENC/PD Emulator Configuration -----------------------------------------------------------------------------