- removed fs from fdet_coarse

- fdet_eval and fdet_wav use fdet
- ofdm_tx has additional parameter withData

git-svn-id: http://moon:8086/svn/matlab/trunk@20 801c6759-fa7c-4059-a304-17956f83a07c
This commit is contained in:
2015-04-05 09:02:10 +00:00
parent e0bb654e70
commit 7e89f89dd5
3 changed files with 20 additions and 35 deletions
+4 -4
View File
@@ -1,5 +1,5 @@
% function ofdm_tx(N_frames)
function [yv xv] = ofdm_tx(N_frames)
function [yv xv] = ofdm_tx(N_frames, withData)
close all;
@@ -7,7 +7,7 @@ WITH_RCWIN = 1;
WITH_FREQ_REF = 1;
WITH_TIME_REF = 0;
WITH_GAIN_REF = 0;
WITH_DATA = 0;
WITH_DATA = withData;
M_QAM = 4;
RCWIN_ROLLOFF = 0.1;
@@ -90,7 +90,7 @@ ofdm_params_drm(DRM_MODE_D) = struct('mode', 'MODE_D', 'nu', 112, 'ng', 88, 'nsp
ofdm_params_drm(DRM_MODE_E) = struct('mode', 'MODE_E', 'nu', 27, 'ng', 3, 'nspf', 40, 'W', W1024(DRM_MODE_E), 'Z', Z1024(DRM_MODE_E), 'Q', Q1024(DRM_MODE_E));
ofdm_params = ofdm_params_drm(DRM_MODE_B);
ofdm_spec_occ = ofdm_spec_occ_drm(DRM_MODE_B, SPEC_OCC_5k0);
ofdm_spec_occ = ofdm_spec_occ_drm(DRM_MODE_B, SPEC_OCC_10k);
ofdm_params_mode = ofdm_params.mode
ofdm_spec_occ_kmin = ofdm_spec_occ.kmin
@@ -128,7 +128,7 @@ for k=1:N_frames
if WITH_DATA == 1
data_i = c2i(N_fft, ofdm_spec_occ.kmin:1:ofdm_spec_occ.kmax);
sym = round(M_QAM*rand(1, length(data_i))+0.5);
X(data_i) = 0.20*qlut(sym);
X(data_i) = 0.10*qlut(sym);
end;
% X(c2i(N_fft,65)) = 0.20*qlut(round(M_qam*rand(1, 1)+0.5));