w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display "OOO" at end of Tx message in status bar. Correct the logic for regenerating standard messages when "Enable VHF features" is changed. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7324 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-11-21 15:46:17 +00:00
parent c8d7421ead
commit 14d44f483b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gen65.f90
View File

@ -46,6 +46,8 @@ subroutine gen65(msg0,ichk,msgsent,itone,itype)
if(nspecial.eq.0) then
call packmsg(message,dgen,itype) !Pack message into 72 bits
call unpackmsg(dgen,msgsent) !Unpack to get message sent
msgsent(20:22)=cok
call fmtmsg(msgsent,iz)
if(ichk.ne.0) go to 999 !Return if checking only
call rs_encode(dgen,sent) !Apply Reed-Solomon code

10
mainwindow.cpp
View File

@ -1389,7 +1389,7 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
{
// things that might change that we need know about
auto callsign = m_config.my_callsign ();
bool bvhf0=m_config.enable_VHF_features();
if (QDialog::Accepted == m_config.exec ()) {
if (m_config.my_callsign () != callsign) {
m_baseCall = Radio::base_callsign (m_config.my_callsign ());
@ -1427,7 +1427,10 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
if(m_mode=="JT4") on_actionJT4_triggered();
if(m_mode=="JT9") on_actionJT9_triggered();
if(m_mode=="JT9+JT65") on_actionJT9_JT65_triggered();
if(m_mode=="JT65") on_actionJT65_triggered();
if(m_mode=="JT65") {
on_actionJT65_triggered();
if(m_config.enable_VHF_features() != bvhf0) genStdMsgs(m_rpt);
}
if(m_mode=="QRA64") on_actionQRA64_triggered();
if(m_mode=="ISCAT") on_actionISCAT_triggered();
if(m_mode=="MSK144") on_actionMSK144_triggered();
@ -3539,8 +3542,7 @@ void MainWindow::genStdMsgs(QString rpt)
QString t00=t0;
t=t0 + m_config.my_grid ().mid(0,4);
msgtype(t, ui->tx1);
if(ui->cbShMsgs->isVisible() and ui->cbShMsgs->isChecked() and
m_mode=="JT65") {
if(m_config.enable_VHF_features() and ui->cbShMsgs->isChecked() and m_mode=="JT65") {
t=t+" OOO";
msgtype(t, ui->tx2);
msgtype("RO", ui->tx3);