diff --git a/doc/common/license.adoc b/doc/common/license.adoc index 9334b8edb..bc62060c7 100755 --- a/doc/common/license.adoc +++ b/doc/common/license.adoc @@ -29,7 +29,7 @@ the following copyright notice prominently: *The algorithms, source code, look-and-feel of _{prog}_ and related programs, and protocol specifications for the modes FSK441, FT4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, and MSK144 are Copyright (C) -2001-2019 by one or more of the following authors: Joseph Taylor, +2001-2020 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.* diff --git a/doc/common/links.adoc b/doc/common/links.adoc index 7cf3b8218..ece5a7604 100644 --- a/doc/common/links.adoc +++ b/doc/common/links.adoc @@ -68,6 +68,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :fmt_k5cm: http://www.k5cm.com/[FMT Event Info] :fmt_wspr: http://www.physics.princeton.edu/pulsar/K1JT/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup] :ft4_protocol: http://physics.princeton.edu/pulsar/k1jt/FT4_Protocol.pdf[The FT4 Protocol for Digital Contesting] +:ft4_ft8_protocols: http://physics.princeton.edu/pulsar/k1jt/FT4_FT8_with_figs.pdf[The FT4 and FT8 Communication Protocols] :ft8_tips: http://www.g4ifb.com/FT8_Hinson_tips_for_HF_DXers.pdf[FT8 Operating Guide] :ft8_DXped: http://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode] :gnu_gpl: http://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License] diff --git a/doc/user_guide/en/acknowledgements.adoc b/doc/user_guide/en/acknowledgements.adoc index 2afa8e7a5..a5ab8b7c7 100644 --- a/doc/user_guide/en/acknowledgements.adoc +++ b/doc/user_guide/en/acknowledgements.adoc @@ -1,19 +1,21 @@ // Status=review -The _WSJT_ project was started in 2001. Since 2005 it has been an -Open Source project, and it now includes programs _WSJT_, _MAP65_, -_WSPR_, _WSJT-X_, and _WSPR-X_. All code is licensed under the -GNU Public License (GPL). Many users of these programs, too numerous -to mention here individually, have contributed suggestions and advice -that have greatly aided the development of _WSJT_ and its sister -programs. +The _WSJT_ project was started by *K1JT* in 2001. Since 2005 it has +been an Open Source project, which now includes the programs _WSJT_, +_MAP65_, _WSPR_, _WSJT-X_, and _WSPR-X_. *G4WJS* (since 2013) and +*K9AN* (since 2015) have made major contributions to _WSJT-X_. +Together with K1JT they now form the core development team. -For _WSJT-X_ in particular, we acknowledge contributions from *AC6SL, -AE4JY, DJ0OT, G3WDG, G4KLA, G4WJS, IV3NWV, IW3RAB, K3WYC, K9AN, -KA6MAL, KA9Q, KB1ZMX, KD6EKQ, KI7MT, KK1D, ND0B, PY2SDR, VE1SKY, VK3ACF, -VK4BDJ, VK7MO, W4TI, W4TV, and W9MDB*. Each of these amateurs has helped to -bring the program’s design, code, testing, and/or documentation to -its present state. +All code in the _WSJT_ project is licensed under the GNU Public +License (GPL). Many users of these programs, too numerous to mention +here individually, have contributed suggestions and advice that have +greatly aided the development of _WSJT_ and its sister programs. For +_WSJT-X_ in particular, we acknowledge contributions from *AC6SL, +AE4JY, DJ0OT, G3WDG, G4KLA, IV3NWV, IW3RAB, K3WYC, KA6MAL, KA9Q, +KB1ZMX, KD6EKQ, KI7MT, KK1D, ND0B, PY2SDR, VE1SKY, VK3ACF, VK4BDJ, +VK7MO, W4TI, W4TV, and W9MDB*. Each of these amateurs has helped to +bring the program’s design, code, testing, and/or documentation to its +present state. Most of the color palettes for the _WSJT-X_ waterfall were copied from the excellent, well documented, open-source program _fldigi_, by *W1HKJ* diff --git a/doc/user_guide/en/decoder_notes.adoc b/doc/user_guide/en/decoder_notes.adoc index 89428c216..4227b408c 100644 --- a/doc/user_guide/en/decoder_notes.adoc +++ b/doc/user_guide/en/decoder_notes.adoc @@ -26,7 +26,7 @@ hypothetically known information. [[FT8_AP_INFO_TABLE]] .FT4 and FT8 AP information types -[width="35%",cols="h10,>), and is based on the average of 2 transmissions. You might wish to experiment with other combinations of entries for *My Call*, *DX Call*, and *DX Grid*, and with toggling the various -options of the *Decode* menu on and off. +options of the *Decode* menu on and off. For best sensitivity, most +users will want to use *Deep* decoding with *Enable averaging*, +*Enable deep search*, and *Enable AP* all turned on. diff --git a/doc/user_guide/en/wsjtx-main.adoc b/doc/user_guide/en/wsjtx-main.adoc index a3cea81e0..c20bf4c9c 100644 --- a/doc/user_guide/en/wsjtx-main.adoc +++ b/doc/user_guide/en/wsjtx-main.adoc @@ -68,8 +68,7 @@ include::install-from-source.adoc[] Select *Settings* from the *File* menu or by typing *F2*. (On Macintosh select *Preferences* from the _WSJT-X_ menu, or use the keyboard shortcut *Cmd+,*). The following sections describe setup -options available on each of eight tabs selectable near the top of the -window. +options available on eight tabs selectable near the top of the window. [[GENERAL]] === General diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90 index 4d51e421a..6be8a0841 100644 --- a/lib/77bit/packjt77.f90 +++ b/lib/77bit/packjt77.f90 @@ -534,6 +534,7 @@ subroutine unpack77(c77,nrx,msg,unpk77_success) read(c77,1060) n12,n22,ir,irpt,iserial,igrid6 1060 format(b12,b22,b1,b3,b11,b25) call hash12(n12,call_1) + if(n12.eq.hashmy12) call_1='<'//trim(mycall13)//'>' call hash22(n22,call_2) nrs=52+irpt write(cexch,1022) nrs,iserial diff --git a/shortcuts.txt b/shortcuts.txt index c858f0639..d74f860fd 100644 --- a/shortcuts.txt +++ b/shortcuts.txt @@ -37,8 +37,9 @@ Ctrl+O Open a .wav file Alt+O Change operator Alt+Q Log QSO - Ctrl+R Set Tx4 message to RRR + Ctrl+R Set Tx4 message to RRR (not in FT4) Alt+R Set Tx4 message to RR73 Alt+S Stop monitoring - Alt+T Tune + Alt+T Toggle Tune status + Alt+Z Clear hung decoder status diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index ed5a0cf0e..7399fbe32 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -5134,7 +5134,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional) } if(SpecOp::EU_VHF==m_config.special_op_id()) { QString a; - t="<" + t0.split(" ").at(0) + "> <" + t0.split(" ").at(1) + "> "; + t="<" + t0s.split(" ").at(0) + "> <" + t0s.split(" ").at(1) + "> "; a = a.asprintf("%4.4d ",ui->sbSerialNumber->value()); sent=rs + a + m_config.my_grid(); } diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp index b4aecbde5..c5ade99a5 100644 --- a/widgets/plotter.cpp +++ b/widgets/plotter.cpp @@ -488,6 +488,9 @@ void CPlotter::DrawOverlay() //DrawOverlay() painter0.drawLine(x1,24,x1,30); } + int yh=5; + int yTxTop=12; + int yRxBottom=yTxTop + 2*yh + 4; if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or m_mode=="QRA64" or m_mode=="FT8" or m_mode=="FT4") { @@ -513,12 +516,14 @@ void CPlotter::DrawOverlay() //DrawOverlay() painter0.drawLine(x6,24,x6,30); } else { + // Draw the green "goal post" painter0.setPen(penGreen); x1=XfromFreq(m_rxFreq); x2=XfromFreq(m_rxFreq+bw); - painter0.drawLine(x1,24,x1,30); - painter0.drawLine(x1,28,x2,28); - painter0.drawLine(x2,24,x2,30); + painter0.drawLine(x1,yRxBottom-yh,x1,yRxBottom); + painter0.drawLine(x1,yRxBottom,x2,yRxBottom); + painter0.drawLine(x2,yRxBottom-yh,x2,yRxBottom); + } } @@ -538,9 +543,10 @@ void CPlotter::DrawOverlay() //DrawOverlay() x1=XfromFreq(m_txFreq-0.5*bw); x2=XfromFreq(m_txFreq+0.5*bw); } - painter0.drawLine(x1,17,x1,21); - painter0.drawLine(x1,17,x2,17); - painter0.drawLine(x2,17,x2,21); + // Draw the red "goal post" + painter0.drawLine(x1,yTxTop,x1,yTxTop+yh); + painter0.drawLine(x1,yTxTop,x2,yTxTop); + painter0.drawLine(x2,yTxTop,x2,yTxTop+yh); } if(m_mode=="JT9+JT65") { diff --git a/widgets/widgets.pri b/widgets/widgets.pri index 3c2cb2444..4ff058c66 100644 --- a/widgets/widgets.pri +++ b/widgets/widgets.pri @@ -9,8 +9,8 @@ SOURCES += \ widgets/colorhighlighting.cpp widgets/ExportCabrillo.cpp \ widgets/AbstractLogWindow.cpp \ widgets/FrequencyLineEdit.cpp widgets/FrequencyDeltaLineEdit.cpp \ - widgets/FoxLogWindow.cpp widgets/CabrilloLogWindow.cpp - + widgets/FoxLogWindow.cpp widgets/CabrilloLogWindow.cpp \ + widgets/HelpTextWindow.cpp HEADERS += \ widgets/mainwindow.h widgets/plotter.h \ widgets/about.h widgets/widegraph.h \ @@ -21,7 +21,7 @@ HEADERS += \ widgets/fastplot.h widgets/MessageBox.hpp widgets/colorhighlighting.h \ widgets/ExportCabrillo.h widgets/AbstractLogWindow.hpp \ widgets/FoxLogWindow.hpp widgets/CabrilloLogWindow.hpp \ - widgets/DateTimeEdit.hpp + widgets/DateTimeEdit.hpp widgets/HelpTextWindow.hpp FORMS += \ widgets/mainwindow.ui widgets/about.ui \