]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
Revert "Compiles at least"
authorAndreas Neiser <neiser@kph.uni-mainz.de>
Wed, 17 Jun 2015 16:03:41 +0000 (18:03 +0200)
committerAndreas Neiser <neiser@kph.uni-mainz.de>
Wed, 17 Jun 2015 16:03:41 +0000 (18:03 +0200)
This reverts commit 27079dae38eb93866a02b07866f22c7c677b71f3.

ADC/trb3_periph_adc.prj
ADC/trb3_periph_adc.vhd

index d57df2cfef6757c673cc7646492e88624df63abc..40cb090e470f53be8dd27752dabef882fb4fd797 100644 (file)
@@ -193,8 +193,11 @@ if {$INCLUDE_TDC == 1} {
    add_file -vhdl -lib "work" "tdc_release/LogicAnalyser.vhd"
    add_file -vhdl -lib "work" "tdc_release/Readout.vhd"
    add_file -vhdl -lib "work" "tdc_release/risingEdgeDetect.vhd"
-   add_file -vhdl -lib "work" "tdc_release/ROM_encoder_3.vhd"
+   add_file -vhdl -lib "work" "tdc_release/ROM_encoder_ecp3.vhd"
    add_file -vhdl -lib "work" "tdc_release/ShiftRegisterSISO.vhd"
+   add_file -vhdl -lib "work" "tdc_release/Stretcher_A.vhd"
+   add_file -vhdl -lib "work" "tdc_release/Stretcher_B.vhd"
+   add_file -vhdl -lib "work" "tdc_release/Stretcher.vhd"
    add_file -vhdl -lib "work" "tdc_release/TDC.vhd"
    add_file -vhdl -lib "work" "tdc_release/TriggerHandler.vhd"
    add_file -vhdl -lib "work" "tdc_release/up_counter.vhd"
index 208efdff4ef293d4450c456ec11959e874705e9e..87cc00921d1eddb086feffefc79ff1250ff33a5b 100644 (file)
@@ -583,7 +583,6 @@ LED_YELLOW <= not med_stat_op(11);
       generic map (
         CHANNEL_NUMBER => TDC_CHANNEL_NUMBER,     -- Number of TDC channels
         STATUS_REG_NR  => 21,           -- Number of status regs
-        TDC_VERSION => TDC_VERSION,
         CONTROL_REG_NR => TDC_CONTROL_REG_NR,  -- Number of control regs - higher than 8 check tdc_ctrl_addr
         DEBUG          => c_NO
         )