Commit f2f0cb25 authored by Adrian Weber's avatar Adrian Weber
Browse files

fix of crashung readout in case of triggers not together with in the DLM...

fix of crashung readout in case of triggers not together with in the DLM (CALIBRATION; seen while no DLM transmitted.). Now in case of 0xD trigger, the last DLM message is written to CTS and the readout is finished.
parent d222109a
...@@ -29,6 +29,7 @@ entity DLM_CTS_generator is ...@@ -29,6 +29,7 @@ entity DLM_CTS_generator is
--data output for read-out --data output for read-out
TRIGGER_IN : in std_logic; TRIGGER_IN : in std_logic;
TRIGGER_TYPE : in std_logic_vector( 3 downto 0) := x"1";
-- Data connection to Streamer -- Data connection to Streamer
DATA_OUT : out std_logic_vector(31 downto 0); DATA_OUT : out std_logic_vector(31 downto 0);
...@@ -162,10 +163,14 @@ begin ...@@ -162,10 +163,14 @@ begin
case rdostate is case rdostate is
when RDO_IDLE => when RDO_IDLE =>
if TRIGGER_IN = '1' and config_rdo_disable_i = '0' then if TRIGGER_IN = '1' and config_rdo_disable_i = '0' then
if dlm_ready = '0' then if TRIGGER_TYPE = x"D" then -- calibration trigger. Trigger is not initialised by DLM
rdostate <= RDO_WAIT;
else
rdostate <= RDO_WRITE; rdostate <= RDO_WRITE;
else
if dlm_ready = '0' then
rdostate <= RDO_WAIT;
else
rdostate <= RDO_WRITE;
end if;
end if; end if;
end if; end if;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment