Ignore:
Timestamp:
May 2, 2011, 10:11:44 AM (9 years ago)
Author:
neise
Message:
soft & hardware trigger getrennt
File:
1 edited

Legend:

Unmodified
Added
Removed
  • firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl/data_generator.vhd

    r10500 r10502  
    7878        timer_value                             : in    std_logic_vector (31 downto 0); -- time in units of 100us
    7979
    80         trigger                                 : in    std_logic;
     80        hardware_trigger_in             : in    std_logic;
     81        software_trigger_in             : in    std_logic;
    8182       
    8283        adc_data_array                  : in    adc_data_array_type;
     
    142143signal adc_wait_cnt : integer range 0 to 7 := 0;
    143144
    144 signal trigger_sr :std_logic_vector(1 downto 0) := "00";
     145signal hardware_trigger_sr :std_logic_vector(1 downto 0) := "00";
     146signal software_trigger_sr :std_logic_vector(1 downto 0) := "00";
     147
    145148signal ram_write_ea_flag : std_logic := '0';
    146149signal new_config_int : std_logic := '0';
     
    168171                        config_done <= '0';
    169172                end if;
    170                 trigger_sr <= trigger_sr(0) & trigger; --synching in of asynchrounous trigger signal.
     173                hardware_trigger_sr <= hardware_trigger_sr(0) & hardware_trigger_in; --synching in of asynchrounous trigger signal.
     174                software_trigger_sr <= software_trigger_sr(0) & software_trigger_in; --synching in of asynchrounous trigger signal.
    171175                addr_out <= start_addr + conv_std_logic_vector(addr_cntr, RAM_ADDR_WIDTH);
    172176               
     
    223227                        end if;
    224228                       
    225                         if (ram_write_ea = '1' and trigger_sr = "01") then
     229                        if (ram_write_ea = '1' and ( hardware_trigger_sr = "01" or software_trigger_sr = "01") ) then
    226230                                sig_drs_readout_started <= '1'; -- is set to '0' in next state ... just a pulse.
    227231                                runnumber_local_copy <= runnumber;
Note: See TracChangeset for help on using the changeset viewer.