Fix a flaw in FT4 auto-sequencing.

This commit is contained in:
Joe Taylor 2019-04-03 11:13:47 -04:00
parent 50d4120c0c
commit f24d45cb17

View File

@ -3051,7 +3051,7 @@ void MainWindow::readFromStdout() //readFromStdout
} }
return; return;
} else { } else {
if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64" or m_mode=="FT8") { if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64" or m_mode=="FT8" or m_mode=="FT4") {
int n=line_read.indexOf("f"); int n=line_read.indexOf("f");
if(n<0) n=line_read.indexOf("d"); if(n<0) n=line_read.indexOf("d");
if(n>0) { if(n>0) {
@ -3114,7 +3114,7 @@ void MainWindow::readFromStdout() //readFromStdout
if(m_mode=="FT8" or m_mode=="FT4") { if(m_mode=="FT8" or m_mode=="FT4") {
auto const& parts = decodedtext.string().remove("<").remove(">") auto const& parts = decodedtext.string().remove("<").remove(">")
.split (' ', QString::SkipEmptyParts); .split (' ', QString::SkipEmptyParts);
if (parts.size () > 6) { if (parts.size() > 6) {
auto for_us = parts[5].contains (m_baseCall) auto for_us = parts[5].contains (m_baseCall)
|| ("DE" == parts[5] && qAbs (ui->RxFreqSpinBox->value () - audioFreq) <= 10); || ("DE" == parts[5] && qAbs (ui->RxFreqSpinBox->value () - audioFreq) <= 10);
if(m_baseCall==m_config.my_callsign() and m_baseCall!=parts[5]) for_us=false; if(m_baseCall==m_config.my_callsign() and m_baseCall!=parts[5]) for_us=false;
@ -3192,7 +3192,7 @@ void MainWindow::readFromStdout() //readFromStdout
//### I think this is where we are preventing Hounds from spotting Fox ### //### I think this is where we are preventing Hounds from spotting Fox ###
if(m_mode!="FT8" or (SpecOp::HOUND != m_config.special_op_id())) { if(m_mode!="FT8" or (SpecOp::HOUND != m_config.special_op_id())) {
if(m_mode=="FT8" or m_mode=="QRA64" or m_mode=="JT4" or m_mode=="JT65" or m_mode=="JT9") { if(m_mode=="FT8" or m_mode=="FT4" or m_mode=="QRA64" or m_mode=="JT4" or m_mode=="JT65" or m_mode=="JT9") {
auto_sequence (decodedtext, 25, 50); auto_sequence (decodedtext, 25, 50);
} }