mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-24 02:12:37 -04:00
Use integer rather than i*1 for idat and jdat so they can work with int RS version.
This commit is contained in:
parent
a382fbfe7b
commit
db71f7d480
@ -4,7 +4,7 @@ subroutine gen_sfox(idat,f0,fsample,syncwidth,cdat,clo)
|
|||||||
complex cdat(NMAX) !Generated complex waveform
|
complex cdat(NMAX) !Generated complex waveform
|
||||||
complex clo(NMAX) !Complex Local Oscillator
|
complex clo(NMAX) !Complex Local Oscillator
|
||||||
complex w,wstep
|
complex w,wstep
|
||||||
integer*1 idat(ND)
|
integer idat(ND)
|
||||||
|
|
||||||
twopi=8.0*atan(1.0)
|
twopi=8.0*atan(1.0)
|
||||||
tsync=NS*NSPS/fsample
|
tsync=NS*NSPS/fsample
|
||||||
|
@ -4,7 +4,7 @@ subroutine hard_symbols(crcvd,f,t,jdat)
|
|||||||
complex crcvd(NMAX) !Signal as received
|
complex crcvd(NMAX) !Signal as received
|
||||||
complex c(0:NSPS-1) !Work array, one symbol long
|
complex c(0:NSPS-1) !Work array, one symbol long
|
||||||
real s(0:NSPS-1) !Power spectrum
|
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)
|
integer ipk(1)
|
||||||
|
|
||||||
i0=nint(12000.0*t)
|
i0=nint(12000.0*t)
|
||||||
|
@ -27,7 +27,7 @@ program rstest
|
|||||||
nfz=3
|
nfz=3
|
||||||
call rs_init_sf(mm,nq,nn,kk,nfz) !Initialize the Karn RS codec
|
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
|
do i=1,kk
|
||||||
dgen(i)=(nq-0.0001)*ran1(idum)
|
dgen(i)=(nq-0.0001)*ran1(idum)
|
||||||
enddo
|
enddo
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
parameter (KK=49) !Information bits
|
parameter (KK=49) !Information symbols
|
||||||
parameter (ND1=62) !Data symbols before sync waveform
|
parameter (ND1=25) !Data symbols before sync waveform
|
||||||
parameter (ND2=63) !Data symbols after sync waveform
|
parameter (ND2=100) !Data symbols after sync waveform
|
||||||
parameter (ND=ND1+ND2) !Total data symbols (125)
|
parameter (ND=ND1+ND2) !Total data symbols (125)
|
||||||
parameter (NS=23) !Sync symbols (for length)
|
parameter (NS=23) !Sync symbols (for length)
|
||||||
parameter (NSPS=1024) !Samples per symbol at 12000 S/s
|
parameter (NSPS=1024) !Samples per symbol at 12000 S/s
|
||||||
|
@ -12,8 +12,8 @@ program sfoxtest
|
|||||||
complex clo(NMAX) !Complex Local Oscillator
|
complex clo(NMAX) !Complex Local Oscillator
|
||||||
complex cnoise(NMAX) !Complex noise
|
complex cnoise(NMAX) !Complex noise
|
||||||
complex crcvd(NMAX) !Signal as received
|
complex crcvd(NMAX) !Signal as received
|
||||||
integer*1 idat(ND) !Encoded data, 7-bit integers
|
integer idat(ND) !Encoded data, 7-bit integers
|
||||||
integer*1 jdat(ND) !Recovered hard-decision symbols
|
integer jdat(ND) !Recovered hard-decision symbols
|
||||||
character fname*17,arg*12
|
character fname*17,arg*12
|
||||||
|
|
||||||
nargs=iargc()
|
nargs=iargc()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user