From ea229fc33c027f04483e09d4c8bd02d064acc412 Mon Sep 17 00:00:00 2001 From: gianmarcogirau Date: Fri, 31 May 2019 08:55:25 +0100 Subject: [PATCH] WH-17 - Error measurement now starts with the first Print-Operation and not with the first PD --- .../pulse_generator/2/src/pulse_generator_2.vhd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generic_ip/pulse_generator/2/src/pulse_generator_2.vhd b/generic_ip/pulse_generator/2/src/pulse_generator_2.vhd index 021342a..0eb3c7a 100644 --- a/generic_ip/pulse_generator/2/src/pulse_generator_2.vhd +++ b/generic_ip/pulse_generator/2/src/pulse_generator_2.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2016-10-24 --- Last update: 2019-05-29 +-- Last update: 2019-05-31 -- SVN ID : Git -- Standard : VHDL'93 ------------------------------------------------------------------------------- @@ -98,7 +98,7 @@ architecture rtl of pulse_generator_2 is signal seq_bus_valid, spit_nco_msb : std_logic; signal wh_apply_corr_en, wh_error_meas_avail, wh_corr_ready : std_logic; signal wh_error_meas_started, init_wh, loc_pd_d : std_logic; - signal wh_meas_event, ch_mask_fe, first_pd_arrived : std_logic; + signal wh_meas_event, ch_mask_fe, first_po_started : std_logic; -- signal abs_pos_msb_old : std_logic_vector( 1 downto 0); signal wh_corr_ready_v : std_logic_vector( 2 downto 0); @@ -416,13 +416,13 @@ begin end if; div_ratio_i <= std_logic_vector(signed(div_ratio)+signed(div_ratio_corr)); if(init_wh = '1' ) then - first_pd_arrived <= '0'; - elsif(loc_pd_d = '1') then - first_pd_arrived <= '1'; + first_po_started <= '0'; + elsif(ch_mask_i = '1' and ch_mask_d = '0') then + first_po_started <= '1'; end if; if(init_wh = '1' ) then wh_error_meas_started <= '0'; - elsif(wh_meas_event = '1' and first_pd_arrived = '1') then + elsif(wh_meas_event = '1' and first_po_started = '1') then wh_error_meas_started <= not wh_error_meas_started; end if; if(wh_meas_event = '1' and wh_error_meas_started = '0') then