]> jspc29.x-matter.uni-frankfurt.de Git - tdc.git/commitdiff
add CDT register for trigger type
authorJan Michel <j.michel@gsi.de>
Thu, 23 Aug 2018 14:37:24 +0000 (16:37 +0200)
committerJan Michel <j.michel@gsi.de>
Thu, 23 Aug 2018 14:37:24 +0000 (16:37 +0200)
releases/tdc_v2.3/TriggerHandler.vhd

index 84f23c50cce8c332f9bae52216bc2e40d1bf9d64..e125f1b2fc3a8279be826a27544d3185fc0d2798 100644 (file)
@@ -68,6 +68,7 @@ architecture behavioral of TriggerHandler is
   signal valid_timing_200   : std_logic;
   signal valid_notiming_200 : std_logic;
   signal invalid_200        : std_logic;
+  signal trg_type_200       : std_logic_vector(3 downto 0);
   signal valid_trigger_flag : std_logic := '0';
   -- trigger window signals
   type TrgWinCounter_FSM is (IDLE, COUNT, COUNT_CALIBRATION, VALIDATE_TRIGGER, WIN_END,
@@ -185,6 +186,8 @@ trg_pulse_tdc(0) <= valid_timing_200;
       RESET_B_IN  => RESET_TDC,
       PULSE_B_OUT => valid_notiming_200);
 
+  trg_type_200 <= TRG_TYPE_IN when rising_edge(CLK_TDC);
+      
 -------------------------------------------------------------------------------
 -- Trigger Window State Machine
 -------------------------------------------------------------------------------
@@ -208,7 +211,7 @@ trg_pulse_tdc(0) <= valid_timing_200;
   DEBUG_OUT(31 downto 24) <= (others => '0');
 
   FSM_TRIGGER_WINDOW_COMBINATIONAL : process (STATE_TW_CURRENT, trg_in_3r, TRG_WIN_EN_IN,
-                                              valid_notiming_200, TRG_TYPE_IN, trg_win_cnt, valid_timing_200,
+                                              valid_notiming_200, trg_type_200, trg_win_cnt, valid_timing_200,
                                               TRG_WIN_POST_IN, valid_trigger_flag, trg_release_200, invalid_200) is
   begin
     -- Default values
@@ -227,7 +230,7 @@ trg_pulse_tdc(0) <= valid_timing_200;
             STATE_TW_NEXT <= VALIDATE_TRIGGER;
           end if;
         elsif valid_notiming_200 = '1' then
-          if TRG_TYPE_IN = x"D" then
+          if trg_type_200 = x"D" then
             STATE_TW_NEXT <= COUNT_CALIBRATION;
             trg_win_cnt_f <= x"005";
           else