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;