Skip to content
Snippets Groups Projects
Commit e031b69b authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Merge branch 'master' into L2SDP-608

parents 85cb6418 4d54653d
Branches
No related tags found
1 merge request!214Added g_lost_input, to verify BSN input monitor timeout and verify that output...
Pipeline #25952 passed
...@@ -310,8 +310,9 @@ BEGIN ...@@ -310,8 +310,9 @@ BEGIN
udp_src_port => stat_udp_src_port, udp_src_port => stat_udp_src_port,
ip_src_addr => stat_ip_src_addr, ip_src_addr => stat_ip_src_addr,
gn_index => TO_UINT(gn_id),
sdp_info => sdp_info, sdp_info => sdp_info,
gn_index => TO_UINT(gn_id) weighted_subbands_flag => '1' -- because BF uses in_sosi_arr = fsub_sosi_arr, so weighted subbands
); );
--------------------------------------------------------------- ---------------------------------------------------------------
......
...@@ -468,6 +468,7 @@ BEGIN ...@@ -468,6 +468,7 @@ BEGIN
gn_index => TO_UINT(gn_id), gn_index => TO_UINT(gn_id),
ring_info => ring_info, ring_info => ring_info,
sdp_info => sdp_info, sdp_info => sdp_info,
weighted_subbands_flag => '1', -- because XSub uses in_sosi_arr = fsub_sosi_arr, so weighted subbands
nof_crosslets => nof_crosslets, nof_crosslets => nof_crosslets,
crosslets_info => crosslets_info crosslets_info => crosslets_info
); );
......
...@@ -403,8 +403,8 @@ ARCHITECTURE str OF sdp_station IS ...@@ -403,8 +403,8 @@ ARCHITECTURE str OF sdp_station IS
---------------------------------------------- ----------------------------------------------
SIGNAL ait_sosi_arr : t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0); SIGNAL ait_sosi_arr : t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0);
SIGNAL pfb_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0); SIGNAL pfb_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0); -- raw subbands
SIGNAL fsub_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0); SIGNAL fsub_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0); -- weighted subbands
SIGNAL bs_sosi : t_dp_sosi; SIGNAL bs_sosi : t_dp_sosi;
SIGNAL xst_from_ri_sosi : t_dp_sosi; SIGNAL xst_from_ri_sosi : t_dp_sosi;
......
...@@ -835,6 +835,8 @@ Works from home in VPN: ...@@ -835,6 +835,8 @@ Works from home in VPN:
* LTS --> http://test-lcu2.astron.nl:8888/notebooks/ # = dop81 * LTS --> http://test-lcu2.astron.nl:8888/notebooks/ # = dop81
* DTS --> http://dts-lcu.astron.nl:8888/notebooks/ * DTS --> http://dts-lcu.astron.nl:8888/notebooks/
Check of SDPTR op dop369 actief is met:
> uals -u 10.87.2.36:4840 -p "0:Objects"
******************************************************************************* *******************************************************************************
* Zenodo DOI * Zenodo DOI
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment