From: Andreas Neiser Date: Wed, 17 Jun 2015 12:51:01 +0000 (+0200) Subject: Compiles at least X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=27079dae38eb93866a02b07866f22c7c677b71f3;p=trb3.git Compiles at least --- diff --git a/ADC/trb3_periph_adc.prj b/ADC/trb3_periph_adc.prj index 40cb090..d57df2c 100644 --- a/ADC/trb3_periph_adc.prj +++ b/ADC/trb3_periph_adc.prj @@ -193,11 +193,8 @@ 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_ecp3.vhd" + add_file -vhdl -lib "work" "tdc_release/ROM_encoder_3.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" diff --git a/ADC/trb3_periph_adc.vhd b/ADC/trb3_periph_adc.vhd index 87cc009..208efdf 100644 --- a/ADC/trb3_periph_adc.vhd +++ b/ADC/trb3_periph_adc.vhd @@ -583,6 +583,7 @@ 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 )