From a7223a5efa3b5253e1664a76950f2f6407e31f07 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Thu, 23 Jul 2020 19:13:05 +0100
Subject: [PATCH] A few more cosmetic 240 -> 4 changes

---
 lib/decoder.f90         | 8 ++++----
 lib/fst4/genfst4.f90    | 2 +-
 lib/fst4_decode.f90     | 2 +-
 lib/ft8/foxgen.f90      | 2 +-
 lib/ft8/foxgen_wrap.f90 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index 49e8681f3..a3269aef9 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -188,7 +188,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   endif
 
   if(params%nmode.eq.240) then
-! We're in FST240 mode
+! We're in FST4 mode
      ndepth=iand(params%ndepth,3)
      iwspr=0
      if(iand(params%ndepth,128).ne.0) iwspr=2
@@ -203,7 +203,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   endif
 
     if(params%nmode.eq.241) then
-! We're in FST240W mode
+! We're in FST4W mode
      ndepth=iand(params%ndepth,3)
      iwspr=1
      call timer('dec240  ',0)
@@ -732,12 +732,12 @@ contains
        write(line,1001) nutc,nsnr,dt,nint(freq),decoded0,annot
 1001   format(i6.6,i4,f5.1,i5,' ` ',1x,a37,1x,a2)
        write(13,1002) nutc,nint(sync),nsnr,dt,freq,0,decoded0
-1002   format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a37,' FST240')
+1002   format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a37,' FST4')
     else
        write(line,1003) nutc,nsnr,dt,nint(freq),decoded0,annot
 1003   format(i4.4,i4,f5.1,i5,' ` ',1x,a37,1x,a2,2f7.3)
        write(13,1004) nutc,nint(sync),nsnr,dt,freq,0,decoded0
-1004   format(i4.4,i4,i5,f6.1,f8.0,i4,3x,a37,' FST240')
+1004   format(i4.4,i4,i5,f6.1,f8.0,i4,3x,a37,' FST4')
     endif
 
     if(fmid.ne.-999.0) then
diff --git a/lib/fst4/genfst4.f90 b/lib/fst4/genfst4.f90
index 818feee43..650062a03 100644
--- a/lib/fst4/genfst4.f90
+++ b/lib/fst4/genfst4.f90
@@ -5,7 +5,7 @@ subroutine genfst4(msg0,ichk,msgsent,msgbits,i4tone,iwspr)
 !   - ichk     if ichk=1, return only msgsent
 !   - msgsent  message as it will be decoded
 !   - i4tone   array of audio tone values, {0,1,2,3}
-!   - iwspr    in: 0: FST240 1: FST240W
+!   - iwspr    in: 0: FST4 1: FST4W
 !              out 0: (240,101)/crc24, 1: (240,74)/crc24
 !
 ! Frame structure:
diff --git a/lib/fst4_decode.f90 b/lib/fst4_decode.f90
index 37ab333a1..9626c7114 100644
--- a/lib/fst4_decode.f90
+++ b/lib/fst4_decode.f90
@@ -583,7 +583,7 @@ contains
 
    subroutine sync_fst4(cd0,i0,f0,hmod,ncoh,np,nss,ntr,fs,sync)
 
-! Compute sync power for a complex, downsampled FST240 signal.
+! Compute sync power for a complex, downsampled FST4 signal.
 
       use timer_module, only: timer
       include 'fst4/fst4_params.f90'
diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90
index 13299da89..a2899e526 100644
--- a/lib/ft8/foxgen.f90
+++ b/lib/ft8/foxgen.f90
@@ -15,7 +15,7 @@ subroutine foxgen()
   ! common block.
   
   parameter (NN=79,ND=58,NSPS=4*1920)
-  parameter (NWAVE=(160+2)*134400*4) !the biggest waveform we generate (FST240-1800 at 48kHz)
+  parameter (NWAVE=(160+2)*134400*4) !the biggest waveform we generate (FST4-1800 at 48kHz)
   parameter (NFFT=614400,NH=NFFT/2)
   character*40 cmsg
   character*37 msg,msgsent
diff --git a/lib/ft8/foxgen_wrap.f90 b/lib/ft8/foxgen_wrap.f90
index eb489cccc..fec9f37c6 100644
--- a/lib/ft8/foxgen_wrap.f90
+++ b/lib/ft8/foxgen_wrap.f90
@@ -1,7 +1,7 @@
 subroutine foxgen_wrap(msg40,msgbits,itone)
 
   parameter (NN=79,ND=58,KK=77,NSPS=4*1920)
-  parameter (NWAVE=(160+2)*134400) !the biggest waveform we generate (FST240-1800)
+  parameter (NWAVE=(160+2)*134400) !the biggest waveform we generate (FST4-1800)
 
   character*40 msg40,cmsg
   character*12 mycall12