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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Bill Somerville 2020-09-26 21:52:29 +01:00
commit ed10b0414a
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
9 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Audio/soundin.cpp
View File

@ -37,10 +37,6 @@ bool SoundInput::checkStream ()
result = true;
break;
}
if (!result)
{
stop ();
}
}
return result;
}

3
Audio/soundout.cpp
View File

@ -51,7 +51,7 @@ void SoundOutput::setFormat (QAudioDeviceInfo const& device, unsigned channels,
m_framesBuffered = frames_buffered;
}
void SoundOutput::restart (AudioDevice * source)
void SoundOutput::restart (QIODevice * source)
{
if (!m_device.isNull ())
{
@ -111,7 +111,6 @@ void SoundOutput::restart (AudioDevice * source)
#endif
}
m_stream->setCategory ("production");
m_source = source;
m_stream->start (source);
// qDebug () << "SoundOut selected buffer size (bytes):" << m_stream->bufferSize () << "period size:" << m_stream->periodSize ();
}

6
Audio/soundout.h
View File

@ -6,9 +6,8 @@
#include <QString>
#include <QAudioOutput>
#include <QAudioDeviceInfo>
#include <QPointer>
class AudioDevice;
class QIODevice;
class QAudioDeviceInfo;
// An instance of this sends audio data to a specified soundcard.
@ -30,7 +29,7 @@ public:
public Q_SLOTS:
void setFormat (QAudioDeviceInfo const& device, unsigned channels, int frames_buffered = 0);
void restart (AudioDevice *);
void restart (QIODevice *);
void suspend ();
void resume ();
void reset ();
@ -52,7 +51,6 @@ private:
QAudioDeviceInfo m_device;
unsigned m_channels;
QScopedPointer<QAudioOutput> m_stream;
QPointer<AudioDevice> m_source;
int m_framesBuffered;
qreal m_volume;
bool error_;

26
NEWS
View File

@ -13,6 +13,32 @@
Copyright 2001 - 2020 by Joe Taylor, K1JT.
Release: WSJT-X 2.3.0-rc1
Sept 28, 2020
-------------------------
WSJT-X 2.3.0 is a program upgrade offering two new modes designed
especially for use on the LF and MF bands. FST4 is for 2-way QSOs,
and FST4W is for WSPR-like transmissions. Both modes offer a range of
options for T/R sequence lengths and threshold decoding sensitivities
extending well into the -40 dB range. Early tests have shown these
modes frequently spanning intercontinental distances on the 2200 m and
630 m bands. Further details and operating hints can be found in the
"Quick-Start Guide to FST4 and FST4W", posted on the WSJT web site:
https://physics.princeton.edu/pulsar/k1jt/FST4_Quick_Start.pdf
WSJT-X 2.3.0-rc1 is a beta-quality release candidate for a program
upgrade that provides a number of new features and capabilities.
These include:
- New modes FST4 and FST4W
- The *On Dx Echo* Doppler compensation method has been modified in
response to feedback from Users. Basic functionality is unchanged.
See the User Guide (Section 8.1) for more information.
Release: WSJT-X 2.2.2
June 22, 2020
---------------------

15
Release_Notes.txt
View File

@ -14,13 +14,26 @@ Copyright 2001 - 2020 by Joe Taylor, K1JT.
Release: WSJT-X 2.3.0-rc1
Sept DD, 2020
Sept 28, 2020
-------------------------
WSJT-X 2.3.0 is a program upgrade offering two new modes designed
especially for use on the LF and MF bands. FST4 is for 2-way QSOs,
and FST4W is for WSPR-like transmissions. Both modes offer a range of
options for T/R sequence lengths and threshold decoding sensitivities
extending well into the -40 dB range. Early tests have shown these
modes frequently spanning intercontinental distances on the 2200 m and
630 m bands. Further details and operating hints can be found in the
"Quick-Start Guide to FST4 and FST4W", posted on the WSJT web site:
https://physics.princeton.edu/pulsar/k1jt/FST4_Quick_Start.pdf
WSJT-X 2.3.0-rc1 is a beta-quality release candidate for a program
upgrade that provides a number of new features and capabilities.
These include:
- New modes FST4 and FST4W
- The *On Dx Echo* Doppler compensation method has been modified in
response to feedback from Users. Basic functionality is unchanged.
See the User Guide (Section 8.1) for more information.

