w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 13:47:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bring allsim up to date with changes elsewhere.

Browse Source
This commit is contained in:
Joe Taylor 2019-03-13 11:35:47 -04:00
parent e150d003d6
commit 0ea485b305
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/addit.f90
View File

@ -12,18 +12,22 @@ subroutine addit(itone,nfsample,nsym,nsps,ifreq,sig,dat)
dphi=0. dphi=0.
iters=1 iters=1
if(nsym.eq.79) iters=2 if(nsym.eq.79) iters=2 !FT8
if(nsym.eq.103) iters=5 !FT4
do iter=1,iters do iter=1,iters
f=ifreq f=ifreq
phi=0. phi=0.
ntot=nsym*tsym/dt ntot=nsym*tsym/dt
k=12000 !Start audio at t = 1.0 s k=12000 !Start audio at t = 1.0 s
t=0. t=0.
if(nsym.eq.79) k=12000 + (iter-1)*12000*30 !Special case for FT8 if(nsym.eq.79) k=12000 + (iter-1)*12000*30 !Special case for FT8
if(nsym.eq.103) k=12000 + (iter-1)*12000*10 !Special case for FT4
isym0=-1 isym0=-1
do i=1,ntot do i=1,ntot
t=t+dt t=t+dt
isym=nint(t/tsym) + 1 isym=nint(t/tsym) + 1
if(isym.gt.nsym) exit
if(isym.ne.isym0) then if(isym.ne.isym0) then
freq=f + itone(isym)*baud freq=f + itone(isym)*baud
dphi=twopi*freq*dt dphi=twopi*freq*dt
@ -59,7 +63,7 @@ subroutine addcw(icw,ncw,ifreq,sig,dat)
phi=0. phi=0.
k=12000 !Start audio at t = 1.0 s k=12000 !Start audio at t = 1.0 s
t=0. t=0.
npts=60*12000 npts=59*12000
x=0. x=0.
do i=1,npts do i=1,npts
t=t+dt t=t+dt

16
lib/allsim.f90
View File

@ -1,6 +1,6 @@
program allsim program allsim
! Generate simulated data for WSJT-X slow modes: JT4, JT9, JT65, QRA64, ! Generate simulated data for WSJT-X modes: JT4, JT9, JT65, FT8, FT4, QRA64,
! and WSPR. Also unmodulated carrier and 20 WPM CW. ! and WSPR. Also unmodulated carrier and 20 WPM CW.
@ -15,6 +15,7 @@ program allsim
logical*1 bcontest logical*1 bcontest
real*4 dat(NMAX) real*4 dat(NMAX)
character message*22,msgsent*22,arg*8,mygrid*6 character message*22,msgsent*22,arg*8,mygrid*6
character*37 msg37,msgsent37
nargs=iargc() nargs=iargc()
if(nargs.ne.1) then if(nargs.ne.1) then
@ -60,15 +61,20 @@ program allsim
call gen4(message,0,msgsent,itone,itype) call gen4(message,0,msgsent,itone,itype)
call addit(itone,11025,206,2520,1200,sig,dat) !JT4 call addit(itone,11025,206,2520,1200,sig,dat) !JT4
i3bit=0 ! ### TEMPORARY ??? ### i3=-1
call genft8(message,mygrid,bcontest,i3bit,msgsent,msgbits,itone) n3=-1
call genft8(message,i3,n3,msgsent,msgbits,itone)
call addit(itone,12000,79,1920,1400,sig,dat) !FT8 call addit(itone,12000,79,1920,1400,sig,dat) !FT8
msg37=message//' '
call genft4(msg37,0,msgsent37,itone)
call addit(itone,12000,103,512,1600,sig,dat) !FT4
call genqra64(message,0,msgsent,itone,itype) call genqra64(message,0,msgsent,itone,itype)
call addit(itone,12000,84,6912,1600,sig,dat) !QRA64 call addit(itone,12000,84,6912,1800,sig,dat) !QRA64
call gen65(message,0,msgsent,itone,itype) call gen65(message,0,msgsent,itone,itype)
call addit(itone,11025,126,4096,1800,sig,dat) !JT65 call addit(itone,11025,126,4096,2000,sig,dat) !JT65
iwave(1:npts)=nint(rms*dat(1:npts)) iwave(1:npts)=nint(rms*dat(1:npts))