w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow for, and add where necessary, a second character after mode

Browse Source 
The decoded message processing relies on fixed column positions so the
extra character used in message  averaging to indicate sync flips must
also be allowed for in other modes.  This is done by inserting a space
character.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6681 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-05-17 19:35:38 +00:00
parent 6bbfb0e1f1
commit f398495cfc
4 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
displaytext.cpp
View File

@ -171,9 +171,10 @@ void DisplayText::displayTransmittedText(QString text, QString modeTx, qint32 tx
QColor color_TxMsg, bool bFastMode) QColor color_TxMsg, bool bFastMode)
{ {
QString bg=color_TxMsg.name(); QString bg=color_TxMsg.name();
QString t1=" @ "; QString t1=" @ ";
if(modeTx=="JT65") t1=" # "; if(modeTx=="JT4") t1=" $ ";
if(modeTx=="JTMSK") t1=" & "; if(modeTx=="JT65") t1=" # ";
if(modeTx=="JTMSK") t1=" & ";
QString t2; QString t2;
t2.sprintf("%4d",txFreq); t2.sprintf("%4d",txFreq);
QString t; QString t;

2
lib/fast9.f90
View File

@ -173,7 +173,7 @@ subroutine fast9(id2,narg,line)
!### Might want to use decoded message to get a complete estimate of S/N. !### Might want to use decoded message to get a complete estimate of S/N.
nline=nline+1 nline=nline+1
write(line(nline),1000) nutc,nsnr,t0,nint(freq),msg,char(0) write(line(nline),1000) nutc,nsnr,t0,nint(freq),msg,char(0)
1000 format(i6.6,i4,f5.1,i5,1x,'@',1x,a22,a1) 1000 format(i6.6,i4,f5.1,i5,1x,'@ ',1x,a22,a1)
ntot=ntot+1 ntot=ntot+1
! write(70,5001) nsaved,isave,nline,maxlines,ntot,nutc,msg ! write(70,5001) nsaved,isave,nline,maxlines,ntot,nutc,msg
!5001 format(5i5,i7.6,1x,a22) !5001 format(5i5,i7.6,1x,a22)

2
lib/jtmsk_decode.f90
View File

@ -100,7 +100,7 @@ subroutine jtmsk_decode(id2,narg,line)
if(msg(1:1).eq.'<') freq=freq2+idfpk if(msg(1:1).eq.'<') freq=freq2+idfpk
!### Check freq values !!! !### Check freq values !!!
write(line(nline),1020) nutc,nsnr,t0,nint(freq),msg write(line(nline),1020) nutc,nsnr,t0,nint(freq),msg
1020 format(i6.6,i4,f5.1,i5,' & ',a22) 1020 format(i6.6,i4,f5.1,i5,' & ',a22)
nsnr0=nsnr nsnr0=nsnr
go to 900 go to 900
endif endif

73
mainwindow.cpp
View File

@ -1854,7 +1854,10 @@ void MainWindow::decode() //decode()
} }
} }
dec_data.params.nfqso=m_wideGraph->rxFreq(); dec_data.params.nfqso=m_wideGraph->rxFreq();
dec_data.params.ndepth=m_ndepth; qint32 depth {m_ndepth};
if (!ui->actionInclude_averaging->isEnabled ()) depth &= ~16;
if (!ui->actionInclude_correlation->isEnabled ()) depth &= ~32;
dec_data.params.ndepth=depth;
dec_data.params.n2pass=1; dec_data.params.n2pass=1;
if(m_config.twoPass()) dec_data.params.n2pass=2; if(m_config.twoPass()) dec_data.params.n2pass=2;
dec_data.params.nranera=m_config.ntrials(); dec_data.params.nranera=m_config.ntrials();
@ -2917,6 +2920,20 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
auto t4 = t3.replace (" CQ DX ", " CQ_DX ").split (" ", QString::SkipEmptyParts); auto t4 = t3.replace (" CQ DX ", " CQ_DX ").split (" ", QString::SkipEmptyParts);
if(t4.size () < 6) return; //Skip the rest if no decoded text if(t4.size () < 6) return; //Skip the rest if no decoded text
int frequency = decodedtext.frequencyOffset();
if (ui->RxFreqSpinBox->isEnabled ())
{
ui->RxFreqSpinBox->setValue (frequency); //Set Rx freq
}
if (decodedtext.isTX())
{
if (ctrl && ui->TxFreqSpinBox->isEnabled ())
{
ui->TxFreqSpinBox->setValue(frequency); //Set Tx freq
}
return;
}
int nmod=ntsec % (2*m_TRperiod); int nmod=ntsec % (2*m_TRperiod);
m_txFirst=(nmod!=0); m_txFirst=(nmod!=0);
ui->txFirstCheckBox->setChecked(m_txFirst); ui->txFirstCheckBox->setChecked(m_txFirst);
@ -2937,23 +2954,22 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
// only allow automatic mode changes between JT9 and JT65, and when not transmitting // only allow automatic mode changes between JT9 and JT65, and when not transmitting
if (!m_transmitting and m_mode == "JT9+JT65") { if (!m_transmitting and m_mode == "JT9+JT65") {
if (decodedtext.isJT9()) if (decodedtext.isJT9())
{ {
m_modeTx="JT9"; m_modeTx="JT9";
ui->pbTxMode->setText("Tx JT9 @"); ui->pbTxMode->setText("Tx JT9 @");
m_wideGraph->setModeTx(m_modeTx); m_wideGraph->setModeTx(m_modeTx);
} else if (decodedtext.isJT65()) { } else if (decodedtext.isJT65()) {
m_modeTx="JT65"; m_modeTx="JT65";
ui->pbTxMode->setText("Tx JT65 #"); ui->pbTxMode->setText("Tx JT65 #");
m_wideGraph->setModeTx(m_modeTx); m_wideGraph->setModeTx(m_modeTx);
}
} else if ((decodedtext.isJT9 () and m_modeTx != "JT9" and m_mode != "JT4") or
(decodedtext.isJT65 () and m_modeTx != "JT65" and m_mode != "JT4")) {
// if we are not allowing mode change then don't process decode
return;
} }
} else if ((decodedtext.isJT9 () and m_modeTx != "JT9" and m_mode != "JT4") or
(decodedtext.isJT65 () and m_modeTx != "JT65" and m_mode != "JT4")) {
// if we are not allowing mode change then don't process decode
return;
}
int frequency = decodedtext.frequencyOffset();
QString firstcall = decodedtext.call(); QString firstcall = decodedtext.call();
if(!m_bFastMode) { if(!m_bFastMode) {
// Don't change Tx freq if in a fast mode; also not if a station is calling me, // Don't change Tx freq if in a fast mode; also not if a station is calling me,
@ -2978,19 +2994,6 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
m_QSOText=decodedtext; m_QSOText=decodedtext;
} }
if (ui->RxFreqSpinBox->isEnabled ())
{
ui->RxFreqSpinBox->setValue (frequency); //Set Rx freq
}
if (decodedtext.isTX())
{
if (ctrl && ui->TxFreqSpinBox->isEnabled ())
{
ui->TxFreqSpinBox->setValue(frequency); //Set Tx freq
}
return;
}
// prior DX call (possible QSO partner) // prior DX call (possible QSO partner)
auto qso_partner_base_call = Radio::base_callsign (ui->dxCallEntry-> text ().toUpper ().trimmed ()); auto qso_partner_base_call = Radio::base_callsign (ui->dxCallEntry-> text ().toUpper ().trimmed ());
@ -3599,8 +3602,8 @@ void MainWindow::on_actionJT9_triggered()
m_fastGraph->show(); m_fastGraph->show();
ui->TxFreqSpinBox->setValue(700); ui->TxFreqSpinBox->setValue(700);
ui->RxFreqSpinBox->setValue(700); ui->RxFreqSpinBox->setValue(700);
ui->decodedTextLabel->setText("UTC dB T Freq Message"); ui->decodedTextLabel->setText("UTC dB T Freq Message");
ui->decodedTextLabel2->setText("UTC dB T Freq Message"); ui->decodedTextLabel2->setText("UTC dB T Freq Message");
ui->sbTR->setVisible(true); ui->sbTR->setVisible(true);
} else { } else {
m_TRperiod=60; m_TRperiod=60;
@ -3645,8 +3648,8 @@ void MainWindow::on_actionJTMSK_triggered()
m_fastGraph->show(); m_fastGraph->show();
ui->TxFreqSpinBox->setValue(1500); ui->TxFreqSpinBox->setValue(1500);
ui->RxFreqSpinBox->setValue(1500); ui->RxFreqSpinBox->setValue(1500);
ui->decodedTextLabel->setText("UTC dB T Freq Message"); ui->decodedTextLabel->setText("UTC dB T Freq Message");
ui->decodedTextLabel2->setText("UTC dB T Freq Message"); ui->decodedTextLabel2->setText("UTC dB T Freq Message");
m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe
m_detector->setPeriod(m_TRperiod); // TODO - not thread safe m_detector->setPeriod(m_TRperiod); // TODO - not thread safe
m_wideGraph->setPeriod(m_TRperiod,m_nsps); m_wideGraph->setPeriod(m_TRperiod,m_nsps);
@ -5010,11 +5013,11 @@ void MainWindow::replayDecodes ()
void MainWindow::postDecode (bool is_new, QString const& message) void MainWindow::postDecode (bool is_new, QString const& message)
{ {
auto const& decode = message.trimmed (); auto const& decode = message.trimmed ();
auto const& parts = decode.left (21).split (' ', QString::SkipEmptyParts); auto const& parts = decode.left (22).split (' ', QString::SkipEmptyParts);
if (parts.size () >= 5) if (parts.size () >= 5)
{ {
m_messageClient->decode (is_new, QTime::fromString (parts[0], "hhmm"), parts[1].toInt () m_messageClient->decode (is_new, QTime::fromString (parts[0], "hhmm"), parts[1].toInt ()
, parts[2].toFloat (), parts[3].toUInt (), parts[4][0], decode.mid (21)); , parts[2].toFloat (), parts[3].toUInt (), parts[4][0], decode.mid (22));
} }
} }