From dbcb5fe3d01e5bafe02acaf26c67971e216dadf0 Mon Sep 17 00:00:00 2001 From: Cahit Date: Mon, 31 Mar 2014 12:09:58 +0200 Subject: [PATCH] Hit multiplexer is put in an entity for easier placement constraints. Epoch counter update logic in channel is changed for easier timing constraints. --- wasa/trb3_periph_padiwa.prj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wasa/trb3_periph_padiwa.prj b/wasa/trb3_periph_padiwa.prj index 054e1b4..acd1db0 100644 --- a/wasa/trb3_periph_padiwa.prj +++ b/wasa/trb3_periph_padiwa.prj @@ -155,7 +155,7 @@ add_file -vhdl -lib "work" "currentRelease/Channel_200.vhd" add_file -vhdl -lib "work" "currentRelease/Encoder_304_Bit.vhd" add_file -vhdl -lib "work" "currentRelease/LogicAnalyser.vhd" add_file -vhdl -lib "work" "currentRelease/Readout.vhd" -add_file -vhdl -lib "work" "currentRelease/ROM4_Encoder.vhd" +#add_file -vhdl -lib "work" "currentRelease/ROM4_Encoder.vhd" add_file -vhdl -lib "work" "currentRelease/ROM_encoder_3.vhd" add_file -vhdl -lib "work" "currentRelease/ShiftRegisterSISO.vhd" add_file -vhdl -lib "work" "currentRelease/TDC.vhd" @@ -163,11 +163,12 @@ add_file -vhdl -lib "work" "currentRelease/TriggerHandler.vhd" add_file -vhdl -lib "work" "currentRelease/up_counter.vhd" add_file -vhdl -lib "work" "currentRelease/fallingEdgeDetect.vhd" add_file -vhdl -lib "work" "currentRelease/risingEdgeDetect.vhd" -add_file -vhdl -lib "work" "currentRelease/hit_inv.vhd" +add_file -vhdl -lib "work" "currentRelease/hit_mux.vhd" add_file -vhdl -lib "work" "../base/cores/FIFO_36x128_OutReg.vhd" add_file -vhdl -lib "work" "../base/cores/FIFO_DC_36x128_OutReg.vhd" add_file -vhdl -lib "work" "../base/code/input_to_trigger_logic.vhd" + add_file -vhdl -lib "work" "trb3_periph_padiwa.vhd" -- 2.43.0