add default monitoring regs to beam monitoring

diff --git a/spillmonitor/config.vhd b/spillmonitor/config.vhd
index 2d592756ec1789a98c9efb4b540d776a7fc027f6..54d55788efc467b34f6c85dbdb2bec35bde33d7b 100644 (file)
--- 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 5823b31a48759d6c626637312e86ac133ca461cc..c17441060049771a3e40028785434e42efc7c405 100644 (file)
--- 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 3d466829a65f2a6c14f0b40b8dad666685f92595..fcba96073a6e8a1be3f90861a8d65c82f05ed019 100644 (file)
--- 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