jens/matlab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- reduced debug output

Browse Source 
git-svn-id: http://moon:8086/svn/matlab/trunk@48 801c6759-fa7c-4059-a304-17956f83a07c
This commit is contained in:
jens
2015-05-01 10:02:03 +00:00
parent 248acd843e
commit efd0633b58
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ofdm/calcWiener.m
+8 -10
View File
@@ -2,23 +2,22 @@ function W_syms = calcWiener(drm_mode, drm_bw)
% calcWiener('B', '10k'); % calcWiener('B', '10k');
[params, spec_occ] = drm_params(drm_mode, drm_bw); [params, spec_occ] = drm_params(drm_mode, drm_bw);
N = params.nu
sigm = 10^(-14/10); sigm = 10^(-14/10);
Ns = (params.nu+params.ng); Ns = (params.nu+params.ng);
Nu = (params.nu); Nu = (params.nu);
Ng = (params.ng); Ng = (params.ng);
N = Nu;
frames_per_window = 2*params.y frames_per_window = 2*params.y;
window_delay = params.y window_delay = params.y;
num_symbols_per_frame = params.nspf num_symbols_per_frame = params.nspf;
num_carrier_per_symbol = spec_occ.kmax - spec_occ.kmin num_carrier_per_symbol = spec_occ.kmax - spec_occ.kmin;
num_symbols_per_frame = num_symbols_per_frame * num_carrier_per_symbol num_symbols_per_frame = num_symbols_per_frame * num_carrier_per_symbol;
% PHI = auto-covariance-matrix % 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_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_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 f_D_max = f_cut_t*12000/Ns/2
tau_max = f_cut_k*Nu/12000/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 ); W_syms{d+1}(:, k1) = transpose( THETA*PHI_inv );
end end
end end
W_syms
ofdm/ofdm_rx.m
+2 -3
View File
@@ -194,7 +194,7 @@ for n=0:15-1
end end
end end
end end
frame_start = n_max; frame_start = n_max
figure; figure;
start = skip_syms+frame_start; start = skip_syms+frame_start;
@@ -211,7 +211,6 @@ W = calcWiener(drm_mode, drm_bw);
figure; figure;
% Detect scattered gain pilots % Detect scattered gain pilots
start = skip_syms+frame_start
symbol_counter = 0; symbol_counter = 0;
win_count = 0; win_count = 0;
H = []; H = [];
@@ -221,7 +220,7 @@ kk = 1;
symbols_per_frame = ofdm_drm_params.nspf; symbols_per_frame = ofdm_drm_params.nspf;
symbols_to_delay = ofdm_drm_params.y; 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_cell = cell (frames_per_window, 1);
H_gain_carriers_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); H_raw = zeros(length(ofdm_spec_occ.kmin:ofdm_spec_occ.kmax),1);