chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored get current frequency

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-20 22:17:41 -04:00
parent fa864c50cd
commit b2e2b91d31
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mainwindow.cpp
View File

@ -5358,8 +5358,7 @@ void MainWindow::createMessageTransmitQueue(QString const& text){
m_txFrameQueue.append(frames); m_txFrameQueue.append(frames);
m_txFrameCount = frames.length(); m_txFrameCount = frames.length();
// TODO: jsherer - ew int freq = currentFreq();
int freq = ui->TxFreqSpinBox->value();
logRxTxMessageText(QDateTime::currentDateTimeUtc(), false, lines.join(""), freq, true); logRxTxMessageText(QDateTime::currentDateTimeUtc(), false, lines.join(""), freq, true);
} }
@ -5445,6 +5444,10 @@ QString trimWithPeriods(QString value){
return value; return value;
} }
int MainWindow::currentFreq(){
return ui->RxFreqSpinBox->value();
}
QPair<QStringList, QStringList> MainWindow::buildFT8MessageFrames(QString const& text){ QPair<QStringList, QStringList> MainWindow::buildFT8MessageFrames(QString const& text){
QStringList frames; QStringList frames;
QStringList lines; QStringList lines;
@ -5708,9 +5711,9 @@ void MainWindow::prepareBeacon(){
} }
int bw = 50 + 5; int bw = 50 + 5;
int f = ui->TxFreqSpinBox->value(); // TODO: jsherer - ew int f = currentFreq();
if(!isFreqOffsetFree(f, bw)){ if(!isFreqOffsetFree(f, bw)){
f = findFreeFreqOffset(250, 1500, bw); f = findFreeFreqOffset(500, 1500, bw);
} }
// delay beacon if there's not a free frequency or there's something the tx queue or we just recently transmitted // delay beacon if there's not a free frequency or there's something the tx queue or we just recently transmitted
@ -6835,7 +6838,7 @@ void MainWindow::on_replyMacroButton_clicked(){
return; return;
} }
int offset = ui->RxFreqSpinBox->value(); int offset = currentFreq();
if(m_bandActivity.contains(offset)){ if(m_bandActivity.contains(offset)){
auto activity = m_bandActivity[offset].last(); auto activity = m_bandActivity[offset].last();
if(!activity.firstCall.isEmpty()){ if(!activity.firstCall.isEmpty()){
@ -6865,7 +6868,7 @@ void MainWindow::on_snrMacroButton_clicked(){
return; return;
} }
int offset = ui->RxFreqSpinBox->value(); int offset = currentFreq();
if(m_bandActivity.contains(offset)){ if(m_bandActivity.contains(offset)){
int snr = m_bandActivity[offset].last().snr; int snr = m_bandActivity[offset].last().snr;
addMessageText(Varicode::formatSNR(snr)); addMessageText(Varicode::formatSNR(snr));
@ -7297,10 +7300,10 @@ void MainWindow::setFreq4(int rxFreq, int txFreq)
txFreq = rxFreq; txFreq = rxFreq;
} }
// Don't go below 450 Hz if not in split mode // Don't go below 500 Hz if not in split mode
if(!m_config.split_mode()){ if(!m_config.split_mode()){
rxFreq = qMax(450, rxFreq); rxFreq = qMax(500, rxFreq);
txFreq = qMax(450, txFreq); txFreq = qMax(500, txFreq);
} }
if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq); if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq);
@ -8254,7 +8257,7 @@ void MainWindow::displayActivity(bool force){
// Command Activity // Command Activity
if(m_txFrameQueue.isEmpty() && !m_rxCommandQueue.isEmpty()){ if(m_txFrameQueue.isEmpty() && !m_rxCommandQueue.isEmpty()){
int f = ui->TxFreqSpinBox->value(); // ew int f = currentFreq();
bool processed = false; bool processed = false;

1
mainwindow.h
View File

@ -253,6 +253,7 @@ private slots:
void on_nextFreeTextMsg_currentTextChanged (QString const&); void on_nextFreeTextMsg_currentTextChanged (QString const&);
void on_extFreeTextMsg_currentTextChanged (QString const&); void on_extFreeTextMsg_currentTextChanged (QString const&);
void on_extFreeTextMsgEdit_currentTextChanged (QString const&); void on_extFreeTextMsgEdit_currentTextChanged (QString const&);
int currentFreq();
QPair<QStringList, QStringList> buildFT8MessageFrames(QString const& text); QPair<QStringList, QStringList> buildFT8MessageFrames(QString const& text);
QString parseFT8Message(QString input, bool *isFree); QString parseFT8Message(QString input, bool *isFree);
bool prepareNextMessageFrame(); bool prepareNextMessageFrame();