*** empty log message ***

diff --git a/special/handler_lvl1.vhd b/special/handler_lvl1.vhd
index 08f518c4141d8bfb0373b6b8eb9bd49c1b1113e3..27a51c65e2430f0f76dceee2b531bfe75a55db82 100644 (file)
--- a/special/handler_lvl1.vhd
+++ b/special/handler_lvl1.vhd
@@ -392,7 +392,7 @@ begin
                                next_toc_save    <= '1';
                                next_toc_rst     <= '1';
                                --next_trg_rst     <= '1';  -- gk 21.09.10
-                               next_invalid_trg <= '1';
+                               --next_invalid_trg <= '1';
 ----------------------------
                        else
                                -- wait for either timeout or LVL1
@@ -490,7 +490,13 @@ end process COUNT_EDGES_AND_LENGTH_PROC;
 ---------------------------------------------------------------------------
 -- Error bits
 ---------------------------------------------------------------------------
-next_error_pattern(31 downto 19) <= LVL1_ERROR_PATTERN_IN(31 downto 19);
+next_error_pattern(31 downto 19) <= LVL1_ERROR_PATTERN_IN(31 downto 26);
+
+next_error_pattern(25)           <= LVL1_ERROR_PATTERN_IN(25) or timeout_found; -- timeout
+next_error_pattern(24)           <= LVL1_ERROR_PATTERN_IN(24) or short_tmg_trg; -- spike detected
+
+next_error_pattern(23 downto 19  <= LVL1_ERROR_PATTERN_IN(23 downto 19);
+
 next_error_pattern(18)           <= LVL1_ERROR_PATTERN_IN(18) or mult_trg_found; -- multiple timing triggers
 next_error_pattern(17)           <= LVL1_ERROR_PATTERN_IN(17) or invalid_trg;    -- timing trigger missing
 next_error_pattern(16)           <= LVL1_ERROR_PATTERN_IN(16) or (not trg_num_match);  -- trigger counter mismatch