diff --git a/generic_ip/pulse_generator/1/doc/pulse_generator_1.json b/generic_ip/pulse_generator/1/doc/pulse_generator_1.json index 0c78552..f51624c 100644 --- a/generic_ip/pulse_generator/1/doc/pulse_generator_1.json +++ b/generic_ip/pulse_generator/1/doc/pulse_generator_1.json @@ -50,7 +50,7 @@ "minor_number" : { "type" : "c", "bit_len" : "8", - "reset" : "0x02", + "reset" : "0x03", "description" : "Minor number" }, "major_number" : { diff --git a/generic_ip/pulse_generator/1/src/pulse_generator_1.vhd b/generic_ip/pulse_generator/1/src/pulse_generator_1.vhd index dab7f8a..c759019 100644 --- a/generic_ip/pulse_generator/1/src/pulse_generator_1.vhd +++ b/generic_ip/pulse_generator/1/src/pulse_generator_1.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2016-10-24 --- Last update: 2019-01-17 +-- Last update: 2019-03-22 -- SVN ID : Git -- Standard : VHDL'93 ------------------------------------------------------------------------------- @@ -66,7 +66,7 @@ architecture rtl of pulse_generator_1 is -- constants constant CSR_IP_ID : std_logic_vector(31 downto 0) := x"0000FF13"; - constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000102"; + constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000103"; signal init_de, init_qd, enable, loc_pd, pd_queue_error : std_logic; diff --git a/generic_ip/pulse_generator/1/src/queue_and_delay_1.vhd b/generic_ip/pulse_generator/1/src/queue_and_delay_1.vhd index b50c17c..a160bcd 100644 --- a/generic_ip/pulse_generator/1/src/queue_and_delay_1.vhd +++ b/generic_ip/pulse_generator/1/src/queue_and_delay_1.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2016-05-28 --- Last update: 2018-06-28 +-- Last update: 2019-03-22 -- SVN ID : Git -- Standard : VHDL'93 ------------------------------------------------------------------------------- @@ -118,7 +118,13 @@ begin -- RTL -- Time reference: either use the external one or generate it locally gTIME_REF0: if use_ext_time = true generate - local_time <= ext_time; + + pLATCH_LOCTIME : process(clk) + begin + if(clk = '1' and clk'event) then + local_time <= ext_time; + end if; + end process pLATCH_LOCTIME; shf_enable <= '1' when local_time /= local_time_d else '0';