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

ADIF v3.1.1 compliance

Browse Source 
Note that FST4 QSOs are logged with MODE=MFSK and SUBMODE=FST4. The
new bands 8m and 5m are recognized. The ADIF header is expanded with
program and time stamp information.
This commit is contained in:
Bill Somerville 2020-09-07 20:36:09 +01:00
parent 72cffc9da4
commit 8d48b44e9a
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
logbook/WorkedBefore.cpp
View File

@ -19,7 +19,9 @@
#include <QFileInfo> #include <QFileInfo>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include <QDateTime>
#include "Configuration.hpp" #include "Configuration.hpp"
#include "revision_utils.hpp"
#include "qt_helpers.hpp" #include "qt_helpers.hpp"
#include "pimpl_impl.hpp" #include "pimpl_impl.hpp"
@ -442,7 +444,18 @@ bool WorkedBefore::add (QString const& call
QTextStream out {&file}; QTextStream out {&file};
if (!file.size ()) if (!file.size ())
{ {
out << "WSJT-X ADIF Export<eoh>" << // new file auto ts = QDateTime::currentDateTimeUtc ().toString ("yyyyMMdd HHmmss");
auto ver = version (true);
out << // new file
QString {
"ADIF Export\n"
"<adif_ver:5>3.1.1\n"
"<created_timestamp:15>%0\n"
"<programid:6>WSJT-X\n"
"<programversion:%1>%2\n"
"<eoh>"
}.arg (ts).arg (ver.size ()).arg (ver)
<<
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
endl endl
#else #else

2
logbook/logbook.cpp
View File

@ -79,7 +79,7 @@ QByteArray LogBook::QSOToADIF (QString const& hisCall, QString const& hisGrid, Q
QString t; QString t;
t = "<call:" + QString::number(hisCall.size()) + ">" + hisCall; t = "<call:" + QString::number(hisCall.size()) + ">" + hisCall;
t += " <gridsquare:" + QString::number(hisGrid.size()) + ">" + hisGrid; t += " <gridsquare:" + QString::number(hisGrid.size()) + ">" + hisGrid;
if (mode != "FT4") if (mode != "FT4" && mode != "FST4")
{ {
t += " <mode:" + QString::number(mode.size()) + ">" + mode; t += " <mode:" + QString::number(mode.size()) + ">" + mode;
} }

2
models/Bands.cpp
View File

@ -28,7 +28,9 @@ namespace
{"15m", 21000000u, 21450000u}, {"15m", 21000000u, 21450000u},
{"12m", 24890000u, 24990000u}, {"12m", 24890000u, 24990000u},
{"10m", 28000000u, 29700000u}, {"10m", 28000000u, 29700000u},
{"8m", 40000000u, 45000000u},
{"6m", 50000000u, 54000000u}, {"6m", 50000000u, 54000000u},
{"5m", 54000001u, 69900000u},
{"4m", 70000000u, 71000000u}, {"4m", 70000000u, 71000000u},
{"2m", 144000000u, 148000000u}, {"2m", 144000000u, 148000000u},
{"1.25m", 222000000u, 225000000u}, {"1.25m", 222000000u, 225000000u},