Merge branch 'L2SDP-375' into 'master'

Resolve L2SDP-375

Closes L2SDP-375

See merge request desp/hdl!112

applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml

@@ -28,20 +28,19 @@ parameters:
   - { name: c_W_sub_weight,         value: 16 }
   - { name: c_W_bf_weight,          value: 16 }
   - { name: c_W_beamlet_scale,      value: 16 }
-  - { name: c_W_beamlet_resolution, value: 0 - 15 }  # EK: FIXME support passing on negative values, workaround use 0 - positive
+  - { name: c_W_beamlet_resolution, value: 0 - 15 }  # EK: FIXME: support passing on negative values, workaround use 0 - positive
   - { name: c_W_beamlet,            value: 8 }
   - { name: c_nof_clk_per_pps,      value: c_f_adc_MHz * 10**6 }  # = 200000000
-  - { name: c_nof_block_per_sync,   value: 195313 }  # TBD temporarily use 390625 = 2 * 195312, to have integer number of blocks in 2 s sync interval, TODO: remove when REG_BSN_SOURCE_V2 is used
 
 peripherals:
   #############################################################################
   # Factory / minimal (see ctrl_unb2b_board.vhd)
   #############################################################################
   - peripheral_name: unb2b_board/system_info
+    lock_base_address: 0x10000
     mm_port_names:
       - ROM_SYSTEM_INFO
       - PIO_SYSTEM_INFO
-    lock_base_address: 0x10000
 
   - peripheral_name: unb2b_board/wdi
     mm_port_names:
@@ -165,9 +164,12 @@ peripherals:
       
   - peripheral_name: filter/fil_ppf_w
     parameter_overrides:
-      - { name: g_nof_taps, value: c_N_taps }
-      - { name: g_nof_bands, value: c_N_fft }
-      - { name: g_coef_dat_w, value: c_W_fir_coef }
+      - { name: g_fil_ppf.wb_factor, value: 1 } # process at sample rate (so no parallel wideband factor)
+      - { name: g_fil_ppf.nof_chan, value: 0 } # process at sample rate (so no serial time multiplexing)
+      - { name: g_fil_ppf.nof_bands, value: c_N_fft }
+      - { name: g_fil_ppf.nof_taps, value: c_N_taps }
+      - { name: g_fil_ppf.nof_streams, value: 1 }
+      - { name: g_fil_ppf.coef_dat_w, value: c_W_fir_coef }
     mm_port_names:
       - RAM_FIL_COEFS
       
@@ -223,7 +225,7 @@ peripherals:
       - REG_SDP_INFO
       
   - peripheral_name: reorder/reorder_col_wide
-    number_of_peripherals: c_N_beamsets  # lofar2_unb2b_sdp_station.vhd
+    number_of_peripherals: c_N_beamsets
     parameter_overrides:
       - { name: g_wb_factor, value: c_P_pfb }
       - { name: g_nof_ch_in, value: c_N_sub * c_Q_fft }
@@ -232,7 +234,7 @@ peripherals:
       - RAM_SS_SS_WIDE
 
   - peripheral_name: sdp/sdp_bf_weights
-    number_of_peripherals: c_N_beamsets  # lofar2_unb2b_sdp_station.vhd
+    number_of_peripherals: c_N_beamsets
     parameter_overrides:
       - { name: g_nof_instances, value: c_N_pol_bf * c_A_pn }  # A_pn = P_pfb = 6
       - { name: g_nof_gains, value: c_N_pol * c_S_sub_bf }  # N_pol = Q_fft = 2
@@ -240,7 +242,7 @@ peripherals:
       - RAM_BF_WEIGHTS
 
   - peripheral_name: sdp/sdp_bf_scale
-    number_of_peripherals: c_N_beamsets  # lofar2_unb2b_sdp_station.vhd
+    number_of_peripherals: c_N_beamsets
     parameter_overrides:
       - { name: g_gain_w, value: c_W_beamlet_scale }
       - { name: g_lsb_w, value: 0 - c_W_beamlet_resolution}
@@ -248,12 +250,12 @@ peripherals:
       - REG_BF_SCALE
 
   - peripheral_name: sdp/sdp_beamformer_output_hdr_dat
-    number_of_peripherals: c_N_beamsets  # lofar2_unb2b_sdp_station.vhd
+    number_of_peripherals: c_N_beamsets
     mm_port_names:
       - REG_HDR_DAT
 
   - peripheral_name: dp/dp_xonoff
-    number_of_peripherals: c_N_beamsets  # lofar2_unb2b_sdp_station.vhd
+    number_of_peripherals: c_N_beamsets
     parameter_overrides:
       - { name: g_nof_streams, value: 1 }
       - { name: g_combine_streams, value: False }