diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index add8391c1..89d86711d 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4227,7 +4227,7 @@ void MainWindow::guiUpdate() // Don't transmit another mode in the 30 m WSPR sub-band Frequency onAirFreq = m_freqNominal + ui->TxFreqSpinBox->value(); - if ((onAirFreq > 10139900 and onAirFreq < 10140320) and m_mode!="WSPR") { + if ((onAirFreq > 10139900 and onAirFreq < 10140320) and m_mode!="WSPR" and m_mode!="FST4W") { m_bTxTime=false; if (m_auto) auto_tx_mode (false); if(onAirFreq!=m_onAirFreq0) { @@ -8586,7 +8586,7 @@ void MainWindow::uploadWSPRSpots (bool direct_post, QString const& decode_text) wsprNet->abortOutstandingRequests (); m_uploading = false; } - QString rfreq = QString("%1").arg((m_dialFreqRxWSPR + m_wideGraph->rxFreq ()) / 1e6, 0, 'f', 6); + QString rfreq = QString("%1").arg((m_dialFreqRxWSPR + 1500) / 1e6, 0, 'f', 6); QString tfreq = QString("%1").arg((m_dialFreqRxWSPR + ui->TxFreqSpinBox->value()) / 1e6, 0, 'f', 6); auto pct = QString::number (ui->autoButton->isChecked () ? ui->sbTxPercent->value () : 0); diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp index 0153b8433..afa512ff2 100644 --- a/widgets/plotter.cpp +++ b/widgets/plotter.cpp @@ -595,7 +595,7 @@ void CPlotter::DrawOverlay() //DrawOverlay() painter0.drawLine(x2,yTxTop,x2,yTxTop+yh); } - if(m_dialFreq>10.13 and m_dialFreq< 10.15 and m_mode.mid(0,4)!="WSPR") { + if(m_dialFreq>10.13 and m_dialFreq< 10.15 and m_mode.mid(0,4)!="WSPR" and m_mode!="FST4W") { float f1=1.0e6*(10.1401 - m_dialFreq); float f2=f1+200.0; x1=XfromFreq(f1);