w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-26 02:20:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow FST4W transmissions on 30m. Ensure that correct frequency is reported to WSPRnet for FST4W decodes when Rx spin box frequency is not 1500 Hz.

Browse Source
This commit is contained in:
k9an 2022-08-02 11:57:24 -05:00
parent 5b52b30d56
commit 8eec2b58c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
widgets/mainwindow.cpp
View File

@ -4227,7 +4227,7 @@ void MainWindow::guiUpdate()
// Don't transmit another mode in the 30 m WSPR sub-band // Don't transmit another mode in the 30 m WSPR sub-band
Frequency onAirFreq = m_freqNominal + ui->TxFreqSpinBox->value(); 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; m_bTxTime=false;
if (m_auto) auto_tx_mode (false); if (m_auto) auto_tx_mode (false);
if(onAirFreq!=m_onAirFreq0) { if(onAirFreq!=m_onAirFreq0) {
@ -8586,7 +8586,7 @@ void MainWindow::uploadWSPRSpots (bool direct_post, QString const& decode_text)
wsprNet->abortOutstandingRequests (); wsprNet->abortOutstandingRequests ();
m_uploading = false; 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 + QString tfreq = QString("%1").arg((m_dialFreqRxWSPR +
ui->TxFreqSpinBox->value()) / 1e6, 0, 'f', 6); ui->TxFreqSpinBox->value()) / 1e6, 0, 'f', 6);
auto pct = QString::number (ui->autoButton->isChecked () ? ui->sbTxPercent->value () : 0); auto pct = QString::number (ui->autoButton->isChecked () ? ui->sbTxPercent->value () : 0);

2
widgets/plotter.cpp
View File

@ -595,7 +595,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
painter0.drawLine(x2,yTxTop,x2,yTxTop+yh); 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 f1=1.0e6*(10.1401 - m_dialFreq);
float f2=f1+200.0; float f2=f1+200.0;
x1=XfromFreq(f1); x1=XfromFreq(f1);