From 0ea485b30514f4277f2d9f4978f0f4a2b8d04dc8 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 13 Mar 2019 11:35:47 -0400
Subject: [PATCH] Bring allsim up to date with changes elsewhere.

---
 lib/addit.f90  | 10 +++++++---
 lib/allsim.f90 | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/addit.f90 b/lib/addit.f90
index 48082833f..33ed5a289 100644
--- a/lib/addit.f90
+++ b/lib/addit.f90
@@ -12,18 +12,22 @@ subroutine addit(itone,nfsample,nsym,nsps,ifreq,sig,dat)
   dphi=0.
 
   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
      f=ifreq
      phi=0.
      ntot=nsym*tsym/dt
      k=12000                             !Start audio at t = 1.0 s
      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
      do i=1,ntot
         t=t+dt
         isym=nint(t/tsym) + 1
+        if(isym.gt.nsym) exit
         if(isym.ne.isym0) then
            freq=f + itone(isym)*baud
            dphi=twopi*freq*dt
@@ -59,7 +63,7 @@ subroutine addcw(icw,ncw,ifreq,sig,dat)
   phi=0.
   k=12000                             !Start audio at t = 1.0 s
   t=0.
-  npts=60*12000
+  npts=59*12000
   x=0.
   do i=1,npts
      t=t+dt
diff --git a/lib/allsim.f90 b/lib/allsim.f90
index 2d948b64f..59d3fa264 100644
--- a/lib/allsim.f90
+++ b/lib/allsim.f90
@@ -1,6 +1,6 @@
 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.
   
 
@@ -15,6 +15,7 @@ program allsim
   logical*1 bcontest
   real*4 dat(NMAX)
   character message*22,msgsent*22,arg*8,mygrid*6
+  character*37 msg37,msgsent37
 
   nargs=iargc()
   if(nargs.ne.1) then
@@ -60,15 +61,20 @@ program allsim
   call gen4(message,0,msgsent,itone,itype)
   call addit(itone,11025,206,2520,1200,sig,dat)  !JT4
 
-  i3bit=0                                        ! ### TEMPORARY ??? ###
-  call genft8(message,mygrid,bcontest,i3bit,msgsent,msgbits,itone)
+  i3=-1
+  n3=-1
+  call genft8(message,i3,n3,msgsent,msgbits,itone)
   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 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 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))