From abcb7c3ff58ebb9c70c26eaf24610a5de7535086 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 16 Jun 2020 16:33:15 -0400 Subject: [PATCH] Update one more file name, and the *.f90 references to 'include' it. --- lib/fst280/fst280_params.f90 | 8 ++++++++ lib/fst280/fst280d.f90 | 4 ++-- lib/fst280/fst280sim.f90 | 2 +- lib/fst280/genfst280.f90 | 4 ++-- lib/fst280/get_fst280_bitmetrics.f90 | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 lib/fst280/fst280_params.f90 diff --git a/lib/fst280/fst280_params.f90 b/lib/fst280/fst280_params.f90 new file mode 100644 index 000000000..e541beeed --- /dev/null +++ b/lib/fst280/fst280_params.f90 @@ -0,0 +1,8 @@ +! FT4S280 +! LDPC(280,101)/CRC24 code, six 4x4 Costas arrays for sync, ramp-up and ramp-down symbols + +parameter (KK=77) !Information bits (77 + CRC24) +parameter (ND=140) !Data symbols +parameter (NS=24) !Sync symbols +parameter (NN=NS+ND) !Sync and data symbols (164) +parameter (NN2=NS+ND+2) !Total channel symbols (166) diff --git a/lib/fst280/fst280d.f90 b/lib/fst280/fst280d.f90 index edfee81f7..8442b18d9 100644 --- a/lib/fst280/fst280d.f90 +++ b/lib/fst280/fst280d.f90 @@ -3,7 +3,7 @@ program fst280d ! Decode fst280 data read from *.c2 or *.wav files. use packjt77 - include 'ft4s280_params.f90' + include 'fst280_params.f90' character arg*8,infile*80,fname*16,datetime*11 ! character ch1*1,ch4*4,cseq*31 ! character*22 decodes(100) @@ -336,7 +336,7 @@ subroutine sync_fst280(cd0,i0,f0,hmod,ncoh,np,nss,fs,sync) ! Compute sync power for a complex, downsampled FST280 signal. - include 'ft4s280_params.f90' + include 'fst280_params.f90' complex cd0(0:np-1) complex, allocatable, save :: csync(:) complex, allocatable, save :: csynct(:) diff --git a/lib/fst280/fst280sim.f90 b/lib/fst280/fst280sim.f90 index 72026344b..70c6e5cb6 100644 --- a/lib/fst280/fst280sim.f90 +++ b/lib/fst280/fst280sim.f90 @@ -4,7 +4,7 @@ program fst280sim use wavhdr use packjt77 - include 'ft4s280_params.f90' !Set various constants + include 'fst280_params.f90' !Set various constants type(hdr) h !Header for .wav file character arg*12,fname*17 character msg37*37,msgsent37*37,c77*77 diff --git a/lib/fst280/genfst280.f90 b/lib/fst280/genfst280.f90 index e074b5080..a0adf5611 100644 --- a/lib/fst280/genfst280.f90 +++ b/lib/fst280/genfst280.f90 @@ -13,7 +13,7 @@ subroutine genfst280(msg0,ichk,msgsent,msgbits,i4tone,iwspr) ! Message duration: TxT = 164*8400/12000 = 114.8 s use packjt77 - include 'ft4s280_params.f90' + include 'fst280_params.f90' character*37 msg0 character*37 message !Message to be generated character*37 msgsent !Message as it will be received @@ -68,7 +68,7 @@ subroutine genfst280(msg0,ichk,msgsent,msgbits,i4tone,iwspr) msgsent='*** bad message *** ' go to 999 - entry get_ft4s280_tones_from_bits(msgbits,i4tone,iwspr) + entry get_fst280_tones_from_bits(msgbits,i4tone,iwspr) 2 continue diff --git a/lib/fst280/get_fst280_bitmetrics.f90 b/lib/fst280/get_fst280_bitmetrics.f90 index a50088f66..b5bcf8a10 100644 --- a/lib/fst280/get_fst280_bitmetrics.f90 +++ b/lib/fst280/get_fst280_bitmetrics.f90 @@ -1,6 +1,6 @@ subroutine get_fst280_bitmetrics(cd,nss,hmod,bitmetrics,badsync) - include 'ft4s280_params.f90' + include 'fst280_params.f90' complex cd(0:NN*nss-1) complex cs(0:3,NN) complex csymb(nss)