w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-16 08:35:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct the "warbling" Echo tone after doing a JT9-fast transmission.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7211 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-21 14:23:06 +00:00
parent 02ad5eddd6
commit fc65b2807a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modulator.cpp
View File

@ -47,8 +47,7 @@ void Modulator::start (unsigned symbolsLength, double framesPerSymbol,
bool synchronize, bool fastMode, double dBSNR, int TRperiod) bool synchronize, bool fastMode, double dBSNR, int 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;
if (m_state != Idle) if (m_state != Idle)
@ -166,6 +165,7 @@ qint64 Modulator::readData (char * data, qint64 maxSize)
unsigned int isym=0; unsigned int isym=0;
if(!m_tuning) isym=m_ic/(4.0*m_nsps); // Actual fsample=48000 if(!m_tuning) isym=m_ic/(4.0*m_nsps); // Actual fsample=48000
bool slowCwId=((isym >= m_symbolsLength) && (icw[0] > 0)) && (!m_bFastMode); bool slowCwId=((isym >= m_symbolsLength) && (icw[0] > 0)) && (!m_bFastMode);
if(m_TRperiod==3) slowCwId=false;
bool fastCwId=false; bool fastCwId=false;
static bool bCwId=false; static bool bCwId=false;
qint64 ms = QDateTime::currentMSecsSinceEpoch(); qint64 ms = QDateTime::currentMSecsSinceEpoch();
@ -218,7 +218,6 @@ qint64 Modulator::readData (char * data, qint64 maxSize)
} }
m_cwLevel = level; m_cwLevel = level;
} }
return framesGenerated * bytesPerFrame (); return framesGenerated * bytesPerFrame ();
} else { } else {
bCwId=false; bCwId=false;
@ -241,7 +240,7 @@ qint64 Modulator::readData (char * data, qint64 maxSize)
for (unsigned i = 0; i < numFrames && m_ic <= i1; ++i) { for (unsigned i = 0; i < numFrames && m_ic <= i1; ++i) {
isym=0; isym=0;
if(!m_tuning) isym=m_ic / (4.0 * m_nsps); //Actual fsample=48000 if(!m_tuning and m_TRperiod!=3) isym=m_ic / (4.0 * m_nsps); //Actual fsample=48000
if(m_bFastMode) isym=isym%m_symbolsLength; if(m_bFastMode) isym=isym%m_symbolsLength;
if (isym != m_isym0 || m_frequency != m_frequency0) { if (isym != m_isym0 || m_frequency != m_frequency0) {
if(itone[0]>=100) { if(itone[0]>=100) {

2
mainwindow.cpp
View File

@ -3912,7 +3912,7 @@ void MainWindow::acceptQSO2(QDateTime const& QSO_date, QString const& call, QStr
int MainWindow::nWidgets(QString t) int MainWindow::nWidgets(QString t)
{ {
if(t.length()!=19) qDebug() << "b" << t << t.length(); // if(t.length()!=19) qDebug() << "b" << t << t.length();
int n=0; int n=0;
for(int i=0; i<19; i++) { for(int i=0; i<19; i++) {
n=n + n + t.mid(i,1).toInt(); n=n + n + t.mid(i,1).toInt();