diff options
| -rw-r--r-- | Transceiver52M/Transceiver.cpp | 37 | ||||
| -rw-r--r-- | Transceiver52M/Transceiver.h | 15 |
2 files changed, 0 insertions, 52 deletions
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 9a62365..63e62be 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -21,13 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -/* - Compilation switches - TRANSMIT_LOGGING write every burst on the given slot to a log -*/ - - #include <stdio.h> #include "Transceiver.h" #include <Logger.h> @@ -140,26 +133,6 @@ void Transceiver::addRadioVector(BitVector &burst, delete modBurst; } -#ifdef TRANSMIT_LOGGING -void Transceiver::unModulateVector(signalVector wVector) -{ - SoftVector *burst = demodulateBurst(wVector, mSPSTx, 1.0, 0.0); - LOG(DEBUG) << "LOGGED BURST: " << *burst; - -/* - unsigned char burstStr[gSlotLen+1]; - SoftVector::iterator burstItr = burst->begin(); - for (int i = 0; i < gSlotLen; i++) { - // FIXME: Demod bits are inverted! - burstStr[i] = (unsigned char) ((*burstItr++)*255.0); - } - burstStr[gSlotLen]='\0'; - LOG(DEBUG) << "LOGGED BURST: " << burstStr; -*/ - delete burst; -} -#endif - void Transceiver::pushRadioVector(GSM::Time &nowTime) { @@ -185,21 +158,11 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime) fillerTable[modFN][TN] = new signalVector(*(next)); mRadioInterface->driveTransmitRadio(*(next),(mChanType[TN]==NONE)); //fillerTable[modFN][TN])); delete next; -#ifdef TRANSMIT_LOGGING - if (nowTime.TN()==TRANSMIT_LOGGING) { - unModulateVector(*(fillerTable[modFN][TN])); - } -#endif return; } // otherwise, pull filler data, and push to radio FIFO mRadioInterface->driveTransmitRadio(*(fillerTable[modFN][TN]),(mChanType[TN]==NONE)); -#ifdef TRANSMIT_LOGGING - if (nowTime.TN()==TRANSMIT_LOGGING) - unModulateVector(*fillerTable[modFN][TN]); -#endif - } void Transceiver::setModulus(int timeslot) diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index c0ada1d..c3be343 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -22,13 +22,6 @@ */ - - -/* - Compilation switches - TRANSMIT_LOGGING write every burst on the given slot to a log -*/ - #include "radioInterface.h" #include "Interthread.h" #include "GSMCommon.h" @@ -37,9 +30,6 @@ #include <sys/types.h> #include <sys/socket.h> -/** Define this to be the slot number to be logged. */ -//#define TRANSMIT_LOGGING 1 - /** The Transceiver class, responsible for physical layer of basestation */ class Transceiver { @@ -100,11 +90,6 @@ private: float mNoiseLev; ///< Average noise level noiseVector mNoises; ///< Vector holding running noise measurements - /** unmodulate a modulated burst */ -#ifdef TRANSMIT_LOGGING - void unModulateVector(signalVector wVector); -#endif - /** modulate and add a burst to the transmit queue */ void addRadioVector(BitVector &burst, int RSSI, |