mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-03-23 04:28:36 -04:00
Merge remote-tracking branch 'origin/sfox4' into sfox4_b2
This commit is contained in:
commit
a304177491
@ -4446,6 +4446,7 @@ void MainWindow::readFromStdout() //readFromStdout
|
||||
m_nFoxFreq=decodedtext.string().mid(16,4).toInt();
|
||||
hound_reply ();
|
||||
} else {
|
||||
if (SpecOp::HOUND==m_specOp && (text.mid(4,2).contains("15") or text.mid(4,2).contains("45"))) return; // ignore stations calling in the wrong time slot
|
||||
if (text.contains(" " + m_config.my_callsign() + " " + m_hisCall) && !text.contains("73 ")) processMessage(decodedtext0); // needed for MSHV multistream messages
|
||||
}
|
||||
}
|
||||
@ -5258,6 +5259,14 @@ void MainWindow::guiUpdate()
|
||||
// n64=n64/30;
|
||||
// n64=n64*30;
|
||||
// qDebug() << "bb" << m_config.FoxKey() << nsec%60 << dec_data.params.nutc << n64 << n64%60;
|
||||
|
||||
// prevent tuning on top of a SuperFox message
|
||||
if (SpecOp::HOUND==m_specOp && m_config.superFox() && m_tune) {
|
||||
QDateTime now = QDateTime::currentDateTimeUtc();
|
||||
int s = now.time().toString("ss").toInt();
|
||||
if ((s >= 0 && s < 15) || (s >= 30 && s < 45)) ui->tuneButton->click ();
|
||||
}
|
||||
|
||||
if(m_mode=="FST4") chk_FST4_freq_range();
|
||||
m_currentBand=m_config.bands()->find(m_freqNominal);
|
||||
if( SpecOp::HOUND == m_specOp ) {
|
||||
|
Loading…
Reference in New Issue
Block a user