From fe4c6e309d5e2214508c5b9c41284b5c9906eaa8 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Thu, 15 Dec 2022 16:54:27 +0100 Subject: [PATCH] swap order of trigger outputs to match Trb3sc --- gbe_standalone/trb5sc_gbe_template.vhd | 5 +++-- tdc16clk/trb5sc_mdctdc.vhd | 5 +++-- template/trb5sc_template.vhd | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gbe_standalone/trb5sc_gbe_template.vhd b/gbe_standalone/trb5sc_gbe_template.vhd index 5b1be2d..75a0c60 100644 --- a/gbe_standalone/trb5sc_gbe_template.vhd +++ b/gbe_standalone/trb5sc_gbe_template.vhd @@ -368,8 +368,9 @@ begin --Trigger & Monitor MONITOR_INPUTS => (others => '0'), TRIG_GEN_INPUTS => (others => '0'), - TRIG_GEN_OUTPUTS(1 downto 0) => BACK_GPIO(3 downto 2), - TRIG_GEN_OUTPUTS(3 downto 2) => SPARE(1 downto 0), + TRIG_GEN_OUTPUTS(3 downto 2) => BACK_GPIO(3 downto 2), + TRIG_GEN_OUTPUTS(1 downto 0) => SPARE(1 downto 0), + --SED SED_ERROR_OUT => sed_error_i, --Slowcontrol diff --git a/tdc16clk/trb5sc_mdctdc.vhd b/tdc16clk/trb5sc_mdctdc.vhd index 78797b2..5cc5e88 100644 --- a/tdc16clk/trb5sc_mdctdc.vhd +++ b/tdc16clk/trb5sc_mdctdc.vhd @@ -328,8 +328,9 @@ trigger_in_i <= (TRIG_IN_BACKPL and IN_SELECT_EXT_CLOCK) or (TRIG_IN_RJ45 and no --Trigger & Monitor MONITOR_INPUTS => monitor_inputs_i, TRIG_GEN_INPUTS => trigger_inputs_i, - TRIG_GEN_OUTPUTS(1 downto 0) => BACK_GPIO(3 downto 2), - TRIG_GEN_OUTPUTS(3 downto 2) => SPARE(1 downto 0), + TRIG_GEN_OUTPUTS(3 downto 2) => BACK_GPIO(3 downto 2), + TRIG_GEN_OUTPUTS(1 downto 0) => SPARE(1 downto 0), + --SED SED_ERROR_OUT => sed_error_i, --Slowcontrol diff --git a/template/trb5sc_template.vhd b/template/trb5sc_template.vhd index 8b3ad17..62a70d7 100644 --- a/template/trb5sc_template.vhd +++ b/template/trb5sc_template.vhd @@ -340,8 +340,8 @@ THE_CAL_PLL : entity work.pll_in125_out50 --Trigger & Monitor MONITOR_INPUTS => monitor_inputs_i, TRIG_GEN_INPUTS => trigger_inputs_i, - TRIG_GEN_OUTPUTS(1 downto 0) => BACK_GPIO(3 downto 2), - TRIG_GEN_OUTPUTS(3 downto 2) => SPARE(1 downto 0), + TRIG_GEN_OUTPUTS(3 downto 2) => BACK_GPIO(3 downto 2), + TRIG_GEN_OUTPUTS(1 downto 0) => SPARE(1 downto 0), --SED SED_ERROR_OUT => sed_error_i, --Slowcontrol -- 2.43.0