VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -04:00
Code Issues Projects Releases Wiki Activity

LimeSDR MIMO: unsuccessful attempt to fix

Browse Source
This commit is contained in:
f4exb
2020-04-18 18:32:56 +02:00
parent 7e82ede7ae
commit 4bca8efd6a
8 changed files with 323 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp
+36 -48
View File
@@ -45,13 +45,13 @@ void LimeSDRMIMOSettings::resetToDefaults()
m_iqCorrection = false;
m_rxTransverterMode = false;
m_rxTransverterDeltaFrequency = 0;
m_ncoEnableRx = false;
m_ncoFrequencyRx = 0;
m_lpfBWRx0 = 4.5e6f;
m_lpfFIREnableRx0 = false;
m_lpfFIRBWRx0 = 2.5e6f;
m_gainRx0 = 50;
m_ncoEnableRx0 = false;
m_ncoFrequencyRx0 = 0;
m_antennaPathRx0 = PATH_RFE_RX_NONE;
m_gainModeRx0 = GAIN_AUTO;
m_lnaGainRx0 = 15;
@@ -62,8 +62,6 @@ void LimeSDRMIMOSettings::resetToDefaults()
m_lpfFIREnableRx1 = false;
m_lpfFIRBWRx1 = 2.5e6f;
m_gainRx1 = 50;
m_ncoEnableRx1 = false;
m_ncoFrequencyRx1 = 0;
m_antennaPathRx1 = PATH_RFE_RX_NONE;
m_gainModeRx1 = GAIN_AUTO;
m_lnaGainRx1 = 15;
@@ -75,21 +73,19 @@ void LimeSDRMIMOSettings::resetToDefaults()
m_log2SoftInterp = 0;
m_txTransverterMode = false;
m_txTransverterDeltaFrequency = 0;
m_ncoEnableTx = false;
m_ncoFrequencyTx = 0;
m_lpfBWTx0 = 5.5e6f;
m_lpfFIREnableTx0 = false;
m_lpfFIRBWTx0 = 2.5e6f;
m_gainTx0 = 4;
m_ncoEnableTx0 = false;
m_ncoFrequencyTx0 = 0;
m_antennaPathTx0 = PATH_RFE_TX_NONE;
m_lpfBWTx1 = 5.5e6f;
m_lpfFIREnableTx1 = false;
m_lpfFIRBWTx1 = 2.5e6f;
m_gainTx1 = 4;
m_ncoEnableTx1 = false;
m_ncoFrequencyTx1 = 0;
m_antennaPathTx1 = PATH_RFE_TX_NONE;
}
@@ -116,52 +112,48 @@ QByteArray LimeSDRMIMOSettings::serialize() const
s.writeBool(24, m_iqCorrection);
s.writeBool(25, m_rxTransverterMode);
s.writeS64(26, m_rxTransverterDeltaFrequency);
s.writeBool(27, m_ncoEnableRx);
s.writeS32(28, m_ncoFrequencyRx);
s.writeFloat(30, m_lpfBWRx0);
s.writeBool(31, m_lpfFIREnableRx0);
s.writeFloat(32, m_lpfFIRBWRx0);
s.writeU32(33, m_gainRx0);
s.writeBool(34, m_ncoEnableRx0);
s.writeS32(35, m_ncoFrequencyRx0);
s.writeS32(36, (int) m_antennaPathRx0);
s.writeS32(37, (int) m_gainModeRx0);
s.writeU32(38, m_lnaGainRx0);
s.writeU32(39, m_tiaGainRx0);
s.writeU32(40, m_pgaGainRx0);
s.writeS32(34, (int) m_antennaPathRx0);
s.writeS32(35, (int) m_gainModeRx0);
s.writeU32(36, m_lnaGainRx0);
s.writeU32(37, m_tiaGainRx0);
s.writeU32(38, m_pgaGainRx0);
s.writeFloat(50, m_lpfBWRx1);
s.writeBool(51, m_lpfFIREnableRx1);
s.writeFloat(52, m_lpfFIRBWRx1);
s.writeU32(53, m_gainRx1);
s.writeBool(54, m_ncoEnableRx1);
s.writeS32(55, m_ncoFrequencyRx1);
s.writeS32(56, (int) m_antennaPathRx1);
s.writeS32(57, (int) m_gainModeRx1);
s.writeU32(58, m_lnaGainRx1);
s.writeU32(59, m_tiaGainRx1);
s.writeU32(60, m_pgaGainRx1);
s.writeS32(54, (int) m_antennaPathRx1);
s.writeS32(55, (int) m_gainModeRx1);
s.writeU32(56, m_lnaGainRx1);
s.writeU32(57, m_tiaGainRx1);
s.writeU32(58, m_pgaGainRx1);
s.writeU64(70, m_txCenterFrequency);
s.writeU32(71, m_log2HardInterp);
s.writeU32(72, m_log2SoftInterp);
s.writeBool(73, m_txTransverterMode);
s.writeS64(74, m_txTransverterDeltaFrequency);
s.writeBool(75, m_ncoEnableTx);
s.writeS32(76, m_ncoFrequencyTx);
s.writeFloat(80, m_lpfBWTx0);
s.writeBool(81, m_lpfFIREnableTx0);
s.writeFloat(82, m_lpfFIRBWTx0);
s.writeU32(83, m_gainTx0);
s.writeBool(84, m_ncoEnableTx0);
s.writeS32(85, m_ncoFrequencyTx0);
s.writeS32(86, (int) m_antennaPathTx0);
s.writeS32(84, (int) m_antennaPathTx0);
s.writeFloat(90, m_lpfBWTx1);
s.writeBool(91, m_lpfFIREnableTx1);
s.writeFloat(92, m_lpfFIRBWTx1);
s.writeU32(93, m_gainTx1);
s.writeBool(94, m_ncoEnableTx1);
s.writeS32(95, m_ncoFrequencyTx1);
s.writeS32(96, (int) m_antennaPathTx1);
s.writeS32(94, (int) m_antennaPathTx1);
return s.final();
}
@@ -210,57 +202,53 @@ bool LimeSDRMIMOSettings::deserialize(const QByteArray& data)
d.readBool(24, &m_iqCorrection, false);
d.readBool(25, &m_rxTransverterMode, false);
d.readS64(26, &m_rxTransverterDeltaFrequency, 0);
d.readBool(27, &m_ncoEnableRx, false);
d.readS32(28, &m_ncoFrequencyRx, 0);
d.readFloat(30, &m_lpfBWRx0, 1.5e6);
d.readBool(31, &m_lpfFIREnableRx0, false);
d.readFloat(32, &m_lpfFIRBWRx0, 1.5e6);
d.readU32(33, &m_gainRx0, 50);
d.readBool(34, &m_ncoEnableRx0, false);
d.readS32(35, &m_ncoFrequencyRx0, 0);
d.readS32(36, &intval, 0);
d.readS32(34, &intval, 0);
m_antennaPathRx0 = (PathRxRFE) intval;
d.readS32(37, &intval, 0);
d.readS32(35, &intval, 0);
m_gainModeRx0 = (RxGainMode) intval;
d.readU32(38, &m_lnaGainRx0, 15);
d.readU32(39, &m_tiaGainRx0, 2);
d.readU32(40, &m_pgaGainRx0, 16);
d.readU32(36, &m_lnaGainRx0, 15);
d.readU32(37, &m_tiaGainRx0, 2);
d.readU32(38, &m_pgaGainRx0, 16);
d.readFloat(50, &m_lpfBWRx1, 1.5e6);
d.readBool(51, &m_lpfFIREnableRx1, false);
d.readFloat(52, &m_lpfFIRBWRx1, 1.5e6);
d.readU32(53, &m_gainRx1, 50);
d.readBool(54, &m_ncoEnableRx1, false);
d.readS32(55, &m_ncoFrequencyRx1, 0);
d.readS32(56, &intval, 0);
d.readS32(54, &intval, 0);
m_antennaPathRx1 = (PathRxRFE) intval;
d.readS32(57, &intval, 0);
d.readS32(55, &intval, 0);
m_gainModeRx1 = (RxGainMode) intval;
d.readU32(58, &m_lnaGainRx1, 15);
d.readU32(59, &m_tiaGainRx1, 2);
d.readU32(60, &m_pgaGainRx1, 16);
d.readU32(56, &m_lnaGainRx1, 15);
d.readU32(57, &m_tiaGainRx1, 2);
d.readU32(58, &m_pgaGainRx1, 16);
d.readU64(70, &m_txCenterFrequency, 435000*1000);
d.readU32(71, &m_log2HardInterp, 2);
d.readU32(72, &m_log2SoftInterp, 0);
d.readBool(73, &m_txTransverterMode, false);
d.readS64(74, &m_txTransverterDeltaFrequency, 0);
d.readBool(75, &m_ncoEnableTx, false);
d.readS32(76, &m_ncoFrequencyTx, 0);
d.readFloat(80, &m_lpfBWTx0, 1.5e6);
d.readBool(81, &m_lpfFIREnableTx0, false);
d.readFloat(82, &m_lpfFIRBWTx0, 1.5e6);
d.readU32(83, &m_gainTx0, 4);
d.readBool(84, &m_ncoEnableTx0, false);
d.readS32(85, &m_ncoFrequencyTx0, 0);
d.readS32(86, &intval, 0);
d.readS32(84, &intval, 0);
m_antennaPathTx0 = (PathTxRFE) intval;
d.readFloat(90, &m_lpfBWTx1, 1.5e6);
d.readBool(91, &m_lpfFIREnableTx1, false);
d.readFloat(92, &m_lpfFIRBWTx1, 1.5e6);
d.readU32(93, &m_gainTx1, 4);
d.readBool(94, &m_ncoEnableTx1, false);
d.readS32(95, &m_ncoFrequencyTx1, 0);
d.readS32(96, &intval, 0);
d.readS32(94, &intval, 0);
m_antennaPathTx1 = (PathTxRFE) intval;
return true;