w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-31 05:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

1. Fix the nfqso < nf1 but in qra64.f90.

Browse Source 
2. Delay splash screen until after main window starts.
3. Keep cbTxLock enabled in QRA64 mode.
4. Update v1.7_Features.txt.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7005 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-08-05 14:14:24 +00:00
parent 602995e66f
commit 0b42031c2e
4 changed files with 63 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/qra64a.f90
View File

@ -20,6 +20,7 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mode64,mycall_12,hiscall_12, &
data nc1z/-1/,nc2z/-1/,ng2z/-1/ data nc1z/-1/,nc2z/-1/,ng2z/-1/
save save
if(nfqso.lt.nf1 .or. nfqso.gt.nf2) go to 900
nft=99 nft=99
nsnr=-30 nsnr=-30
mycall=mycall_12(1:6) !### May need fixing ### mycall=mycall_12(1:6) !### May need fixing ###

53
mainwindow.cpp
View File

@ -853,33 +853,13 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
statusChanged(); statusChanged();
//### TEMPORARY MESSAGE TO USERS ###
MessageBox::information_message (this,
"<h2>" + QString {"Alpha Release: WSJT-X v" +
QCoreApplication::applicationVersion() + " " +
revision ()}.simplified () + "</h2>"
"V1.7 has many new features, most aimed at VHF/UHF/Microwave users.<br />"
"Some are not yet described in the User Guide and may not be thoroughly<br />"
"tested. Click on the link at bottom for a brief description.<br /><br />"
"As a test user you have an obligation to report anomalous results<br />"
"to the development team. We are particularly interested in tests<br />"
"of experimental modes QRA64 (intended for EME) and MSK144<br />"
"(intended for meteor scatter).<br /><br />"
"Send reports to wsjtgroup@yahoogroups.com, and be sure to save .wav<br />"
"files where appropriate.<br /><br />"
"<a href=" WSJTX_STRINGIZE (PROJECT_HOMEPAGE) ">"
"<img src=\":/icon_128x128.png\" /></a>"
"<a href=\"http://physics.princeton.edu/pulsar/k1jt/v1.7_Features.txt\">"
"<img src=\":/gpl-v3-logo.svg\" height=\"80\" /><br />"
"http://physics.princeton.edu/pulsar/k1jt/v1.7_Features.txt</a>");
//###
m_wideGraph->setMode(m_mode); m_wideGraph->setMode(m_mode);
m_wideGraph->setModeTx(m_modeTx); m_wideGraph->setModeTx(m_modeTx);
connect (&minuteTimer, &QTimer::timeout, this, &MainWindow::on_the_minute); connect (&minuteTimer, &QTimer::timeout, this, &MainWindow::on_the_minute);
minuteTimer.setSingleShot (true); minuteTimer.setSingleShot (true);
minuteTimer.start (ms_minute_error () + 60 * 1000); minuteTimer.start (ms_minute_error () + 60 * 1000);
m_bSplash=true;
// this must be the last statement of constructor // this must be the last statement of constructor
if (!m_valid) throw std::runtime_error {"Fatal initialization exception"}; if (!m_valid) throw std::runtime_error {"Fatal initialization exception"};
@ -2569,6 +2549,30 @@ void MainWindow::guiUpdate()
double txDuration; double txDuration;
QString rt; QString rt;
//### TEMPORARY MESSAGE TO USERS ###
if(m_bSplash) {
MessageBox::information_message (this,
"<h2>" + QString {"Alpha Release: WSJT-X v" +
QCoreApplication::applicationVersion() + " " +
revision ()}.simplified () + "</h2>"
"V1.7 has many new features, most aimed at VHF/UHF/Microwave users.<br />"
"Some are not yet described in the User Guide and may not be thoroughly<br />"
"tested. Click on the link at bottom for a brief description.<br /><br />"
"As a test user you have an obligation to report anomalous results<br />"
"to the development team. We are particularly interested in tests<br />"
"of experimental modes QRA64 (intended for EME) and MSK144<br />"
"(intended for meteor scatter).<br /><br />"
"Send reports to wsjtgroup@yahoogroups.com, and be sure to save .wav<br />"
"files where appropriate.<br /><br />"
"<a href=" WSJTX_STRINGIZE (PROJECT_HOMEPAGE) ">"
"<img src=\":/icon_128x128.png\" /></a>"
"<a href=\"http://physics.princeton.edu/pulsar/k1jt/v1.7_Features.txt\">"
"<img src=\":/gpl-v3-logo.svg\" height=\"80\" /><br />"
"http://physics.princeton.edu/pulsar/k1jt/v1.7_Features.txt</a>");
m_bSplash=false;
}
//###
if(m_TRperiod==0) m_TRperiod=60; if(m_TRperiod==0) m_TRperiod=60;
txDuration=0.0; txDuration=0.0;
if(m_modeTx=="JT4") txDuration=1.0 + 207.0*2520/11025.0; // JT4 if(m_modeTx=="JT4") txDuration=1.0 + 207.0*2520/11025.0; // JT4
@ -4040,6 +4044,7 @@ void MainWindow::on_actionQRA64_triggered()
ui->sbSubmode->setValue(0); ui->sbSubmode->setValue(0);
ui->sbTR->setValue(0); ui->sbTR->setValue(0);
} }
ui->cbTxLock->setEnabled(true);
} }
void MainWindow::on_actionJT65_triggered() void MainWindow::on_actionJT65_triggered()
@ -5108,8 +5113,10 @@ void MainWindow::transmitDisplay (bool transmitting)
// ui->TxFreqSpinBox->setEnabled (false); // ui->TxFreqSpinBox->setEnabled (false);
ui->TxFreqSpinBox->setEnabled (true); ui->TxFreqSpinBox->setEnabled (true);
//### //###
ui->cbTxLock->setChecked(false); if(m_mode!="QRA64") {
ui->cbTxLock->setEnabled(false); ui->cbTxLock->setChecked(false);
ui->cbTxLock->setEnabled(false);
}
} else { } else {
ui->TxFreqSpinBox->setEnabled (QSY_allowed and !m_bFastMode); ui->TxFreqSpinBox->setEnabled (QSY_allowed and !m_bFastMode);
ui->pbR2T->setEnabled (QSY_allowed); ui->pbR2T->setEnabled (QSY_allowed);

1
mainwindow.h
View File

@ -412,6 +412,7 @@ private:
bool m_bDoubleClickAfterCQnnn; bool m_bDoubleClickAfterCQnnn;
bool m_bRefSpec; bool m_bRefSpec;
bool m_bUseRef; bool m_bUseRef;
bool m_bSplash;
float m_pctZap; float m_pctZap;
int m_ihsym; int m_ihsym;
int m_nzap; int m_nzap;

56
v1.7_Features.txt
View File

@ -19,23 +19,24 @@ New Modes
1. MSK144 is intended for meteor scatter at 50 MHz and higher. 1. MSK144 is intended for meteor scatter at 50 MHz and higher.
Designed and tested by K9AN and K1JT, it uses a low-density parity Designed and tested by K9AN and K1JT, it uses a low-density parity
check code (LDPC) -- one of the latest-and-greatest areas of active check code (LDPC) -- one of the latest-and-greatest areas of active
research in comminucation theory. research in communication theory.
MSK144 is a direct descendant of JTMSK with a number of improvements MSK144 is a direct descendant of JTMSK with a number of improvements
for better performance on weak and short meteor pings. The effective for better performance on weak and short meteor pings. The effective
character transmission rate is about 250 cps, compared with 147 cps character transmission rate is about 250 cps, compared with 147 cps
for FSK441. Like JT4, JT9, JT65, and JTMSK, MSK144 uses strong for FSK441 and 154 cps for JTMSK. Like JT4, JT9, JT65, and JTMSK,
forward error correction, so message decoding is essentially "all or MSK144 uses strong forward error correction, so message decoding is
nothing". You will see little or no "garbage" on your screen. essentially "all or nothing". You will see little or no garbage on
your screen.
Standard MSK144 message frames are 72 ms long, compared to 117 ms for Standard MSK144 message frames are 72 ms long, compared to 117 ms for
JTMSK. The MSK144 waveform allows coherent demodulation for up to 3 JTMSK. The MSK144 waveform allows coherent demodulation, allowing up
dB better sensitivity. After QSO partners have exchanged callsigns, to 3 dB better sensitivity. After QSO partners have exchanged
MSK144 user can use even shorter messages, only 20 ms long. As in all callsigns, MSK144 user can use even shorter messages, only 20 ms long.
the fast modes in WSJT-X, the 20 ms or 72 ms messages are repeated As in all the fast modes in WSJT-X, the 20 ms or 72 ms messages are
without gaps for the duration of a transmission cycle. For most repeated without gaps for the duration of a transmission cycle. For
purposes we recommend a T/R cycle duration of 15 s, but 5 s and 10 s most purposes we recommend a T/R cycle duration of 15 s, but 5 s and
sequences are also supported. 10 s sequences are also supported.
An MSK144 signal occupies the full bandwidth of a typical SSB An MSK144 signal occupies the full bandwidth of a typical SSB
transmitter, so transmissions are always centered at an offset of transmitter, so transmissions are always centered at an offset of
@ -44,14 +45,15 @@ should be set to provide the flattest possible response over at least
300 - 2700 Hz. The maximum permissible frequency offset between you 300 - 2700 Hz. The maximum permissible frequency offset between you
and your QSO partner is ± 200 Hz, and less is better. and your QSO partner is ± 200 Hz, and less is better.
2. QRA64 is a designed for EME and other weak-signal use. Its 2. QRA64 is a intended for EME and other weak-signal use. Its
internal code was designed by Nico Palermo, IV3NWV. It uses a "Q-ary internal code was designed by Nico Palermo, IV3NWV, and implemented in
Repeat Accumulate" code, another one of the latest research areas in WSJT-X by K1JT. The protocol uses a "Q-ary Repeat Accumulate" code,
communication theory. The QRA64 code is inherently better than the another one of the latest research areas in communication theory. The
Reed Solomon (63,12) code used in JT65, yielding already a 1.3 dB QRA64 code is inherently better than the Reed Solomon (63,12) code
advantage. QRA64 uses a new synchronizing scheme based on a 7 x 7 used in JT65, yielding already a 1.3 dB advantage. QRA64 uses a new
Costas array, so you will not see a bright sync tone at the lowest synchronizing scheme based on a 7 x 7 Costas array, so you will not
tone frequency. This change yields another 1.9 dB advantage. see a bright sync tone at the lowest tone frequency. This change
yields another 1.9 dB advantage.
In most respects our implementation of QRA64 is operationally similar In most respects our implementation of QRA64 is operationally similar
to JT65. QRA64 does not use two-tone shorthand messages, and it makes to JT65. QRA64 does not use two-tone shorthand messages, and it makes
@ -71,10 +73,10 @@ http://physics.princeton.edu/pulsar/K1JT/doc/wsjt/
Program Setup Program Setup
------------- -------------
Some of the new program capabilities are enabled when you check Many of the new program capabilities are enabled when you check
"Enable VHF/UHF/Microwave features" on the Settings | General tab. "Enable VHF/UHF/Microwave features" on the Settings | General tab.
For MSK144 mode, we suggest setting "T/R 15 s" and "F Tol 100 Hz"; For MSK144 mode, we suggest setting "T/R 15 s" and "F Tol 100 Hz".
check "Sh" to enable the use of short messages and "Auto Seq" for Check "Sh" to enable the use of short messages and "Auto Seq" for
auto-sequencing. For QRA64 mode, set Tx and Rx frequencies to 1000 auto-sequencing. For QRA64 mode, set Tx and Rx frequencies to 1000
Hz. We encourage you to check "Save all" when making tests, and to Hz. We encourage you to check "Save all" when making tests, and to
save any of the resulting .wav files that might help us to improve save any of the resulting .wav files that might help us to improve
@ -85,6 +87,10 @@ identify.
Final Comments Final Comments
-------------- --------------
We will be grateful for any and all reports from test users that may Remember that you are using an Alpha Release. We will be grateful for
help us to further improve WSJT-X. Send your reports to any and all reports from test users that may help us to further
wsjtgroup@yahoogroups.com. improve WSJT-X. Send your reports to wsjtgroup@yahoogroups.com.
Please be patient concerning responses from the development group.
Several of us will be on vacation or otherwise engaged during much of
August.