w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-29 07:28:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clarify what VHF-enabled JT65 messages get sent to the right window.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7226 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-24 17:01:47 +00:00
parent 87d4f2fdbc
commit e4d10d4f19
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/CMakeLists.txt
View File

@ -69,6 +69,7 @@ set (UG_IMGS
images/file-menu.png images/file-menu.png
images/freemsg.png images/freemsg.png
images/help-menu.png images/help-menu.png
images/JT4F.png
images/jtalert.png images/jtalert.png
images/keyboard-shortcuts.png images/keyboard-shortcuts.png
images/log-qso.png images/log-qso.png

BIN
doc/user_guide/en/images/JT4F.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 89 KiB

12
doc/user_guide/en/vhf-features.adoc
View File

@ -112,14 +112,16 @@ is generally used for EME on the 5.7 and 10 GHz bands.
of a single tone. To activate automatic generation of these messages, of a single tone. To activate automatic generation of these messages,
check the box labeled *Sh*. check the box labeled *Sh*.
- Select *Deep* from the *Decode* menu. You may also choose to *Enable - Select *Deep* from the *Decode* menu. You may also choose to
averaging* over successive transmissions and/or correlation decoding, *Enable averaging* over successive transmissions and/or *Enable deep
*Enable deep Search*. Search* (correlation decoding).
image::decoding_depth.png[align="center",alt="Decoding Depth"] image::decoding_depth.png[align="center",alt="Decoding Depth"]
IMPORTANT: Additional hints for using JT4 and Echo mode on the The following screen shot shows one transmission from a 10 GHz EME
*EME path have been compiled by G3WDG and are available here: {jt4eme}. QSO using submode JT4F.
image::JT4F.png[align="center",alt="JT4F"]
=== JT65 === JT65

30
mainwindow.cpp
View File

@ -2366,22 +2366,7 @@ void MainWindow::readFromStdout() //readFromStdout
QByteArray t=proc_jt9.readLine(); QByteArray t=proc_jt9.readLine();
bool bAvgMsg=false; bool bAvgMsg=false;
int navg=0; int navg=0;
if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64") {
int n=t.indexOf("f");
if(n<0) n=t.indexOf("d");
if(n>0) {
QString tt=t.mid(n+1,1);
navg=tt.toInt();
if(navg==0) {
char c = tt.data()->toLatin1();
if(int(c)>=65 and int(c)<=90) navg=int(c)-54;
}
if(navg>1 or t.indexOf("f*")>0) bAvgMsg=true;
}
}
if(t.indexOf("<DecodeFinished>") >= 0) { if(t.indexOf("<DecodeFinished>") >= 0) {
//###
if(m_mode=="QRA64") { if(m_mode=="QRA64") {
char name[512]; char name[512];
QString fname=m_config.temp_dir ().absoluteFilePath ("red.dat"); QString fname=m_config.temp_dir ().absoluteFilePath ("red.dat");
@ -2398,14 +2383,25 @@ void MainWindow::readFromStdout() //readFromStdout
} }
} }
//###
m_bDecoded = t.mid (20).trimmed ().toInt () > 0; m_bDecoded = t.mid (20).trimmed ().toInt () > 0;
if(!m_diskData) killFileTimer.start (3*1000*m_TRperiod/4); //Kill in 45 s if(!m_diskData) killFileTimer.start (3*1000*m_TRperiod/4); //Kill in 45 s
decodeDone (); decodeDone ();
m_startAnother=m_loopall; m_startAnother=m_loopall;
return; return;
} else { } else {
if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64") {
int n=t.indexOf("f");
if(n<0) n=t.indexOf("d");
if(n>0) {
QString tt=t.mid(n+1,1);
navg=tt.toInt();
if(navg==0) {
char c = tt.data()->toLatin1();
if(int(c)>=65 and int(c)<=90) navg=int(c)-54;
}
if(navg>1 or t.indexOf("f*")>0) bAvgMsg=true;
}
}
QFile f {m_dataDir.absoluteFilePath ("ALL.TXT")}; QFile f {m_dataDir.absoluteFilePath ("ALL.TXT")};
if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) { if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) {
QTextStream out(&f); QTextStream out(&f);