w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 13:47:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

More changes to allow longer sequences in QRA66 mode.

Browse Source
This commit is contained in:
Joe Taylor 2020-08-08 16:53:28 -04:00
parent d683cb6b8e
commit de0476bf3c
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/decoder.f90
View File

@ -197,8 +197,8 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
if(params%nmode.eq.66) then if(params%nmode.eq.66) then
! We're in QRA66 mode ! We're in QRA66 mode
call timer('decqra66',0) call timer('decqra66',0)
call my_qra66%decode(qra66_decoded,id2,params%nutc,params%ntr,params%nfqso, & call my_qra66%decode(qra66_decoded,id2,params%nutc,params%ntr, &
params%ntol,params%ndepth,mycall,hiscall,hisgrid) params%nfqso,params%ntol,params%ndepth,mycall,hiscall,hisgrid)
call timer('decqra66',1) call timer('decqra66',1)
go to 800 go to 800
endif endif
@ -796,11 +796,18 @@ contains
integer navg integer navg
navg=irc/100 navg=irc/100
write(*,1001) nutc,nsnr,dt,nint(freq),decoded,mod(irc,100),navg if(ntrperiod.lt.60) then
1001 format(i6.6,i4,f5.1,i5,' + ',1x,a37,1x,i2,i4) write(*,1001) nutc,nsnr,dt,nint(freq),decoded,mod(irc,100),navg
1001 format(i6.6,i4,f5.1,i5,' + ',1x,a37,1x,i2,i4)
write(13,1002) nutc,nint(sync),nsnr,dt,freq,0,decoded write(13,1002) nutc,nint(sync),nsnr,dt,freq,0,decoded
1002 format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a37,' QRA66') 1002 format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a37,' QRA66')
else
write(*,1003) nutc,nsnr,dt,nint(freq),decoded,mod(irc,100),navg
1003 format(i4.4,i4,f5.1,i5,' + ',1x,a37,1x,i2,i4)
write(13,1004) nutc,nint(sync),nsnr,dt,freq,0,decoded
1004 format(i4.4,i4,i5,f6.1,f8.0,i4,3x,a37,' QRA66')
endif
call flush(6) call flush(6)
call flush(13) call flush(13)

14
lib/qra/qra66/qra66sim.f90
View File

@ -14,7 +14,7 @@ program qra66sim
complex cspread(0:NMAX-1) !Complex amplitude for Rayleigh fading complex cspread(0:NMAX-1) !Complex amplitude for Rayleigh fading
complex z complex z
real*8 f0,dt,twopi,phi,dphi,baud,fsample,freq real*8 f0,dt,twopi,phi,dphi,baud,fsample,freq
character msg*22,fname*13,csubmode*1,arg*12 character msg*22,fname*17,csubmode*1,arg*12
character msgsent*22 character msgsent*22
nargs=iargc() nargs=iargc()
@ -77,9 +77,15 @@ program qra66sim
1000 format('File TR Freq Mode S/N DT Dop Message'/60('-')) 1000 format('File TR Freq Mode S/N DT Dop Message'/60('-'))
do ifile=1,nfiles !Loop over requested number of files do ifile=1,nfiles !Loop over requested number of files
write(fname,1002) ifile !Output filename if(ntrperiod.lt.60) then
1002 format('000000_',i6.6) write(fname,1002) ifile !Output filename
open(10,file=fname//'.wav',access='stream',status='unknown') 1002 format('000000_',i6.6,'.wav')
else
write(fname,1104) ifile
1104 format('000000_',i4.4,'.wav')
endif
open(10,file=trim(fname),access='stream',status='unknown')
xnoise=0. xnoise=0.
cdat=0. cdat=0.
if(snrdb.lt.90) then if(snrdb.lt.90) then

9
widgets/plotter.cpp
View File

@ -472,7 +472,14 @@ void CPlotter::DrawOverlay() //DrawOverlay()
} }
if(m_mode=="QRA66") { //QRA66 if(m_mode=="QRA66") { //QRA66
bw=65.0*12000.0/1800.0; int h=int(pow(2.0,m_nSubMode));
int nsps=1800;
if(m_TRperiod==30) nsps=3600;
if(m_TRperiod==60) nsps=7680;
if(m_TRperiod==120) nsps=16000;
if(m_TRperiod==300) nsps=41472;
float baud=12000.0/nsps;
bw=65.0*h*baud;
} }
if(m_modeTx=="JT65") { //JT65 if(m_modeTx=="JT65") { //JT65
bw=65.0*11025.0/4096.0; bw=65.0*11025.0/4096.0;