From: Jan Michel Date: Mon, 23 Jan 2017 16:18:18 +0000 (+0100) Subject: A bit of cleanup in registers X-Git-Tag: v2.3~35^2~1 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=27699d0305a41099fb100a2d521f8c4c4c4a2d8c;p=tdc.git A bit of cleanup in registers --- diff --git a/.kateproject b/.kateproject new file mode 100644 index 0000000..56d683f --- /dev/null +++ b/.kateproject @@ -0,0 +1,4 @@ +{ + "name": "TDC" +, "files": [ { "git": 1 } ] +} diff --git a/releases/tdc_v2.3/TDC_record.vhd b/releases/tdc_v2.3/TDC_record.vhd index 2cc1213..ccf3572 100644 --- a/releases/tdc_v2.3/TDC_record.vhd +++ b/releases/tdc_v2.3/TDC_record.vhd @@ -675,8 +675,9 @@ begin status_registers_bus(0)(31 downto 28) <= busreadout_rx.trg_type when rising_edge(CLK_READOUT); -- debug info - status_registers_bus(1)(3 downto 0) <= trg_handler_status_registers(23 downto 20); - status_registers_bus(2) <= trg_time(31 downto 0) when (trg_rdo = '1' and rising_edge(CLK_READOUT)); + status_registers_bus(1)(3 downto 0) <= trg_handler_status_registers(23 downto 20); + status_registers_bus(1)(31 downto 4) <= (others => '0'); + status_registers_bus(2) <= trg_time(31 downto 0) when (trg_rdo = '1' and rising_edge(CLK_READOUT)); -- trigger window status_registers_bus(3)(10 downto 0) <= trg_win_pre; @@ -686,21 +687,21 @@ begin status_registers_bus(3)(31) <= trg_win_en; -- statistics - status_registers_bus(4)(23 downto 0) <= readout_statistics(0); - status_registers_bus(5)(23 downto 0) <= readout_statistics(1); - status_registers_bus(6)(23 downto 0) <= readout_statistics(2); - status_registers_bus(7)(23 downto 0) <= readout_statistics(3); - status_registers_bus(8)(23 downto 0) <= readout_statistics(4); - status_registers_bus(9)(23 downto 0) <= readout_statistics(5); - status_registers_bus(10)(23 downto 0) <= readout_statistics(6); - status_registers_bus(11)(23 downto 0) <= readout_statistics(7); - status_registers_bus(12)(23 downto 0) <= readout_statistics(8); - status_registers_bus(13)(23 downto 0) <= readout_statistics(9); - status_registers_bus(14)(23 downto 0) <= readout_statistics(10); - status_registers_bus(15)(23 downto 0) <= readout_statistics(11); - status_registers_bus(16)(23 downto 0) <= readout_statistics(12); - status_registers_bus(17)(23 downto 0) <= readout_statistics(13); - status_registers_bus(18)(23 downto 0) <= readout_statistics(14); + status_registers_bus(4) <= x"00" & readout_statistics(0); + status_registers_bus(5) <= x"00" & readout_statistics(1); + status_registers_bus(6) <= x"00" & readout_statistics(2); + status_registers_bus(7) <= x"00" & readout_statistics(3); + status_registers_bus(8) <= x"00" & readout_statistics(4); + status_registers_bus(9) <= x"00" & readout_statistics(5); + status_registers_bus(10) <= x"00" & readout_statistics(6); + status_registers_bus(11) <= x"00" & readout_statistics(7); + status_registers_bus(12) <= x"00" & readout_statistics(8); + status_registers_bus(13) <= x"00" & readout_statistics(9); + status_registers_bus(14) <= x"00" & readout_statistics(10); + status_registers_bus(15) <= x"00" & readout_statistics(11); + status_registers_bus(16) <= x"00" & readout_statistics(12); + status_registers_bus(17) <= x"00" & readout_statistics(13); + status_registers_bus(18) <= x"00" & readout_statistics(14); -- Channel debug TheChannelDebugBus : entity work.BusHandler_record