]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
change timestamp generator in CTS to allow notiming triggers
authorJan Michel <j.michel@gsi.de>
Wed, 31 Oct 2018 14:58:34 +0000 (15:58 +0100)
committerJan Michel <j.michel@gsi.de>
Wed, 31 Oct 2018 14:58:34 +0000 (15:58 +0100)
cts/source/timestamp_generator.vhd

index 2ddb43f710635527e24993734c1a5dd6a815fa59..91e10f963f9289fa7df4ea1b51a13ea90f809964 100644 (file)
@@ -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 =>