Changeset 10418 for firmware/FTM/trigger

Timestamp:

04/20/11 12:37:39 (14 years ago)

Author:

weitzel

Message:

New FTM firmare: dna, fad_broadcast, FTU error messages, rates readout

File:

• firmware/FTM/trigger/kernel/trigger_generator/trigger_generator.vhd (modified) (2 diffs)

firmware/FTM/trigger/kernel/trigger_generator/trigger_generator.vhd

@@ -13 +13 @@
 -- 14/03/2011 JGi                           110314a     Description
 -- 13/04/2011 JGi                           110413a     Update trigger enable management
+-- 15/04/2011 JGi                           110415a     Update LP1 "N-out-of-40" logic detection
+--                                                                                                                                                                      in order to allow user to reset it by
+--                                                                                                                                                                      disabling LP1 pulse as trigger source if the
+--                                                                                                                                                                      N is never reached and system is locked
 --=======================================================================================
 -- Library Definition
@@ -332 +336 @@
                 general_settings(4) = '1' then
                         v_reg.wait_for_calib    := '1';
-                elsif i_reg.enable_trigger      = '0' then
+                -- If trigger is processed or disabled by user, reset detection logic to avoid
+                -- remaining in locked state
+                elsif i_reg.enable_trigger      = '0' or general_settings(4) = '0' then
                         v_reg.wait_for_calib    := '0';
                 end if;