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

Correct a flaw in generating special messages, and one in converting dB to S-level.

Browse Source
This commit is contained in:
Joe Taylor 2018-07-29 09:26:03 -04:00
parent c0e7900af5
commit 5a68660b9a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mainwindow.cpp
View File

@ -4516,6 +4516,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
auto eme_short_codes = m_config.enable_VHF_features () && ui->cbShMsgs->isChecked () auto eme_short_codes = m_config.enable_VHF_features () && ui->cbShMsgs->isChecked ()
&& m_mode == "JT65"; && m_mode == "JT65";
QString t0=hisBase + " " + m_baseCall + " "; QString t0=hisBase + " " + m_baseCall + " ";
if(m_config.bGenerate77()) t0=hisCall + " " + my_callsign + " ";
QString t00=t0; QString t00=t0;
QString t {t0 + my_grid}; QString t {t0 + my_grid};
msgtype(t, ui->tx1); msgtype(t, ui->tx1);
@ -4524,7 +4525,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
msgtype("RO", ui->tx3); msgtype("RO", ui->tx3);
msgtype(m_send_RR73 ? "RR73" : "RRR", ui->tx4); msgtype(m_send_RR73 ? "RR73" : "RRR", ui->tx4);
msgtype("73", ui->tx5->lineEdit ()); msgtype("73", ui->tx5->lineEdit());
} else { } else {
int n=rpt.toInt(); int n=rpt.toInt();
rpt.sprintf("%+2.2d",n); rpt.sprintf("%+2.2d",n);
@ -4546,10 +4547,11 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
} }
QString rst; QString rst;
int nn=n/6+6; int nn=(n+36)/6;
if(nn<2) nn=2; if(nn<2) nn=2;
if(nn>9) nn=9; if(nn>9) nn=9;
rst.sprintf("5%1d9 ",nn); rst.sprintf("5%1d9 ",nn);
if(m_config.bRTTYroundup()) { if(m_config.bRTTYroundup()) {
t=t0 + rst + m_config.RTTYExchange(); //Use a real report t=t0 + rst + m_config.RTTYExchange(); //Use a real report
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
@ -4600,15 +4602,18 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
t=t0 + (m_send_RR73 ? "RR73" : "RRR"); t=t0 + (m_send_RR73 ? "RR73" : "RRR");
if ((m_mode=="JT4" || m_mode=="QRA64") && m_bShMsgs) t="@1500 (RRR)"; if ((m_mode=="JT4" || m_mode=="QRA64") && m_bShMsgs) t="@1500 (RRR)";
msgtype(t, ui->tx4); msgtype(t, ui->tx4);
if(m_config.bGenerate77()) return;
t=t0 + "73"; t=t0 + "73";
if (m_mode=="JT4" || m_mode=="QRA64") { if (m_mode=="JT4" || m_mode=="QRA64") {
if (m_bShMsgs) t="@1750 (73)"; if (m_bShMsgs) t="@1750 (73)";
msgtype(t, ui->tx5->lineEdit ()); msgtype(t, ui->tx5->lineEdit());
} else if ("MSK144" == m_mode && m_bShMsgs) { } else if ("MSK144" == m_mode && m_bShMsgs) {
msgtype(t, ui->tx5->lineEdit ()); msgtype(t, ui->tx5->lineEdit());
} else if (unconditional || hisBase != m_lastCallsign || !m_lastCallsign.size ()) { } else if(unconditional || hisBase != m_lastCallsign || !m_lastCallsign.size ()) {
// only update tx5 when forced or callsign changes // only update tx5 when forced or callsign changes
msgtype(t, ui->tx5->lineEdit ()); msgtype(t, ui->tx5->lineEdit());
m_lastCallsign = hisBase; m_lastCallsign = hisBase;
} }
} }