diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/hdllib.cfg b/applications/lofar2/designs/lofar2_unb2b_adc/hdllib.cfg index 6df0316fe12cef1d40a9b83ef1204b0a48990d67..be30d4969ac24b43f1135da17241ad5a8a76c706 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/hdllib.cfg +++ b/applications/lofar2/designs/lofar2_unb2b_adc/hdllib.cfg @@ -1,6 +1,6 @@ hdl_lib_name = lofar2_unb2b_adc hdl_library_clause_name = lofar2_unb2b_adc_lib -hdl_lib_uses_synth = common technology mm unb2b_board dp eth tech_tse tr_10GbE diagnostics diag aduh tech_jesd204b +hdl_lib_uses_synth = common technology mm unb2b_board dp eth tech_tse tr_10GbE diagnostics diag aduh tech_jesd204b st hdl_lib_uses_sim = hdl_lib_technology = ip_arria10_e1sg diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd index 392b5eac21f078d7f3bbb56f04619092bbfe325a..bad3f4c1aa77ef21e5b4867b617b6184bd466b1f 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd @@ -26,7 +26,7 @@ -- Contains all the signal processing blocks to receive and time the ADC input data -- See https://support.astron.nl/confluence/display/STAT/L5+SDPFW+DD%3A+ADC+data+input+and+timestamp -LIBRARY IEEE, common_lib, unb2b_board_lib, technology_lib, diag_lib, aduh_lib, dp_lib, tech_jesd204b_lib; +LIBRARY IEEE, common_lib, unb2b_board_lib, technology_lib, diag_lib, aduh_lib, dp_lib, tech_jesd204b_lib, st_lib; USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; @@ -140,6 +140,11 @@ ARCHITECTURE str OF node_adc_input_and_timing IS CONSTANT c_dp_shiftram_nof_samples: NATURAL := 4096; CONSTANT c_data_w : NATURAL := 16; CONSTANT c_dp_fifo_dc_size : NATURAL := 64; + + -- Histogram + CONSTANT c_st_histogram_in_data_w : NATURAL := 14; + CONSTANT c_st_histogram_nof_bins : NATURAL := 512; + CONSTANT c_st_histogram_str : STRING := "freq.density"; -- QSFP leds @@ -483,6 +488,34 @@ BEGIN in_sosi_arr => st_sosi_arr, in_sync => st_sosi_arr(0).sync ); + + + ----------------------------------------------------------------------------- + -- Histogram + ----------------------------------------------------------------------------- + + u_st_histogram : ENTITY st_lib.st_histogram + GENERIC MAP ( + g_in_data_w => c_st_histogram_in_data_w, -- 14, -- c_data_w, + g_nof_bins => c_st_histogram_nof_bins, -- 512, + g_nof_data => c_lofar2_sample_clk_freq, + g_str => c_st_histogram_str, + g_ram_miso_sim_mode => g_sim -- is the specific output data even allowed when this is TRUE ?? + ) + PORT MAP ( + dp_rst => rx_rst, + dp_clk => rx_clk, + + -- Streaming + snk_in => st_sosi_arr(0), + + -- DP clocked memory bus + sla_in_ram_mosi => c_mem_mosi_rst, -- Beware, works in dp clock domain ! + sla_out_ram_miso => OPEN, -- '' ! + + -- Debug bus + dbg_ram_miso => OPEN -- '' ! + ); ----------------------------------------------------------------------------- @@ -510,4 +543,4 @@ BEGIN ); END GENERATE; -END str; \ No newline at end of file +END str;