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

- fixed getRefTime.m

Browse Source 
- fixed getRefGain.m
- minor changes to RX/TX

git-svn-id: http://moon:8086/svn/matlab/trunk@43 801c6759-fa7c-4059-a304-17956f83a07c
This commit is contained in:
jens
2015-04-29 21:25:46 +00:00
parent dd733db287
commit 584d16e3bf
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ofdm/drm/getRefGain.m
+1 -1
View File
@@ -6,7 +6,7 @@ y = ofdm_params.y;
s = mod(s, ofdm_params.nspf); s = mod(s, ofdm_params.nspf);
k = k0 + x*mod(s, y) + 2*y*(spec_occ.kmin:1:spec_occ.kmax); k = k0 + x*mod(s, y) + x*y*(spec_occ.kmin:1:spec_occ.kmax);
k(find(k > spec_occ.kmax)) = []; k(find(k > spec_occ.kmax)) = [];
k(find(k < spec_occ.kmin)) = []; k(find(k < spec_occ.kmin)) = [];
ofdm/drm/getRefTime.m
+3 -7
View File
@@ -1,9 +1,5 @@
function [ref_c ref_p ref_a] = getRefTime(drmMode) function [ref_c ref_p ref_a] = getRefTime(drmMode)
ref_B_c = [14 18 20 24 26 32 36 42 44 49 50 54 56 62 66 68];
ref_B_p = [304 108 620 192 704 44 432 588 844 651 651 460 460 944 940 428];
ref_B_a = sqrt(2)*ones(1,16);
switch drmMode switch drmMode
case 'A' case 'A'
ref_c = []; ref_c = [];
@@ -12,9 +8,9 @@ switch drmMode
error ('Implement Mode A!'); error ('Implement Mode A!');
case 'B' case 'B'
ref_c = ref_B_c; ref_c = [14 16 18 20 24 26 32 36 42 44 48 49 50 54 56 62 64 66 68];
ref_p = ref_B_p; ref_p = [304 331 108 620 192 704 44 432 588 844 651 651 651 460 460 944 555 940 428];
ref_a = ref_B_a; ref_a = sqrt(2)*ones(1,length(ref_c));
case 'C' case 'C'
ref_c = []; ref_c = [];
ofdm/ofdm_rx.m
+2 -2
View File
@@ -259,9 +259,9 @@ for k=start:length(Z_)
sym_out(:, kk) = ZZ ./ H; sym_out(:, kk) = ZZ ./ H;
if 1 if 1
subplot(2, 1, 1) subplot(2, 1, 1)
plot(abs(H)); grid; title('abs(H)'); plot(0:length(H)-1, abs(H)); grid; title('abs(H)'); axis([0 length(H)-1 0 15+0*max(abs(H))]);
subplot(2, 1, 2) subplot(2, 1, 2)
plot(angle(H)); grid; title('phi(H)'); plot(0:length(H)-1, angle(H)); grid; title('phi(H)'); axis([0 length(H)-1 -4 4]);
else else
hold on; hold on;
plot(sym_out(:, kk), '+'); plot(sym_out(:, kk), '+');
ofdm/ofdm_tx.m
+19 -15
View File
@@ -1,9 +1,9 @@
% function ofdm_tx(N_frames) % function ofdm_tx(N_frames)
function [yv xv] = ofdm_tx(mode, bandwidth, N_frames, withData) function [yv xv] = ofdm_tx(mode, bandwidth, N_frames, withData, plot_speed)
close all; close all;
DO_PLOT = 0; DO_PLOT = (plot_speed > 0);
WITH_RCWIN = 1; WITH_RCWIN = 1;
WITH_FREQ_REF = 1; WITH_FREQ_REF = 1;
WITH_TIME_REF = 1; WITH_TIME_REF = 1;
@@ -49,7 +49,6 @@ ofdm_spec_occ.kmin
ofdm_spec_occ.kmax ofdm_spec_occ.kmax
for k=1:N_frames for k=1:N_frames
for sym_count=0:ofdm_params.nspf-1, for sym_count=0:ofdm_params.nspf-1,
X = zeros(N,1); X = zeros(N,1);
% Data % Data
@@ -59,27 +58,28 @@ for k=1:N_frames
X(data_i) = qlut(sym); X(data_i) = qlut(sym);
end; end;
if WITH_GAIN_REF == 1
[ref_c ref_p ref_a] = getRefGain(ofdm_params, ofdm_spec_occ, sym_count);
X(c2i(N, ref_c)) = ref_a.*(exp(2*pi*i*ref_p/1024));
end;
if (sym_count==0) & (WITH_TIME_REF == 1) if (sym_count==0) & (WITH_TIME_REF == 1)
[ref_c ref_p ref_a] = getRefTime(ofdm_params.mode); [ref_c ref_p ref_a] = getRefTime(ofdm_params.mode);
bins = c2i(N, ref_c); bins = c2i(N, ref_c);
X(bins) = ref_a.*(exp(2*pi*i*ref_p/1024)); X(bins) = ref_a.*(exp(j*2*pi*ref_p/1024));
end; end;
if WITH_GAIN_REF == 1
[ref_c ref_p ref_a] = getRefGain(ofdm_params, ofdm_spec_occ, sym_count);
bins = c2i(N, ref_c);
X(bins) = ref_a.*(exp(j*2*pi*ref_p/1024));
end;
if WITH_FREQ_REF == 1 if WITH_FREQ_REF == 1
[ref_c ref_p ref_a] = getRefFreq(ofdm_params.mode); [ref_c ref_p ref_a] = getRefFreq(ofdm_params.mode);
bins = c2i(N, ref_c); bins = c2i(N, ref_c);
X(bins) = ref_a.*(exp(2*pi*i*ref_p/1024)); X(bins) = ref_a.*(exp(j*2*pi*ref_p/1024));
end; end;
X(c2i(N, 0)) = 0; X(c2i(N, 0)) = 0;
% Modulate % Modulate
xu = conj(k_fft*ifft(X, N)'); xu = k_fft*ifft(X, N).';
if WITH_RCWIN == 1 if WITH_RCWIN == 1
x_prefix(1,:) = xu(N-Ng+1:N); x_prefix(1,:) = xu(N-Ng+1:N);
x_suffix(1,:) = xu(1:Ng); x_suffix(1,:) = xu(1:Ng);
@@ -96,9 +96,13 @@ for k=1:N_frames
xv = [xv xs(1:Ng+N)]; xv = [xv xs(1:Ng+N)];
if (DO_PLOT == 1) if (DO_PLOT == 1)
Xs = fftshift(fft(xs(Ng+1:Ng+N), N)/k_fft); % Xs = fftshift(fft(xs(Ng+1:Ng+N), N)/k_fft);
plot(0:N-1, abs(Xs(1:N)), '-*'); grid; Xs = fftshift(X);
pause(0.01); subplot(2, 1, 1)
plot(0:N-1, abs(Xs(1:N)), '-*'); grid; axis([0 N-1 0 2]);
subplot(2, 1, 2)
plot(0:N-1, angle(Xs(1:N)), '-*'); grid; axis([0 N-1 -2*pi 2*pi]);
pause(plot_speed);
end end
end; end;
end; end;