2
Versions.cmake
View File

@ -2,5 +2,5 @@
set (WSJTX_VERSION_MAJOR 2)
set (WSJTX_VERSION_MINOR 3)
set (WSJTX_VERSION_PATCH 0)
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
set (WSJTX_RC 1) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

12
widgets/astro.cpp
View File

@ -269,14 +269,14 @@ void Astro::check_split ()
}
}
void Astro::on_rbFullTrack_clicked()
void Astro::on_rbFullTrack_clicked(bool)
{
m_DopplerMethod = 1;
check_split ();
Q_EMIT tracking_update ();
}
void Astro::on_rbOnDxEcho_clicked() //on_rbOnDxEcho_clicked(bool checked)
void Astro::on_rbOnDxEcho_clicked(bool)
{
m_DopplerMethod = 4;
check_split ();
@ -287,28 +287,28 @@ void Astro::on_rbOnDxEcho_clicked() //on_rbOnDxEcho_clicked(bool checked)
Q_EMIT tracking_update ();
}
void Astro::on_rbOwnEcho_clicked()
void Astro::on_rbOwnEcho_clicked(bool)
{
m_DopplerMethod = 3;
check_split ();
Q_EMIT tracking_update ();
}
void Astro::on_rbCallDx_clicked()
void Astro::on_rbCallDx_clicked(bool)
{
m_DopplerMethod = 5;
check_split ();
Q_EMIT tracking_update ();
}
void Astro::on_rbConstFreqOnMoon_clicked()
void Astro::on_rbConstFreqOnMoon_clicked(bool)
{
m_DopplerMethod = 2;
check_split ();
Q_EMIT tracking_update ();
}
void Astro::on_rbNoDoppler_clicked()
void Astro::on_rbNoDoppler_clicked(bool)
{
m_DopplerMethod = 0;
Q_EMIT tracking_update ();

12
widgets/astro.h
View File

@ -55,12 +55,12 @@ protected:
void closeEvent (QCloseEvent *) override;
private slots:
void on_rbConstFreqOnMoon_clicked();
void on_rbFullTrack_clicked();
void on_rbOwnEcho_clicked();
void on_rbNoDoppler_clicked();
void on_rbOnDxEcho_clicked();
void on_rbCallDx_clicked();
void on_rbConstFreqOnMoon_clicked(bool);
void on_rbFullTrack_clicked(bool);
void on_rbOwnEcho_clicked(bool);
void on_rbNoDoppler_clicked(bool);
void on_rbOnDxEcho_clicked(bool);
void on_rbCallDx_clicked(bool);
void on_cbDopplerTracking_toggled(bool);
private:

16
widgets/mainwindow.cpp
View File

@ -1043,14 +1043,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message ()
{
// MessageBox::critical_message (this,
// "This is a pre-release version of WSJT-X 2.2.0 made\n"
// "available for testing purposes. By design it will\n"
// "be nonfunctional after 0000 UTC on June 10, 2020.");
// auto now = QDateTime::currentDateTimeUtc ();
// if (now >= QDateTime {{2020, 6, 10}, {0, 0}, Qt::UTC}) {
// Q_EMIT finished ();
// }
MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X 2.3.0 made\n"
"available for testing purposes. By design it will\n"
"be nonfunctional after 0000 UTC on Nov 17, 2020.");
auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2020, 11, 17}, {0, 0}, Qt::UTC}) {
Q_EMIT finished ();
}
}
void MainWindow::initialize_fonts ()