From 508a14c15958529140ca04cb6906b4e7d8fda28c Mon Sep 17 00:00:00 2001 From: gianmarcogirau Date: Tue, 14 Jan 2020 11:22:54 +0000 Subject: [PATCH] CORE-73 - Minor changes to FPM-5 --- .../5/src/fire_pulse_ctrl_5.vhd | 5 ++- .../5/src/fire_pulse_manager_5.vhd | 32 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) 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 d89cb71..1107ac4 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-02 +-- Last update: 2020-01-13 -- SVN ID : Git -- Standard : VHDL'08 ------------------------------------------------------------------------------- @@ -26,6 +26,7 @@ entity fire_pulse_ctrl_5 is port( reset_n : in std_logic; clk : in std_logic; + fpm_init : out std_logic; src_sel : out std_logic_vector(3 downto 0); uart_regen_bypass : out std_logic; enable_rx : out std_logic; @@ -137,6 +138,8 @@ begin fpm_init_pulse <= fpm_init_start and fpm_init_d; fpm_init_done <= '1' when unsigned(init_cnt) = 50 else '0'; + fpm_init <= fpm_init_i; + fine_time_wrap <= '1' when unsigned(fine_time_i) = FINE_TIME_TC else '0'; coarse_time <= coarse_time_i; 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 c738902..06e2e91 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-08 +-- Last update: 2020-01-14 -- SVN ID : Git -- Standard : VHDL'08 ------------------------------------------------------------------------------- @@ -169,6 +169,8 @@ 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_p1 : std_logic; + signal ems_filt_p2 : std_logic; -- signal pof_tx_regen : std_logic; signal pof_tx_data : std_logic; @@ -184,6 +186,7 @@ architecture rtl of fire_pulse_manager_5 is signal start_of_image_i : std_logic_vector(CH_NUM - 1 downto 0); signal fire_pulse_i : std_logic_vector(CH_NUM - 1 downto 0); signal src_sel : std_logic_vector(3 downto 0); + signal fpm_init : std_logic; -- type vel_samp_per_vec_t is array (0 to CH_NUM-1) of std_logic_vector(19 downto 0); signal vel_meas : std_logic_vector(19 downto 0); @@ -279,6 +282,7 @@ begin port map( reset_n => reset_n_i, clk => clk, + fpm_init => fpm_init, src_sel => src_sel, uart_regen_bypass => uart_regen_bypass, enable_rx => enable_rx, @@ -306,10 +310,6 @@ begin avs_readdatavalid => cs_ctrl_read_valid, avs_readdata => cs_ctrl_read_data); - ins_fpm_irq_1 <= '0'; - ins_fpm_irq_2 <= '0'; - ins_fpm_irq_3 <= '0'; - ----------------------------------------------------------------------------- -- I/Os selection @@ -383,9 +383,9 @@ begin begin if(clk = '1' and clk'Event) then if(src_sel(1) = '0') then - init <= not enable_rx or remote_init; + init <= fpm_init or (not enable_rx) or remote_init; else - init <= set_pos_ie; + init <= fpm_init or set_pos_ie; end if; end if; end process pINIT_GEN; @@ -592,8 +592,8 @@ begin set_pos => open, inc_pos => inc_pos_ems, dec_pos => dec_pos_ems, - filt_p1 => open, - filt_p2 => open, + filt_p1 => ems_filt_p1, + filt_p2 => ems_filt_p2, filt_zp => open, filt_pd => open); @@ -672,6 +672,10 @@ begin cs_diag_read_data <= X"DEAD_BEEF"; + ins_fpm_irq_1 <= '0'; + ins_fpm_irq_2 <= '0'; + ins_fpm_irq_3 <= '0'; + elsif ADD_SMB_DIAG = true generate iDiagnostic : entity work.smb_diagnostics_5 @@ -679,17 +683,17 @@ begin clk => clk, reset_n => reset_n_i, ext_diag_rst => init, - rs422_phase0 => '0', - rs422_phase1 => '0', + rs422_phase0 => seb_epd_enc_p1, + rs422_phase1 => seb_epd_enc_p2, rs422_zero_ph => '0', - rs422_prod_det => '0', + rs422_prod_det => seb_epd_pd, ttl_phase0 => '0', ttl_phase1 => '0', ttl_zero_ph => '0', ttl_prod_det => '0', ttl_prod_det_npn => '0', - filt_phase0 => '0', - filt_phase1 => '0', + filt_phase0 => ems_filt_p1, + filt_phase1 => ems_filt_p2, filt_zero_ph => '0', filt_prod_det => pd_pulse, enc_out => enc_pulse(0),