From db71f7d4800b728bfc74d660259054ea28f563ce Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 1 Feb 2024 13:25:41 -0500 Subject: [PATCH] Use integer rather than i*1 for idat and jdat so they can work with int RS version. --- lib/superfox/gen_sfox.f90 | 2 +- lib/superfox/hard_symbols.f90 | 2 +- lib/superfox/rstest.f90 | 2 +- lib/superfox/sfox_params.f90 | 6 +++--- lib/superfox/sfoxtest.f90 | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/superfox/gen_sfox.f90 b/lib/superfox/gen_sfox.f90 index 095b7ab2f..ae979ecbc 100644 --- a/lib/superfox/gen_sfox.f90 +++ b/lib/superfox/gen_sfox.f90 @@ -4,7 +4,7 @@ subroutine gen_sfox(idat,f0,fsample,syncwidth,cdat,clo) complex cdat(NMAX) !Generated complex waveform complex clo(NMAX) !Complex Local Oscillator complex w,wstep - integer*1 idat(ND) + integer idat(ND) twopi=8.0*atan(1.0) tsync=NS*NSPS/fsample diff --git a/lib/superfox/hard_symbols.f90 b/lib/superfox/hard_symbols.f90 index 1a2ad099b..1bf88cb87 100644 --- a/lib/superfox/hard_symbols.f90 +++ b/lib/superfox/hard_symbols.f90 @@ -4,7 +4,7 @@ subroutine hard_symbols(crcvd,f,t,jdat) complex crcvd(NMAX) !Signal as received complex c(0:NSPS-1) !Work array, one symbol long real s(0:NSPS-1) !Power spectrum - integer*1 jdat(ND) !Recovered hard-decision symbols + integer jdat(ND) !Recovered hard-decision symbols integer ipk(1) i0=nint(12000.0*t) diff --git a/lib/superfox/rstest.f90 b/lib/superfox/rstest.f90 index 97a0ad878..55ce379e6 100644 --- a/lib/superfox/rstest.f90 +++ b/lib/superfox/rstest.f90 @@ -27,7 +27,7 @@ program rstest nfz=3 call rs_init_sf(mm,nq,nn,kk,nfz) !Initialize the Karn RS codec -! Generate and random symbols wuth values 0 to nq-1 +! Generate and random symbols with values 0 to nq-1 do i=1,kk dgen(i)=(nq-0.0001)*ran1(idum) enddo diff --git a/lib/superfox/sfox_params.f90 b/lib/superfox/sfox_params.f90 index 10536d98e..5bc92079b 100644 --- a/lib/superfox/sfox_params.f90 +++ b/lib/superfox/sfox_params.f90 @@ -1,6 +1,6 @@ - parameter (KK=49) !Information bits - parameter (ND1=62) !Data symbols before sync waveform - parameter (ND2=63) !Data symbols after sync waveform + parameter (KK=49) !Information symbols + parameter (ND1=25) !Data symbols before sync waveform + parameter (ND2=100) !Data symbols after sync waveform parameter (ND=ND1+ND2) !Total data symbols (125) parameter (NS=23) !Sync symbols (for length) parameter (NSPS=1024) !Samples per symbol at 12000 S/s diff --git a/lib/superfox/sfoxtest.f90 b/lib/superfox/sfoxtest.f90 index 7b6e0a94d..5ac3a6095 100644 --- a/lib/superfox/sfoxtest.f90 +++ b/lib/superfox/sfoxtest.f90 @@ -12,8 +12,8 @@ program sfoxtest complex clo(NMAX) !Complex Local Oscillator complex cnoise(NMAX) !Complex noise complex crcvd(NMAX) !Signal as received - integer*1 idat(ND) !Encoded data, 7-bit integers - integer*1 jdat(ND) !Recovered hard-decision symbols + integer idat(ND) !Encoded data, 7-bit integers + integer jdat(ND) !Recovered hard-decision symbols character fname*17,arg*12 nargs=iargc()