From 7cf3126c81d2345dc389622337604cd328a667dd Mon Sep 17 00:00:00 2001 From: Daniel van der Schuur <schuur@astron.nl> Date: Wed, 13 May 2015 10:14:39 +0000 Subject: [PATCH] -Uncommented front transceiver pins in TCL file; -Set g_use_bg to FALSE in apertif_unb1_correlator.vhd -Passed g_sim to correltor instance. --- .../quartus/apertif_unb1_correlator_pins.tcl | 2 +- .../src/vhdl/apertif_unb1_correlator.vhd | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/apertif/designs/apertif_unb1_correlator/quartus/apertif_unb1_correlator_pins.tcl b/applications/apertif/designs/apertif_unb1_correlator/quartus/apertif_unb1_correlator_pins.tcl index 7c418d6b49..5f0a15f69c 100644 --- a/applications/apertif/designs/apertif_unb1_correlator/quartus/apertif_unb1_correlator_pins.tcl +++ b/applications/apertif/designs/apertif_unb1_correlator/quartus/apertif_unb1_correlator_pins.tcl @@ -23,5 +23,5 @@ source $::env(UNB)/Firmware/designs/unb_common/src/tcl/COMMON_NODE_general_pins. source $::env(UNB)/Firmware/designs/unb_common/src/tcl/COMMON_NODE_other_pins.tcl source $::env(UNB)/Firmware/designs/unb_common/src/tcl/COMMON_NODE_1Gbe_pins.tcl source $::env(UNB)/Firmware/designs/unb_common/src/tcl/COMMON_NODE_sensor_pins.tcl -#source $::env(UNB)/Firmware/designs/unb_common/src/tcl/pins_tr_front_pcs.tcl +source $::env(UNB)/Firmware/designs/unb_common/src/tcl/pins_tr_front_pcs.tcl #source $::env(UNB)/Firmware/designs/unb_common/src/tcl/FRONT_NODE_mesh_nocmu_pins.tcl diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd index 5ad3491187..aa1b574363 100644 --- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd +++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd @@ -62,7 +62,7 @@ USE bf_lib.bf_pkg.ALL; ENTITY apertif_unb1_correlator IS GENERIC ( g_design_name : STRING := "apertif_unb1_correlator"; - g_use_bg : BOOLEAN := TRUE; -- Overridden (TRUE) by TB but still a valid synthesis option; this replaces the 10GbE input stage with block gens. + g_use_bg : BOOLEAN := FALSE; -- Overridden (TRUE) by TB but still a valid synthesis option; this replaces the 10GbE input stage with block gens. g_sim : BOOLEAN := FALSE; -- Overridden by TB g_sim_fast : BOOLEAN := TRUE; -- TRUE = fast accumulator model and no inter-channel delay in the correlator output stream. g_sim_unb_nr : NATURAL := 0; @@ -988,6 +988,7 @@ BEGIN ----------------------------------------------------------------------------- u_correlator : ENTITY correlator_lib.correlator GENERIC MAP ( + g_sim => g_sim, g_nof_input_streams => c_nof_input_streams, g_input_unfold_factor => c_nof_input_folds, g_nof_pre_mult_folds => c_nof_pre_mult_folds, -- GitLab