From: Jan Michel <j.michel@gsi.de>
Date: Wed, 31 Oct 2018 14:58:34 +0000 (+0100)
Subject: change timestamp generator in CTS to allow notiming triggers
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=f493ce953341585304485312c0c08fda23e519b3;p=trb3.git

change timestamp generator in CTS to allow notiming triggers
---

diff --git a/cts/source/timestamp_generator.vhd b/cts/source/timestamp_generator.vhd
index 2ddb43f..91e10f9 100644
--- a/cts/source/timestamp_generator.vhd
+++ b/cts/source/timestamp_generator.vhd
@@ -79,7 +79,7 @@ clock_tick <= not last_timer_clock_reg  and timer_clock_reg when rising_edge(CLK
 		BUSRDO_TX.data               <= x"00000000";
 		case rdostate is
 			when RDO_IDLE =>
-				if TRIGGER_IN = '1' and last_TRIGGER_IN = '0'  then
+				if (TRIGGER_IN = '1' and last_TRIGGER_IN = '0') or BUSRDO_RX.valid_notiming_trg = '1' or BUSRDO_RX.invalid_trg = '1'  then
                rdostate <= RDO_WRITE1;
 				end if;
 			when RDO_WRITE1 =>