From: Andreas Neiser Date: Wed, 26 Feb 2014 11:59:52 +0000 (+0100) Subject: Compiles with v1.5.1, but totally untested any further X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=be1e74087679f5f0078fdae60384f2a045f80cb2;p=trb3.git Compiles with v1.5.1, but totally untested any further --- diff --git a/cts/tdc_release b/cts/tdc_release index 6605030..1ed173f 120000 --- a/cts/tdc_release +++ b/cts/tdc_release @@ -1 +1 @@ -../tdc_releases/tdc_v1.5 \ No newline at end of file +../tdc_releases/tdc_v1.5.1 \ No newline at end of file diff --git a/cts/trb3_central.prj b/cts/trb3_central.prj index 598df2c..e8ab136 100644 --- a/cts/trb3_central.prj +++ b/cts/trb3_central.prj @@ -258,8 +258,8 @@ add_file -vhdl -lib work "source/cts.vhd" #add_file -vhdl -lib "work" "tdc_release/Adder_304.vhd" add_file -vhdl -lib "work" "tdc_release/bit_sync.vhd" add_file -vhdl -lib "work" "tdc_release/BusHandler.vhd" -add_file -vhdl -lib "work" "tdc_release/Channel.vhd" add_file -vhdl -lib "work" "tdc_release/Channel_200.vhd" +add_file -vhdl -lib "work" "tdc_release/Channel.vhd" add_file -vhdl -lib "work" "tdc_release/Encoder_304_Bit.vhd" #add_file -vhdl -lib "work" "tdc_release/FIFO_32x32_OutReg.vhd" add_file -vhdl -lib "work" "tdc_release/LogicAnalyser.vhd" diff --git a/cts/trb3_central.vhd b/cts/trb3_central.vhd index 99eeb5e..f9b1eb0 100755 --- a/cts/trb3_central.vhd +++ b/cts/trb3_central.vhd @@ -1283,7 +1283,7 @@ gen_TDC : if INCLUDE_TDC = c_YES generate generic map ( CHANNEL_NUMBER => 5, -- Number of TDC channels CONTROL_REG_NR => 5, - TDC_VERSION => "001" & x"51") -- TDC version number + TDC_VERSION => "0001" & x"51") -- TDC version number port map ( RESET => reset_i, CLK_TDC => CLK_PCLK_RIGHT, -- Clock used for the time measurement