Merge branch 'feat-fst280' into develop

This commit is contained in:
Bill Somerville 2020-12-09 15:33:58 +00:00
commit 5b60ddada1
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
3 changed files with 5 additions and 5 deletions

View File

@ -1,5 +1,5 @@
// This is a comment line, anything with // is ignored at process time. // 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 Joseph H Taylor, Jr, K1JT
:revnumber: {VERSION} :revnumber: {VERSION}
// For web-pages, adding :badges: is ok, but is a security issue for // For web-pages, adding :badges: is ok, but is a security issue for

View File

@ -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 if(j.ge.1 .and. j.le.jz) then
do i=-ia,ia do i=-ia,ia
ii=i0+mode_q65*itone(k)+i 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 enddo
endif endif
enddo enddo

View File

@ -7340,9 +7340,9 @@ void MainWindow::transmit (double snr)
if(m_TRperiod==60) nsps=7200; if(m_TRperiod==60) nsps=7200;
if(m_TRperiod==120) nsps=16000; if(m_TRperiod==120) nsps=16000;
if(m_TRperiod==300) nsps=41472; if(m_TRperiod==300) nsps=41472;
// int mode65=pow(2.0,double(m_nSubMode)); int mode65=pow(2.0,double(m_nSubMode));
// toneSpacing=mode65*12000.0/nsps; toneSpacing=mode65*12000.0/nsps;
toneSpacing=-4.0; // toneSpacing=-4.0;
Q_EMIT sendMessage (m_mode, NUM_Q65_SYMBOLS, Q_EMIT sendMessage (m_mode, NUM_Q65_SYMBOLS,
double(nsps), ui->TxFreqSpinBox->value () - m_XIT, double(nsps), ui->TxFreqSpinBox->value () - m_XIT,
toneSpacing, m_soundOutput, m_config.audio_output_channel (), toneSpacing, m_soundOutput, m_config.audio_output_channel (),