From 84591fa2effb6793c7b6d8f361c2d63bf2ab45a5 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 8 Dec 2020 11:53:22 -0500 Subject: [PATCH 1/3] Protect against a bounds error with very large FTol. --- lib/q65_sync.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/q65_sync.f90 b/lib/q65_sync.f90 index 3e45f9b56..842f14c94 100644 --- a/lib/q65_sync.f90 +++ b/lib/q65_sync.f90 @@ -135,7 +135,7 @@ subroutine q65_sync(nutc,iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, & if(j.ge.1 .and. j.le.jz) then do i=-ia,ia ii=i0+mode_q65*itone(k)+i - ccf(i,lag)=ccf(i,lag) + s1(ii,j) + if(ii.ge.1 .and. ii.le.iz) ccf(i,lag)=ccf(i,lag) + s1(ii,j) enddo endif enddo From 218d0bf3590b0e198af3c41323e189836bc5c260 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 8 Dec 2020 13:49:17 -0500 Subject: [PATCH 2/3] Remove version number from the User Guide's title. (It's on the next line, anyway.) --- doc/user_guide/en/wsjtx-main.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user_guide/en/wsjtx-main.adoc b/doc/user_guide/en/wsjtx-main.adoc index 9bed15dc6..b6acd256f 100644 --- a/doc/user_guide/en/wsjtx-main.adoc +++ b/doc/user_guide/en/wsjtx-main.adoc @@ -1,5 +1,5 @@ // This is a comment line, anything with // is ignored at process time. -= _WSJT-X {VERSION_MAJOR}.{VERSION_MINOR}_ User Guide += _WSJT-X_ User Guide Joseph H Taylor, Jr, K1JT :revnumber: {VERSION} // For web-pages, adding :badges: is ok, but is a security issue for From 5b59633b2fd85fe351c00a630ee53f8ffc8f0818 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 9 Dec 2020 09:34:09 -0500 Subject: [PATCH 3/3] Re-enable transmission in Q65 submodes B and higher. --- widgets/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index f903bdede..8075f6b52 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -7340,9 +7340,9 @@ void MainWindow::transmit (double snr) if(m_TRperiod==60) nsps=7200; if(m_TRperiod==120) nsps=16000; if(m_TRperiod==300) nsps=41472; -// int mode65=pow(2.0,double(m_nSubMode)); -// toneSpacing=mode65*12000.0/nsps; - toneSpacing=-4.0; + int mode65=pow(2.0,double(m_nSubMode)); + toneSpacing=mode65*12000.0/nsps; +// toneSpacing=-4.0; Q_EMIT sendMessage (m_mode, NUM_Q65_SYMBOLS, double(nsps), ui->TxFreqSpinBox->value () - m_XIT, toneSpacing, m_soundOutput, m_config.audio_output_channel (),