From b2e2b91d31c374e68e3403bdb2565cb5e5f0b4d9 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Fri, 20 Jul 2018 22:17:41 -0400
Subject: [PATCH] Refactored get current frequency

---
 mainwindow.cpp | 23 +++++++++++++----------
 mainwindow.h   |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8c04c6c..8416910 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -5358,8 +5358,7 @@ void MainWindow::createMessageTransmitQueue(QString const& text){
   m_txFrameQueue.append(frames);
   m_txFrameCount = frames.length();
 
-  // TODO: jsherer - ew
-  int freq = ui->TxFreqSpinBox->value();
+  int freq = currentFreq();
   logRxTxMessageText(QDateTime::currentDateTimeUtc(), false, lines.join(""), freq, true);
 }
 
@@ -5445,6 +5444,10 @@ QString trimWithPeriods(QString value){
     return value;
 }
 
+int MainWindow::currentFreq(){
+    return ui->RxFreqSpinBox->value();
+}
+
 QPair<QStringList, QStringList> MainWindow::buildFT8MessageFrames(QString const& text){
     QStringList frames;
     QStringList lines;
@@ -5708,9 +5711,9 @@ void MainWindow::prepareBeacon(){
     }
 
     int bw = 50 + 5;
-    int f = ui->TxFreqSpinBox->value(); // TODO: jsherer - ew
+    int f = currentFreq();
     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
@@ -6835,7 +6838,7 @@ void MainWindow::on_replyMacroButton_clicked(){
         return;
     }
 
-    int offset = ui->RxFreqSpinBox->value();
+    int offset = currentFreq();
     if(m_bandActivity.contains(offset)){
         auto activity = m_bandActivity[offset].last();
         if(!activity.firstCall.isEmpty()){
@@ -6865,7 +6868,7 @@ void MainWindow::on_snrMacroButton_clicked(){
         return;
     }
 
-    int offset = ui->RxFreqSpinBox->value();
+    int offset = currentFreq();
     if(m_bandActivity.contains(offset)){
         int snr = m_bandActivity[offset].last().snr;
         addMessageText(Varicode::formatSNR(snr));
@@ -7297,10 +7300,10 @@ void MainWindow::setFreq4(int rxFreq, int txFreq)
       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()){
-    rxFreq = qMax(450, rxFreq);
-    txFreq = qMax(450, txFreq);
+    rxFreq = qMax(500, rxFreq);
+    txFreq = qMax(500, txFreq);
   }
 
   if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq);
@@ -8254,7 +8257,7 @@ void MainWindow::displayActivity(bool force){
   // Command Activity
 
   if(m_txFrameQueue.isEmpty() && !m_rxCommandQueue.isEmpty()){
-    int f = ui->TxFreqSpinBox->value(); // ew
+    int f = currentFreq();
 
     bool processed = false;
 
diff --git a/mainwindow.h b/mainwindow.h
index aee3425..47ccd41 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -253,6 +253,7 @@ private slots:
   void on_nextFreeTextMsg_currentTextChanged (QString const&);
   void on_extFreeTextMsg_currentTextChanged (QString const&);
   void on_extFreeTextMsgEdit_currentTextChanged (QString const&);
+  int currentFreq();
   QPair<QStringList, QStringList> buildFT8MessageFrames(QString const& text);
   QString parseFT8Message(QString input, bool *isFree);
   bool prepareNextMessageFrame();