VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-19 06:42:31 -04:00
Code Issues Projects Releases Wiki Activity

LimeRFE USB: added cellular band 3

Browse Source
This commit is contained in:
f4exb 2020-03-08 22:04:58 +01:00
parent b6bb4258c2
commit 9c7cb0a49a
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdrbase/limerfe/limerfecontroller.cpp
View File

@ -239,6 +239,11 @@ void LimeRFEController::settingsToState(const LimeRFESettings& settings)
m_rfeBoardState.channelIDRX = RFE_CID_CELL_BAND02; m_rfeBoardState.channelIDRX = RFE_CID_CELL_BAND02;
m_rfeBoardState.mode = RFE_MODE_TXRX; m_rfeBoardState.mode = RFE_MODE_TXRX;
} }
else if (settings.m_rxCellularChannel == CellularBand3)
{
m_rfeBoardState.channelIDRX = RFE_CID_CELL_BAND03;
m_rfeBoardState.mode = RFE_MODE_TXRX;
}
else if (settings.m_rxCellularChannel == CellularBand38) else if (settings.m_rxCellularChannel == CellularBand38)
{ {
m_rfeBoardState.channelIDRX = RFE_CID_CELL_BAND38; m_rfeBoardState.channelIDRX = RFE_CID_CELL_BAND38;
@ -367,6 +372,11 @@ void LimeRFEController::stateToSettings(LimeRFESettings& settings)
settings.m_rxChannels = ChannelsCellular; settings.m_rxChannels = ChannelsCellular;
settings.m_rxCellularChannel = CellularBand2; settings.m_rxCellularChannel = CellularBand2;
} }
else if (m_rfeBoardState.channelIDRX == RFE_CID_CELL_BAND03)
{
settings.m_rxChannels = ChannelsCellular;
settings.m_rxCellularChannel = CellularBand3;
}
else if (m_rfeBoardState.channelIDRX == RFE_CID_CELL_BAND07) else if (m_rfeBoardState.channelIDRX == RFE_CID_CELL_BAND07)
{ {
settings.m_rxChannels = ChannelsCellular; settings.m_rxChannels = ChannelsCellular;
@ -449,6 +459,11 @@ void LimeRFEController::stateToSettings(LimeRFESettings& settings)
settings.m_txChannels = ChannelsCellular; settings.m_txChannels = ChannelsCellular;
settings.m_txCellularChannel = CellularBand2; settings.m_txCellularChannel = CellularBand2;
} }
else if (m_rfeBoardState.channelIDTX == RFE_CID_CELL_BAND03)
{
settings.m_txChannels = ChannelsCellular;
settings.m_txCellularChannel = CellularBand3;
}
else if (m_rfeBoardState.channelIDTX == RFE_CID_CELL_BAND07) else if (m_rfeBoardState.channelIDTX == RFE_CID_CELL_BAND07)
{ {
settings.m_txChannels = ChannelsCellular; settings.m_txChannels = ChannelsCellular;

1
sdrbase/limerfe/limerfecontroller.h
View File

@ -56,6 +56,7 @@ public:
{ {
CellularBand1, CellularBand1,
CellularBand2, CellularBand2,
CellularBand3,
CellularBand7, CellularBand7,
CellularBand38 CellularBand38
}; };

1
sdrbase/limerfe/limerfeusbcalib.h
View File

@ -44,6 +44,7 @@ public:
HAM_3300_3500MHz, HAM_3300_3500MHz,
CellularBand1, CellularBand1,
CellularBand2, CellularBand2,
CellularBand3,
CellularBand7, CellularBand7,
CellularBand38 CellularBand38
}; };

5
sdrgui/limerfegui/limerfeusbdialog.cpp
View File

@ -234,6 +234,7 @@ void LimeRFEUSBDialog::setRxChannels()
{ {
ui->rxChannel->addItem("Band1"); ui->rxChannel->addItem("Band1");
ui->rxChannel->addItem("Band2"); ui->rxChannel->addItem("Band2");
ui->rxChannel->addItem("Band3");
ui->rxChannel->addItem("Band7"); ui->rxChannel->addItem("Band7");
ui->rxChannel->addItem("Band38"); ui->rxChannel->addItem("Band38");
ui->rxChannel->setCurrentIndex((int) m_settings.m_rxCellularChannel); ui->rxChannel->setCurrentIndex((int) m_settings.m_rxCellularChannel);
@ -314,6 +315,7 @@ void LimeRFEUSBDialog::setTxChannels()
{ {
ui->txChannel->addItem("Band1"); ui->txChannel->addItem("Band1");
ui->txChannel->addItem("Band2"); ui->txChannel->addItem("Band2");
ui->txChannel->addItem("Band3");
ui->txChannel->addItem("Band7"); ui->txChannel->addItem("Band7");
ui->txChannel->addItem("Band38"); ui->txChannel->addItem("Band38");
ui->txChannel->setCurrentIndex((int) m_settings.m_txCellularChannel); ui->txChannel->setCurrentIndex((int) m_settings.m_txCellularChannel);
@ -402,6 +404,9 @@ int LimeRFEUSBDialog::getPowerCorectionIndex()
case LimeRFEController::CellularBand2: case LimeRFEController::CellularBand2:
range = LimeRFEUSBCalib::CellularBand2; range = LimeRFEUSBCalib::CellularBand2;
break; break;
case LimeRFEController::CellularBand3:
range = LimeRFEUSBCalib::CellularBand3;
break;
case LimeRFEController::CellularBand7: case LimeRFEController::CellularBand7:
range = LimeRFEUSBCalib::CellularBand7; range = LimeRFEUSBCalib::CellularBand7;
break; break;