w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

A few more cosmetic 240 -> 4 changes

Browse Source
This commit is contained in:
Bill Somerville 2020-07-23 19:13:05 +01:00
parent c88445ee7b
commit a7223a5efa
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/decoder.f90
View File

@ -188,7 +188,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
endif endif
if(params%nmode.eq.240) then if(params%nmode.eq.240) then
! We're in FST240 mode ! We're in FST4 mode
ndepth=iand(params%ndepth,3) ndepth=iand(params%ndepth,3)
iwspr=0 iwspr=0
if(iand(params%ndepth,128).ne.0) iwspr=2 if(iand(params%ndepth,128).ne.0) iwspr=2
@ -203,7 +203,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
endif endif
if(params%nmode.eq.241) then if(params%nmode.eq.241) then
! We're in FST240W mode ! We're in FST4W mode
ndepth=iand(params%ndepth,3) ndepth=iand(params%ndepth,3)
iwspr=1 iwspr=1
call timer('dec240 ',0) call timer('dec240 ',0)
@ -732,12 +732,12 @@ contains
write(line,1001) nutc,nsnr,dt,nint(freq),decoded0,annot write(line,1001) nutc,nsnr,dt,nint(freq),decoded0,annot
1001 format(i6.6,i4,f5.1,i5,' ` ',1x,a37,1x,a2) 1001 format(i6.6,i4,f5.1,i5,' ` ',1x,a37,1x,a2)
write(13,1002) nutc,nint(sync),nsnr,dt,freq,0,decoded0 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 else
write(line,1003) nutc,nsnr,dt,nint(freq),decoded0,annot write(line,1003) nutc,nsnr,dt,nint(freq),decoded0,annot
1003 format(i4.4,i4,f5.1,i5,' ` ',1x,a37,1x,a2,2f7.3) 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 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 endif
if(fmid.ne.-999.0) then if(fmid.ne.-999.0) then

2
lib/fst4/genfst4.f90
View File

@ -5,7 +5,7 @@ subroutine genfst4(msg0,ichk,msgsent,msgbits,i4tone,iwspr)
! - ichk if ichk=1, return only msgsent ! - ichk if ichk=1, return only msgsent
! - msgsent message as it will be decoded ! - msgsent message as it will be decoded
! - i4tone array of audio tone values, {0,1,2,3} ! - 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 ! out 0: (240,101)/crc24, 1: (240,74)/crc24
! !
! Frame structure: ! Frame structure:

2
lib/fst4_decode.f90
View File

@ -583,7 +583,7 @@ contains
subroutine sync_fst4(cd0,i0,f0,hmod,ncoh,np,nss,ntr,fs,sync) 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 use timer_module, only: timer
include 'fst4/fst4_params.f90' include 'fst4/fst4_params.f90'

2
lib/ft8/foxgen.f90
View File

@ -15,7 +15,7 @@ subroutine foxgen()
! common block. ! common block.
parameter (NN=79,ND=58,NSPS=4*1920) 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) parameter (NFFT=614400,NH=NFFT/2)
character*40 cmsg character*40 cmsg
character*37 msg,msgsent character*37 msg,msgsent

2
lib/ft8/foxgen_wrap.f90
View File

@ -1,7 +1,7 @@
subroutine foxgen_wrap(msg40,msgbits,itone) subroutine foxgen_wrap(msg40,msgbits,itone)
parameter (NN=79,ND=58,KK=77,NSPS=4*1920) 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*40 msg40,cmsg
character*12 mycall12 character*12 mycall12