w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-24 22:25:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix several more GUI parameters for FST240.

Browse Source
This commit is contained in:
Joe Taylor 2020-06-27 14:13:59 -04:00
parent e98987c676
commit eb167b11d3
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/fst240/gen_fst240wave.f90
View File

@ -8,13 +8,11 @@ subroutine gen_fst240wave(itone,nsym,nsps,nwave,fsample,hmod,f0, &
real, allocatable :: dphi(:) real, allocatable :: dphi(:)
integer hmod integer hmod
integer itone(nsym) integer itone(nsym)
! integer*8 count0,count1,clkfreq
logical first logical first
data first/.true./ data first/.true./
data nsps0/-99/ data nsps0/-99/
save first,twopi,dt,tsym,nsps0,ctab save first,twopi,dt,tsym,nsps0,ctab
! call system_clock(count0,clkfreq)
if(first) then if(first) then
twopi=8.0*atan(1.0) twopi=8.0*atan(1.0)
do i=0,NTAB-1 do i=0,NTAB-1
@ -88,11 +86,6 @@ subroutine gen_fst240wave(itone,nsym,nsps,nwave,fsample,hmod,f0, &
(1.0+cos(twopi*(/(i,i=0,nsps/4-1)/)/real(nsps/2)))/2.0 (1.0+cos(twopi*(/(i,i=0,nsps/4-1)/)/real(nsps/2)))/2.0
cwave=cshift(cwave,kshift) cwave=cshift(cwave,kshift)
endif endif
! call system_clock(count1,clkfreq)
! tt=float(count1-count0)/float(clkfreq)
! write(*,3001) tt
!3001 format('Tgen:',f8.3)
return return
end subroutine gen_fst240wave end subroutine gen_fst240wave

5
widgets/mainwindow.cpp
View File

@ -3888,12 +3888,11 @@ void MainWindow::guiUpdate()
if(m_TRperiod==120) nsps=8200; if(m_TRperiod==120) nsps=8200;
if(m_TRperiod==300) nsps=21168; if(m_TRperiod==300) nsps=21168;
nsps=4*nsps; //48000 Hz sampling nsps=4*nsps; //48000 Hz sampling
int nsym=164; int nsym=160;
float fsample=48000.0; float fsample=48000.0;
float dfreq=hmod*fsample/nsps; float dfreq=hmod*fsample/nsps;
float f0=ui->TxFreqSpinBox->value() - m_XIT + 1.5*dfreq; float f0=ui->TxFreqSpinBox->value() - m_XIT + 1.5*dfreq;
// int nwave=(nsym+2)*nsps; int nwave=48000 + (nsym+2)*nsps;
int nwave=48000 + 166*nsps;
int icmplx=0; int icmplx=0;
gen_fst240wave_(const_cast<int *>(itone),&nsym,&nsps,&nwave, gen_fst240wave_(const_cast<int *>(itone),&nsym,&nsps,&nwave,
&fsample,&hmod,&f0,&icmplx,foxcom_.wave,foxcom_.wave); &fsample,&hmod,&f0,&icmplx,foxcom_.wave,foxcom_.wave);