From: Jan Michel Date: Fri, 22 Dec 2023 09:58:52 +0000 (+0100) Subject: add default monitoring regs to beam monitoring X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=61ac4bef0bc1a53418c1bf78521666a32d33cfd9;p=trb3sc.git add default monitoring regs to beam monitoring --- diff --git a/spillmonitor/config.vhd b/spillmonitor/config.vhd index 2d59275..54d5578 100644 --- a/spillmonitor/config.vhd +++ b/spillmonitor/config.vhd @@ -33,10 +33,10 @@ package config is --input monitor and trigger generation logic constant INCLUDE_TRIGGER_LOGIC : integer := c_NO; - constant INCLUDE_STATISTICS : integer := c_NO; - constant TRIG_GEN_INPUT_NUM : integer := 32; + constant INCLUDE_STATISTICS : integer := c_YES; + constant TRIG_GEN_INPUT_NUM : integer := 16; constant TRIG_GEN_OUTPUT_NUM : integer := 4; - constant MONITOR_INPUT_NUM : integer := 36; + constant MONITOR_INPUT_NUM : integer := 16; constant USE_GBE : integer := c_YES; diff --git a/spillmonitor/trb3sc_spillmonitor.prj b/spillmonitor/trb3sc_spillmonitor.prj index 5823b31..c174410 100644 --- a/spillmonitor/trb3sc_spillmonitor.prj +++ b/spillmonitor/trb3sc_spillmonitor.prj @@ -45,6 +45,7 @@ project -result_file "workdir/trb3sc_spillmonitor.edf" #implementation attributes set_option -vlog_std v2001 +set_option -vhdl2008 1 set_option -project_relative_includes 1 impl -active "workdir" diff --git a/spillmonitor/trb3sc_spillmonitor.vhd b/spillmonitor/trb3sc_spillmonitor.vhd index 3d46682..fcba960 100644 --- a/spillmonitor/trb3sc_spillmonitor.vhd +++ b/spillmonitor/trb3sc_spillmonitor.vhd @@ -419,7 +419,7 @@ THE_CLOCK_RESET : entity work.clock_reset_handler ADC_MISO => ADC_DOUT, ADC_CLK => ADC_CLK, --Trigger & Monitor - MONITOR_INPUTS => open, --KEL(32 downto 1),--(others => '0'), + MONITOR_INPUTS => INP(15 downto 0), --KEL(32 downto 1),--(others => '0'), TRIG_GEN_INPUTS => open, --KEL(32 downto 1),--(others => '0'), TRIG_GEN_OUTPUTS => open, --X(8 downto 5),--open, --SED