From e8b3a04183e777b3c45adc02bdc762e89e58bfb7 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Thu, 16 Aug 2018 13:21:31 +0200 Subject: [PATCH] Change stretcher output to left side, increase length for ECP5, make calibration event longer. --- releases/tdc_v2.3/Stretcher.vhd | 2 +- releases/tdc_v2.3/TDC_record.vhd | 2 +- releases/tdc_v2.3/TriggerHandler.vhd | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/releases/tdc_v2.3/Stretcher.vhd b/releases/tdc_v2.3/Stretcher.vhd index 11bdca5..104bf4c 100644 --- a/releases/tdc_v2.3/Stretcher.vhd +++ b/releases/tdc_v2.3/Stretcher.vhd @@ -40,7 +40,7 @@ begin -- behavioral pulse_a_in(DEPTH*i) <= PULSE_IN(i-1); pulse_a_in(DEPTH*i-1 downto DEPTH*(i-1)+1) <= pulse_b_out(DEPTH*i-1 downto DEPTH*(i-1)+1); pulse_b_in(DEPTH*i-1 downto DEPTH*(i-1)+1) <= pulse_a_out(DEPTH*i-1 downto DEPTH*(i-1)+1); - PULSE_OUT(i-1) <= transport not pulse_a_out(DEPTH*(i-1)) after 42.186 ns; + PULSE_OUT(i-1) <= transport pulse_b_out(DEPTH*(i-1)+1) after 42.186 ns; end generate GEN; Stretcher_A_1 : entity work.Stretcher_A diff --git a/releases/tdc_v2.3/TDC_record.vhd b/releases/tdc_v2.3/TDC_record.vhd index 11a8e02..11a0091 100644 --- a/releases/tdc_v2.3/TDC_record.vhd +++ b/releases/tdc_v2.3/TDC_record.vhd @@ -304,7 +304,7 @@ begin The_Stretcher : entity work.Stretcher generic map ( CHANNEL => CHANNEL_NUMBER-1, - DEPTH => 4) + DEPTH => 4+(FPGA_TYPE/4)) --4 for ECP3, 5 for ECP5 port map ( PULSE_IN => edge_falling(CHANNEL_NUMBER-1 downto 1), PULSE_OUT => edge_falling_d(CHANNEL_NUMBER-1 downto 1)); diff --git a/releases/tdc_v2.3/TriggerHandler.vhd b/releases/tdc_v2.3/TriggerHandler.vhd index 7c168c4..84f23c5 100644 --- a/releases/tdc_v2.3/TriggerHandler.vhd +++ b/releases/tdc_v2.3/TriggerHandler.vhd @@ -229,6 +229,7 @@ trg_pulse_tdc(0) <= valid_timing_200; elsif valid_notiming_200 = '1' then if TRG_TYPE_IN = x"D" then STATE_TW_NEXT <= COUNT_CALIBRATION; + trg_win_cnt_f <= x"005"; else STATE_TW_NEXT <= WAIT_NEXT_TRIGGER; end if; -- 2.43.0