From 485188f6b080eebd6136fcce62f01fba078e0090 Mon Sep 17 00:00:00 2001 From: gianmarcogirau Date: Mon, 18 May 2020 14:01:10 +0100 Subject: [PATCH] ELGIP-91 - Changed the polarity of the new triggers for in-line merge synchronization --- generic_ip/pulse_generator/3/src/pulse_generator_3.vhd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd b/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd index 3cc209e..ed4632a 100644 --- a/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd +++ b/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2016-10-24 --- Last update: 2020-05-15 +-- Last update: 2020-05-18 -- SVN ID : Git -- Standard : VHDL'93 ------------------------------------------------------------------------------- @@ -363,7 +363,7 @@ begin bus_valid => seq_bus_valid, bus_ack => '1'); - ch_ctrl_trigger_in <= (0 => loc_pd, 1 => fire_enable, 2 => gated_pulse, 3 => (not fire_enable), 4 => stream_busy_a, 5 => stream_busy_b); + ch_ctrl_trigger_in <= (0 => loc_pd, 1 => fire_enable, 2 => gated_pulse, 3 => (not fire_enable), 4 => (not stream_busy_a), 5 => (not stream_busy_b)); ch_mask_i <= fire_enable or ch_ctrl_vector_out(1) or bypass_ch_ctrl;