w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-12 02:32:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some long-standing Tx start time issues

Browse Source
This commit is contained in:
Bill Somerville 2020-07-31 13:35:57 +01:00
parent b05bfecb5f
commit 11b6637d6a
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Modulator/Modulator.cpp
View File

@ -50,6 +50,7 @@ void Modulator::start (QString mode, unsigned symbolsLength, double framesPerSym
SoundOutput * stream, Channel channel, SoundOutput * stream, Channel channel,
bool synchronize, bool fastMode, double dBSNR, double TRperiod) bool synchronize, bool fastMode, double dBSNR, double TRperiod)
{ {
// qDebug () << "mode:" << mode << "symbolsLength:" << symbolsLength << "framesPerSymbol:" << framesPerSymbol << "frequency:" << frequency << "toneSpacing:" << toneSpacing << "channel:" << channel << "synchronize:" << synchronize << "fastMode:" << fastMode << "dBSNR:" << dBSNR << "TRperiod:" << TRperiod;
Q_ASSERT (stream); Q_ASSERT (stream);
// Time according to this computer which becomes our base time // Time according to this computer which becomes our base time
qint64 ms0 = QDateTime::currentMSecsSinceEpoch() % 86400000; qint64 ms0 = QDateTime::currentMSecsSinceEpoch() % 86400000;
@ -79,25 +80,30 @@ void Modulator::start (QString mode, unsigned symbolsLength, double framesPerSym
if (m_snr > 1.0) m_fac = 3000.0 / m_snr; if (m_snr > 1.0) m_fac = 3000.0 / m_snr;
} }
m_ic=0;
// round up to an exact portion of a second that allows for startup delays
if(delay_ms > 0 and !m_bFastMode) {
m_ic = (mstr/delay_ms) * m_frameRate * delay_ms / 1000;
}
m_silentFrames = 0; m_silentFrames = 0;
// calculate number of silent frames to send, so that audio will start at m_ic=0;
// the nominal time "delay_ms" into the Tx sequence. if (!m_tuning && !m_bFastMode)
if (synchronize && !m_tuning && !m_bFastMode) { {
if(delay_ms >= mstr) m_silentFrames = m_ic + 0.001*(delay_ms-mstr)*m_frameRate; // calculate number of silent frames to send, so that audio will
} // start at the nominal time "delay_ms" into the Tx sequence.
if (synchronize)
{
if(delay_ms > mstr) m_silentFrames = (delay_ms - mstr) * m_frameRate / 1000;
}
// qDebug() << "aa" << QDateTime::currentDateTimeUtc().toString("hh:mm:ss.zzz") // adjust for late starts
// << delay_ms << mstr << m_silentFrames << m_ic << m_symbolsLength; if(!m_silentFrames && mstr >= delay_ms)
{
m_ic = (mstr - delay_ms) * m_frameRate / 1000;
}
}
initialize (QIODevice::ReadOnly, channel); initialize (QIODevice::ReadOnly, channel);
Q_EMIT stateChanged ((m_state = (synchronize && m_silentFrames) ? Q_EMIT stateChanged ((m_state = (synchronize && m_silentFrames) ?
Synchronizing : Active)); Synchronizing : Active));
// qDebug() << "delay_ms:" << delay_ms << "mstr:" << mstr << "m_silentFrames:" << m_silentFrames << "m_ic:" << m_ic << "m_state:" << m_state;
m_stream = stream; m_stream = stream;
if (m_stream) m_stream->restart (this); if (m_stream) m_stream->restart (this);
} }
@ -136,6 +142,8 @@ void Modulator::close ()
qint64 Modulator::readData (char * data, qint64 maxSize) qint64 Modulator::readData (char * data, qint64 maxSize)
{ {
// qDebug () << "readData: maxSize:" << maxSize;
double toneFrequency=1500.0; double toneFrequency=1500.0;
if(m_nsps==6) { if(m_nsps==6) {
toneFrequency=1000.0; toneFrequency=1000.0;
@ -158,15 +166,21 @@ qint64 Modulator::readData (char * data, qint64 maxSize)
{ {
case Synchronizing: case Synchronizing:
{ {
if (m_silentFrames) { // send silence up to first second if (m_silentFrames) { // send silence up to end of start delay
framesGenerated = qMin (m_silentFrames, numFrames); framesGenerated = qMin (m_silentFrames, numFrames);
for ( ; samples != end; samples = load (0, samples)) { // silence do
} {
m_silentFrames -= framesGenerated; samples = load (0, samples); // silence
return framesGenerated * bytesPerFrame (); } while (--m_silentFrames && samples != end);
qDebug () << "played:" << framesGenerated << "silent frames";
if (!m_silentFrames)
{
Q_EMIT stateChanged ((m_state = Active));
}
} }
Q_EMIT stateChanged ((m_state = Active)); // qDebug() << "m_silentFrames:" << m_silentFrames << "m_ic:" << m_ic << "m_state:" << m_state;
m_cwLevel = false; m_cwLevel = false;
m_ramp = 0; // prepare for CW wave shaping m_ramp = 0; // prepare for CW wave shaping
} }
@ -260,7 +274,7 @@ qint64 Modulator::readData (char * data, qint64 maxSize)
qint16 sample; qint16 sample;
for (unsigned i = 0; i < numFrames && m_ic <= i1; ++i) { while (samples != end && m_ic <= i1) {
isym=0; isym=0;
if(!m_tuning and m_TRperiod!=3.0) isym=m_ic/(4.0*m_nsps); //Actual fsample=48000 if(!m_tuning and m_TRperiod!=3.0) isym=m_ic/(4.0*m_nsps); //Actual fsample=48000
if(m_bFastMode) isym=isym%m_symbolsLength; if(m_bFastMode) isym=isym%m_symbolsLength;