diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-09-13 16:53:31 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-09-13 17:33:14 +0200 |
| commit | 331c88ae82d730991a8d687df9542c6a1e2f8b29 (patch) | |
| tree | b3cee82390fbba8ce9a9fdc9c75d858ef6b15cc1 | |
| parent | ca0892d82277aeaafbaa14a0c03e62833fd9ee69 (diff) | |
USRPDevice: Return previous txGain if setting value failed
Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8
| -rw-r--r-- | Transceiver52M/device/usrp1/USRPDevice.cpp | 6 | ||||
| -rw-r--r-- | Transceiver52M/device/usrp1/USRPDevice.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index ef3f92a..03a4f80 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -71,6 +71,7 @@ USRPDevice::USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps)); actualSampleRate = masterClockRate/decimRate; rxGain = 0; + txGain = 0; /* * Undetermined delay b/w ping response timestamp and true @@ -279,10 +280,11 @@ double USRPDevice::setTxGain(double dB, size_t chan) if (!m_dbTx->set_gain(dB)) LOGC(DDEV, ERR) << "Error setting TX gain"; - + else + txGain = dB; writeLock.unlock(); - return dB; + return txGain; } diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 4123c7d..734b361 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -80,6 +80,7 @@ private: unsigned long lastPktTimestamp; double rxGain; + double txGain; #ifdef SWLOOPBACK short loopbackBuffer[1000000]; |