From 3a4c4ed7cee1e08cc946179177a3bf2a476d99b0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 10 Jun 2015 14:58:55 +0000 Subject: [PATCH] Senc correct Tx tone after switching from JT4 to Echo mode. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5573 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Modulator.cpp | 4 ++-- mainwindow.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modulator.cpp b/Modulator.cpp index 7ca242772..e6bf3da1d 100644 --- a/Modulator.cpp +++ b/Modulator.cpp @@ -127,8 +127,8 @@ void Modulator::close () qint64 Modulator::readData (char * data, qint64 maxSize) { static int j0=-1; - static double toneFrequency0; - double toneFrequency; + static double toneFrequency0=1500.0; + double toneFrequency=1500.0; if(maxSize==0) return 0; Q_ASSERT (!(maxSize % qint64 (bytesPerFrame ()))); // no torn frames diff --git a/mainwindow.cpp b/mainwindow.cpp index b69b52356..fba7153d1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1980,7 +1980,7 @@ void MainWindow::guiUpdate() m_lastMessageType = m_currentMessageType; } m_currentMessageType = 0; - if(m_tune) { + if(m_tune or m_mode=="Echo") { itone[0]=0; } else { if(m_modeTx=="JT4") gen4_(message, &ichk , msgsent, const_cast (itone),