X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=phasenoise1signal.m;h=f819e653fe0a75b9d78f2b0d5ce78678ea0350be;hb=6a44550d735c954aef8333e48a481670d85fd505;hp=fcd371a1426c7354066232c57f6b28119504e80d;hpb=4fb42ae8b219be3b6644f829583584d249bf139d;p=4yp.git

diff --git a/phasenoise1signal.m b/phasenoise1signal.m
index fcd371a..f819e65 100644
--- a/phasenoise1signal.m
+++ b/phasenoise1signal.m
@@ -24,39 +24,49 @@ EsN0_db = 10 .* log10(EsN0);
 
 
 data = randi([0 M - 1], numSymbs, 1);
-modData = dpskmod(data, M, 0, 'gray');
+pskSym = pskmod(data, M, pi/M, 'gray');
+dpskSym = dpskmod(data, M, pi/M, 'gray');
 
-x = txFilter(modData, rolloff, span, sps);
+xPSK = txFilter(pskSym, rolloff, span, sps);
+xDPSK = txFilter(dpskSym, rolloff, span, sps);
 
 linewidthTx = 0; % Hz
-linewidthLO = 1e6; % Hz
+linewidthLO = 10e6; % Hz
+
+[xPSKpn, pTxLoPSK] = phaseNoise(xPSK, linewidthTx, linewidthLO, Tsamp);
+[xDPSKpn, pTxLoDPSK] = phaseNoise(xDPSK, linewidthTx, linewidthLO, Tsamp);
 
-[xPN, pTxLO] = phaseNoise(x, linewidthTx, linewidthLO, Tsamp);
 
 snr = EbN0_db + 10 * log10(log2(M)) - 10 * log10(sps);
 
 %%y = awgn(xPN, snr, 'measured');
-y = xPN;
+yPSK = awgn(xPSKpn, snr, 'measured');
+yDPSK = xDPSKpn;
+
+rPSK = rxFilter(yPSK, rolloff, span, sps);
+rDPSK = rxFilter(yDPSK, rolloff, span, sps);
 
-r = rxFilter(y, rolloff, span, sps);
 
+rPSKSa = rPSK(sps*span/2+1:sps:(numSymbs+span/2)*sps);
+rDPSKSa = rDPSK(sps*span/2+1:sps:(numSymbs+span/2)*sps);
 
-rSampled = r(sps*span/2+1:sps:(numSymbs+span/2)*sps);
-[rSaPhEq, phiests] = phaseNoiseCorr(rSampled, M, 40);
+[rPSKSaPhEq, phiestsPSK] = phaseNoiseCorr(rPSKSa, M, pi/M, 40);
 
-demodData = dpskdemod(rSaPhEq, M, 0, 'gray');
+demodPSK = pskdemod(rPSKSaPhEq, M, pi/M, 'gray');
+demodDPSK = dpskdemod(rDPSKSa, M, pi/M, 'gray');
 
-[bitErrors, ber] = biterr(data, demodData.')
+
+[bitErrors, ber] = biterr(data, demodPSK.')
 
 
 figure(2);
-plot(repelem(-phiests, sps));
+plot(t(1:40000), repelem(-phiestsPSK, sps));
 hold on;
-plot(pTxLO);
+plot(t(1:40000), pTxLoPSK(1:40000));
 legend('estimate', 'actual');
 title('Phase noise estimation');
 hold off;
-
+return
 figure(3);
 plot(t(1:length(x)), real(normalizeEnergy(x, numSymbs*sps, 1)));
 hold on;