From 1c0b8b355ccbb31048973e838933d0e29039ad32 Mon Sep 17 00:00:00 2001 From: Alexander Chemeris Date: Fri, 17 Mar 2017 16:12:47 -0700 Subject: sigProcLib: Rename demodulateBurst() to demodGmskBurst() for clarity. Change-Id: Ibcef8d7d4a2c06865bed7e4091ccc8dbbd494d77 --- Transceiver52M/Transceiver.cpp | 2 +- Transceiver52M/sigProcLib.cpp | 2 +- Transceiver52M/sigProcLib.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Transceiver52M') diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 3df482f..3f624d0 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -583,7 +583,7 @@ SoftVector *Transceiver::demodulate(signalVector &burst, complex amp, if (type == EDGE) return demodEdgeBurst(burst, mSPSRx, amp, toa); - return demodulateBurst(burst, mSPSRx, amp, toa); + return demodGmskBurst(burst, mSPSRx, amp, toa); } void writeToFile(radioVector *radio_burst, size_t chan) diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 41b18cf..0a1fd44 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -2050,7 +2050,7 @@ static signalVector *demodCommon(signalVector &burst, int sps, * 4 SPS (if activated) to minimize distortion through the fractional * delay filters. Symbol rotation and after always operates at 1 SPS. */ -SoftVector *demodulateBurst(signalVector &rxBurst, int sps, +SoftVector *demodGmskBurst(signalVector &rxBurst, int sps, complex channel, float TOA) { SoftVector *bits; diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h index 87c0229..7dca71f 100644 --- a/Transceiver52M/sigProcLib.h +++ b/Transceiver52M/sigProcLib.h @@ -261,16 +261,16 @@ signalVector *downsampleBurst(signalVector &burst); signalVector *decimateVector(signalVector &wVector, size_t factor); /** - Demodulates a received burst using a soft-slicer. - @param rxBurst The burst to be demodulated. + Demodulates a GMSK burst using a soft-slicer. + @param rxBurst The burst to be demodulated. @param gsmPulse The GSM pulse. @param sps The number of samples per GSM symbol. @param channel The amplitude estimate of the received burst. @param TOA The time-of-arrival of the received burst. @return The demodulated bit sequence. */ -SoftVector *demodulateBurst(signalVector &rxBurst, int sps, - complex channel, float TOA); +SoftVector *demodGmskBurst(signalVector &rxBurst, int sps, + complex channel, float TOA); /** Demodulate 8-PSK EDGE burst with soft symbol ooutput -- cgit v1.2.3