diff --git a/targets/PROJECTS/CORRIDOR/emos_read_v2.m b/targets/PROJECTS/CORRIDOR/emos_read_v2.m
index df9c9c1a5266dd98896253af8e9f845a454002a2..aa6c6ca53f2536f67b8cbce99cf21900bde25458 100644
--- a/targets/PROJECTS/CORRIDOR/emos_read_v2.m
+++ b/targets/PROJECTS/CORRIDOR/emos_read_v2.m
@@ -13,7 +13,6 @@ primary_synch; %loads the primary sync signal
load('ofdm_pilots_sync_30MHz.mat');
n_carriers = 2; % use 1 for UHF and 2 for 2.6GHz
-nframes = 100; % frames in one block
symbols_per_slot = 6;
slots_per_frame = 20;
@@ -25,13 +24,18 @@ switch n_carriers
%filename = 'E:\EMOS\corridor\trials1\eNB_data_20140331_UHF_run1.EMOS';
filename = 'D:\trials1 train extracted\eNB_data_20140331_UHF_run1.EMOS';
+ nframes = 100; % frames in one block
+ threshold = 3e+4 ; % maybe should change that !!!!
case 2,
- p(1) = init_params(50,2,4);
- p(2) = init_params(100,2,4);
- pss_t = upsample(primary_synch0_time,4*2); % this assumes we are doing the sync on the first carrier, which is 10MHz
+ p(1) = init_params(100,2,4);
+ p(2) = init_params(50,2,4);
+ pss_t = upsample(primary_synch0_time,4*4); % this assumes we are doing the sync on the first carrier, which is 10MHz
%filename = 'E:\EMOS\corridor\trials1\eNB_data_20140331_UHF_run1.EMOS';
filename = 'D:\trials1 train extracted\eNB_data_20140331_2.6GHz_run1.EMOS';
+
+ nframes = 50; % frames in one block
+ threshold = 1e+4 ; % maybe should change that !!!!
end
destdir = 'E:\EMOS\corridor\trials1 train';
@@ -54,9 +58,7 @@ block = 1;
flag1 = 1;
start=2;
-threshold = 3e+4 ; % maybe should change that !!!!
-
-fseek(fid,samples_slot_agg*slots_per_frame*nframes*120*2,'bof'); %advance 30 sec
+%fseek(fid,samples_slot_agg*slots_per_frame*nframes*120*2,'bof'); %advance 30 sec
while ~feof(fid)
fprintf(1,'Processing block %d of %d',block,nblocks);
@@ -68,21 +70,21 @@ while ~feof(fid)
v0 = double(v(1:2:end))+1j*double(v(2:2:end));
v1 = zeros(p(1).samples_slot*slots_per_frame*nframes,p(1).nant_rx);
+ if n_carriers==2
+ v2 = zeros(p(2).samples_slot*slots_per_frame*nframes,p(2).nant_rx);
+ end
for slot=1:slots_per_frame*nframes
for a=1:p(1).nant_rx
v1((slot-1)*p(1).samples_slot+1:slot*p(1).samples_slot,a) = ...
v0((slot-1)*samples_slot_agg+(a-1)*p(1).samples_slot+1:...
- (slot-1)*samples_slot_agg+ a *p(1).samples_slot,1);
+ (slot-1)*samples_slot_agg+ a *p(1).samples_slot,1);
end
- end
-
- if n_carriers==2
- v2 = zeros(p(2).samples_slot*slots_per_frame*nframes,p(2).nant_rx);
- for slot=1:slots_per_frame*nframes
+
+ if n_carriers==2
for a=1:p(2).nant_rx
v2((slot-1)*p(2).samples_slot+1:slot*p(2).samples_slot,a) = ...
- v0((slot-1)*samples_slot_agg+(a-1)*p(2).samples_slot+1:...
- (slot-1)*samples_slot_agg+ a *p(2).samples_slot,1);
+ v0((slot-1)*samples_slot_agg+p(1).nant_rx*p(1).samples_slot+(a-1)*p(2).samples_slot+1:...
+ (slot-1)*samples_slot_agg+p(1).nant_rx*p(1).samples_slot+ a *p(2).samples_slot,1);
end
end
end
@@ -96,10 +98,10 @@ while ~feof(fid)
end
if n_carriers==2
- v2 = [vStorage1; v2] ;
+ v2 = [vStorage2; v2] ;
if size(v2,1) > p(2).frame_length*nframes ;
nframes = floor(size(v2,1) / p(2).frame_length) ;
- vStorage1 = v2(p(2).frame_length*nframes+1:end,:) ;
+ vStorage2 = v2(p(2).frame_length*nframes+1:end,:) ;
v2(p(2).frame_length*nframes + 1 : end,:) = [] ;
start = 1 ;
end
@@ -158,7 +160,7 @@ while ~feof(fid)
fprintf(1,'.');
frame_start1 = (slots_per_frame*p(1).samples_slot)*(i-1)+frame_offset+1;
if n_carriers==2
- frame_start2 = (slots_per_frame*p(2).samples_slot)*(i-1)+frame_offset*2+1;
+ frame_start2 = (slots_per_frame*p(2).samples_slot)*(i-1)+round(frame_offset/2)+1;
end
if i<nframes
@@ -172,78 +174,81 @@ while ~feof(fid)
if n_carriers==2
vStorage2 = [v2(frame_start2:end,:) ; vStorage2]; %%
end
+ break
end
%% MIMO channel estimation
if (n_carriers==1)
transmit_f1 = f3;
else
- transmit_f1 = f2;
- transmit_f2 = f1;
+ transmit_f1 = f1;
+ transmit_f2 = f2;
end
for carrier=1:n_carriers
- if (carrier==1)
- transmit_f = transmit_f1;
- received_f = received_f1;
- else
- transmit_f = transmit_f2;
- received_f = received_f2;
- end
-
-
- H = zeros(num_symbols_frame/2,p(carrier).useful_carriers/4,p(carrier).nant_tx,p(carrier).nant_rx);
- for itx=1:p(carrier).nant_tx
- % f_start and t_start indicate the start of the pilots in time
- % and frequency according to the specifications (see .doc file).
- % t_start has to be >=2, since the first symbol is the PSS.
- f_start = mod(itx-1,2)*2+1;
- t_start = floor((itx-1)/2)+1;
- for irx=1:p(carrier).nant_rx
- H(:,:,itx,irx)=conj(squeeze(transmit_f(itx,t_start:2:end,f_start:4:end))).*received_f(t_start:2:end,f_start:4:end,irx);
+ if (carrier==1)
+ transmit_f = transmit_f1;
+ received_f = received_f1;
+ else
+ transmit_f = transmit_f2;
+ received_f = received_f2;
end
- end
- Ht = ifft(H,[],2);
- PDP = mean(abs(Ht).^2,1);
- PDP_all = squeeze(mean(mean(PDP,3),4));
- %PDP_total((block-1)*nframes+i+1,:,:,:) = PDP;
-
- if enable_plots>=1
- figure(3+2*(carrier-1))
+
+
+ H = zeros(num_symbols_frame/2,p(carrier).useful_carriers/4,p(carrier).nant_tx,p(carrier).nant_rx);
for itx=1:p(carrier).nant_tx
- for irx=1:p(1).nant_rx
- subplot(p(1).nant_tx,p(1).nant_rx,(itx-1)*p(1).nant_rx + irx);
- surf(20*log10(abs(Ht(:,:,itx,irx))))
- %xlabel('time [OFDM symbol]')
- %ylabel('delay time [samples]')
- %zlabel('power [dB]')
- shading interp
+ % f_start and t_start indicate the start of the pilots in time
+ % and frequency according to the specifications (see .doc file).
+ % t_start has to be >=2, since the first symbol is the PSS.
+ f_start = mod(itx-1,2)*2+1;
+ t_start = floor((itx-1)/2)+1;
+ for irx=1:p(carrier).nant_rx
+ H(:,:,itx,irx)=conj(squeeze(transmit_f(itx,t_start:2:end,f_start:4:end))).*received_f(t_start:2:end,f_start:4:end,irx);
end
end
- figure(4+2*(carrier-1))
- for itx=1:p(1).nant_tx
- for irx=1:p(1).nant_rx
- subplot(p(1).nant_tx,p(1).nant_rx,(itx-1)*p(1).nant_rx + irx);
- plot(10*log10(PDP(:,:,itx,irx)))
- ylim([50 80])
- xlim([0 75])
- %xlabel('delay time [samples]')
- %ylabel('power [dB]')
+ Ht = ifft(H,[],2);
+ PDP = mean(abs(Ht).^2,1);
+ PDP_all = squeeze(mean(mean(PDP,3),4));
+ %PDP_total((block-1)*nframes+i+1,:,:,:) = PDP;
+
+ if enable_plots>=1
+ figure(3+2*(carrier-1))
+ for itx=1:p(carrier).nant_tx
+ for irx=1:p(1).nant_rx
+ subplot(p(1).nant_tx,p(1).nant_rx,(itx-1)*p(1).nant_rx + irx);
+ surf(20*log10(abs(Ht(:,:,itx,irx))))
+ %xlabel('time [OFDM symbol]')
+ %ylabel('delay time [samples]')
+ %zlabel('power [dB]')
+ shading interp
+ end
+ end
+ figure(4+2*(carrier-1))
+ for itx=1:p(1).nant_tx
+ for irx=1:p(1).nant_rx
+ subplot(p(1).nant_tx,p(1).nant_rx,(itx-1)*p(1).nant_rx + irx);
+ plot(10*log10(PDP(:,:,itx,irx)))
+ ylim([50 80])
+ xlim([0 75])
+ %xlabel('delay time [samples]')
+ %ylabel('power [dB]')
+ end
+ end
+ drawnow
+ end
+
+ if carrier==1
+ % adjust frame offset base on channel estimate to compensate for
+ % timing drift. We try to keep the peak of the impulse response at
+ % sample prefix_length/8.
+ [m,idx] = max(fft(ifft(PDP_all),p(carrier).num_carriers));
+ offset = idx - p(carrier).prefix_length/8;
+ if offset > p(carrier).prefix_length
+ offset = offset - p(carrier).num_carriers;
+ end
+ if abs(offset) > 5
+ frame_offset = frame_offset + round(offset/4);
end
end
- drawnow
- end
- end
-
- % adjust frame offset base on channel estimate to compensate for
- % timing drift. We try to keep the peak of the impulse response at
- % sample prefix_length/8.
- [m,idx] = max(fft(ifft(PDP_all),p(1).num_carriers));
- offset = idx - p(1).prefix_length/8;
- if offset > p(1).prefix_length
- offset = offset - p(1).num_carriers;
- end
- if abs(offset) > 5
- frame_offset = frame_offset + round(offset/4);
end
end