From efd0633b58d47b7772a2ac5bd4dcbf57c6f73570 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 1 May 2015 10:02:03 +0000 Subject: [PATCH] - reduced debug output git-svn-id: http://moon:8086/svn/matlab/trunk@48 801c6759-fa7c-4059-a304-17956f83a07c --- ofdm/calcWiener.m | 18 ++++++++---------- ofdm/ofdm_rx.m | 5 ++--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ofdm/calcWiener.m b/ofdm/calcWiener.m index 0067c3f..ff5e49c 100644 --- a/ofdm/calcWiener.m +++ b/ofdm/calcWiener.m @@ -2,23 +2,22 @@ function W_syms = calcWiener(drm_mode, drm_bw) % calcWiener('B', '10k'); [params, spec_occ] = drm_params(drm_mode, drm_bw); -N = params.nu sigm = 10^(-14/10); - Ns = (params.nu+params.ng); Nu = (params.nu); Ng = (params.ng); +N = Nu; -frames_per_window = 2*params.y -window_delay = params.y -num_symbols_per_frame = params.nspf -num_carrier_per_symbol = spec_occ.kmax - spec_occ.kmin -num_symbols_per_frame = num_symbols_per_frame * num_carrier_per_symbol +frames_per_window = 2*params.y; +window_delay = params.y; +num_symbols_per_frame = params.nspf; +num_carrier_per_symbol = spec_occ.kmax - spec_occ.kmin; +num_symbols_per_frame = num_symbols_per_frame * num_carrier_per_symbol; % PHI = auto-covariance-matrix -f_cut_t = 0.0675*1/params.y % two-sided maximum doppler frequency (normalized w.r.t symbol duration Ts) -f_cut_k = 1.75*Ng/Nu % two-sided maximum echo delay (normalized w.r.t useful symbol duration Tu) +f_cut_t = 0.0675*1/params.y; % two-sided maximum doppler frequency (normalized w.r.t symbol duration Ts) +f_cut_k = 1.75*Ng/Nu; % two-sided maximum echo delay (normalized w.r.t useful symbol duration Tu) f_D_max = f_cut_t*12000/Ns/2 tau_max = f_cut_k*Nu/12000/2 @@ -59,4 +58,3 @@ for d=0:window_delay-1 W_syms{d+1}(:, k1) = transpose( THETA*PHI_inv ); end end -W_syms \ No newline at end of file diff --git a/ofdm/ofdm_rx.m b/ofdm/ofdm_rx.m index 0214264..bd77fb2 100644 --- a/ofdm/ofdm_rx.m +++ b/ofdm/ofdm_rx.m @@ -194,7 +194,7 @@ for n=0:15-1 end end end -frame_start = n_max; +frame_start = n_max figure; start = skip_syms+frame_start; @@ -211,7 +211,6 @@ W = calcWiener(drm_mode, drm_bw); figure; % Detect scattered gain pilots -start = skip_syms+frame_start symbol_counter = 0; win_count = 0; H = []; @@ -221,7 +220,7 @@ kk = 1; symbols_per_frame = ofdm_drm_params.nspf; symbols_to_delay = ofdm_drm_params.y; -frames_per_window = 2*ofdm_drm_params.y +frames_per_window = 2*ofdm_drm_params.y; H_gain_cell = cell (frames_per_window, 1); H_gain_carriers_cell = cell (frames_per_window, 1); H_raw = zeros(length(ofdm_spec_occ.kmin:ofdm_spec_occ.kmax),1);