w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 21:57:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hound now transmits correctly.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-08 19:53:27 +00:00
parent 696af427e5
commit 1557b9cb99
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ft8/ft8b.f90
View File

@ -409,7 +409,8 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,
i2=index(message(i1+1:),' ') + i1 i2=index(message(i1+1:),' ') + i1
c1=message(1:i1)//' ' c1=message(1:i1)//' '
c2=message(i1+1:i2)//' ' c2=message(i1+1:i2)//' '
msg32=c1//' RR73; '//c2//' <'//trim(mycall6)//'> ' if(ncrc10.eq.icrc10) msg32=c1//' RR73; '//c2//' <'//trim(mycall6)//'> '
if(ncrc10.ne.icrc10) msg32=c1//' RR73; '//c2//' <...> '
write(msg32(30:32),1010) irpt write(msg32(30:32),1010) irpt
1010 format(i3.2) 1010 format(i3.2)
if(msg32(30:30).ne.'-') msg32(30:30)='+' if(msg32(30:30).ne.'-') msg32(30:30)='+'

31
mainwindow.cpp
View File

@ -900,7 +900,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_bDXped=false; m_bDXped=false;
if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or
m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "G3PQA") { m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ") {
m_bDXped=true; m_bDXped=true;
ui->actionWSPR_LF->setEnabled(true); ui->actionWSPR_LF->setEnabled(true);
} else { } else {
@ -2836,6 +2836,7 @@ void MainWindow::readFromStdout() //readFromStdout
decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid); decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid);
foxRxSequencer(houndCall,houndGrid); foxRxSequencer(houndCall,houndGrid);
} }
//Left (Band activity) window //Left (Band activity) window
if(!bAvgMsg) { if(!bAvgMsg) {
if(m_mode=="FT8" and m_config.bFox()) { if(m_mode=="FT8" and m_config.bFox()) {
@ -2879,6 +2880,7 @@ void MainWindow::readFromStdout() //readFromStdout
} else { } else {
if(abs(audioFreq - m_wideGraph->rxFreq()) <= 10) bDisplayRight=true; if(abs(audioFreq - m_wideGraph->rxFreq()) <= 10) bDisplayRight=true;
} }
if (bDisplayRight) { if (bDisplayRight) {
// This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg, // This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg,
// or contains MyCall // or contains MyCall
@ -2893,6 +2895,27 @@ void MainWindow::readFromStdout() //readFromStdout
} }
m_QSOText = decodedtext.string ().trimmed (); m_QSOText = decodedtext.string ().trimmed ();
} }
if(m_mode=="FT8" and m_config.bHound() and decodedtext.string().contains(";")) {
QStringList w=decodedtext.string().mid(24).split(" ");
QString foxCall=w.at(3);
foxCall=foxCall.remove("<").remove(">");
if(w.at(0)==m_config.my_callsign()) {
//### Check for ui->dxCallEntry->text()==foxCall and insert report received
//### and report sent before logging! ###
on_logQSOButton_clicked();
}
if(w.at(2)==m_config.my_callsign()) {
int fRx=decodedtext.string().mid(15,5).toInt();
m_rptRcvd=w.at(4);
m_rptSent=decodedtext.string().mid(7,3);
//### Select TX3, and set TxFreq = fRx + 350 Hz, and Force Auto ON. ###
ui->txrb3->setChecked(true);
ui->TxFreqSpinBox->setValue(fRx+350);
if(!m_auto) auto_tx_mode(true);
}
return;
}
if(m_mode=="FT8" or m_mode=="QRA64") auto_sequence (decodedtext, 25, 50); if(m_mode=="FT8" or m_mode=="QRA64") auto_sequence (decodedtext, 25, 50);
postDecode (true, decodedtext.string ()); postDecode (true, decodedtext.string ());
@ -2933,6 +2956,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size (); auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size ();
bool is_OK=false; bool is_OK=false;
if(m_mode=="MSK144" and message.string().indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true; if(m_mode=="MSK144" and message.string().indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true;
if (message_words.size () > 2 && (message.isStandardMessage () || (is_73 or is_OK))) { if (message_words.size () > 2 && (message.isStandardMessage () || (is_73 or is_OK))) {
auto df = message.frequencyOffset (); auto df = message.frequencyOffset ();
auto within_tolerance = auto within_tolerance =
@ -2946,7 +2970,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
|| message_words.contains (ui->dxCallEntry->text ()) || message_words.contains (ui->dxCallEntry->text ())
|| message_words.contains (Radio::base_callsign (ui->dxCallEntry->text ())) || message_words.contains (Radio::base_callsign (ui->dxCallEntry->text ()))
|| message_words.contains ("DE"))) || message_words.contains ("DE")))
|| !message.isStandardMessage ()); // free text 73/RR73 || !message.isStandardMessage ()); // free text 73/RR73
if (m_auto if (m_auto
&& (REPLYING == m_QSOProgress && (REPLYING == m_QSOProgress
|| (!ui->tx1->isEnabled () && REPORT == m_QSOProgress)) || (!ui->tx1->isEnabled () && REPORT == m_QSOProgress))
@ -2971,7 +2995,8 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
|| (m_bCallingCQ && m_bAutoReply || (m_bCallingCQ && m_bAutoReply
// look for type 2 compound call replies on our Tx and Rx offsets // look for type 2 compound call replies on our Tx and Rx offsets
&& ((within_tolerance && "DE" == message_words.at (1)) && ((within_tolerance && "DE" == message_words.at (1))
|| message_words.at (1).contains (m_baseCall))))) { || message_words.at (1).contains (m_baseCall)))))
{
if(!m_config.bFox()) processMessage (message); if(!m_config.bFox()) processMessage (message);
} }
} }