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

Move the AA and CC diagnostic writes from jt9a() to decoder(). Add ndecodes to BB and CC.

Browse Source
This commit is contained in:
Joe Taylor 2020-03-12 14:31:02 -04:00
parent f30754bdf5
commit 0d535f24fb
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/decoder.f90
View File

@ -35,6 +35,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
real ss(184,NSMAX) real ss(184,NSMAX)
logical baddata,newdat65,newdat9,single_decode,bVHF,bad0,newdat,ex logical baddata,newdat65,newdat9,single_decode,bVHF,bad0,newdat,ex
integer*2 id2(NTMAX*12000) integer*2 id2(NTMAX*12000)
integer itime(8)
type(params_block) :: params type(params_block) :: params
real*4 dd(NTMAX*12000) real*4 dd(NTMAX*12000)
character(len=20) :: datetime character(len=20) :: datetime
@ -87,6 +88,15 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
if(params%nmode.eq.8) then if(params%nmode.eq.8) then
! We're in FT8 mode ! We're in FT8 mode
call date_and_time(values=itime)
tsec=mod(itime(7)+0.001*itime(8),15.0)
if(tsec.lt.9.0) tsec=tsec+15.0
if(params%nzhsym.eq.41) write(71,3001) ' '
write(71,3001) 'AA Start',params%nzhsym,nint(ss(1,1)), &
params%nutc,tsec
3001 format(a8,2i6,i8,f8.3,i6)
flush(71)
if(ncontest.eq.6) then if(ncontest.eq.6) then
! Fox mode: initialize and open houndcallers.txt ! Fox mode: initialize and open houndcallers.txt
inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex) inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex)
@ -291,6 +301,13 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
close(13) close(13)
if(ncontest.eq.6) close(19) if(ncontest.eq.6) close(19)
if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14) if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14)
call date_and_time(values=itime)
tsec=mod(itime(7)+0.001*itime(8),15.0)
if(tsec.lt.9.0) tsec=tsec+15.0
write(71,3001) 'CC Done ',params%nzhsym,nint(ss(1,1)), &
params%nutc,tsec,ndecoded
flush(71)
return return

4
lib/ft8_decode.f90
View File

@ -181,8 +181,8 @@ contains
700 call date_and_time(values=itime) 700 call date_and_time(values=itime)
tsec=mod(itime(7)+0.001*itime(8),15.0) tsec=mod(itime(7)+0.001*itime(8),15.0)
if(tsec.lt.9.0) tsec=tsec+15.0 if(tsec.lt.9.0) tsec=tsec+15.0
write(71,3001) 'BB Bail ',nzhsym,nint(ss0),nutc,tsec write(71,3001) 'BB Bail ',nzhsym,nint(ss0),nutc,tsec,ndecodes
3001 format(a8,2i6,i8,f8.3) 3001 format(a8,2i6,i8,f8.3,i6)
flush(71) flush(71)
800 ndec_early=0 800 ndec_early=0

18
lib/jt9a.f90
View File

@ -62,16 +62,7 @@ subroutine jt9a()
go to 999 go to 999
endif endif
call c_f_pointer(address_jt9(),shared_data) call c_f_pointer(address_jt9(),shared_data)
local_params=shared_data%params !save a copy because wsjtx carries on accessing local_params=shared_data%params !save a copy because wsjtx carries on accessing
call date_and_time(values=itime)
tsec=mod(itime(7)+0.001*itime(8),15.0)
if(tsec.lt.9.0) tsec=tsec+15.0
if(local_params%nzhsym.eq.41) write(71,3001) ' '
write(71,3001) 'AA Start',local_params%nzhsym,nint(shared_data%ss(1,1)), &
local_params%nutc,tsec
3001 format(a8,2i6,i8,f8.3)
flush(71)
call flush(6) call flush(6)
call timer('decoder ',0) call timer('decoder ',0)
if(local_params%nmode.eq.8 .and. local_params%ndiskdat) then if(local_params%nmode.eq.8 .and. local_params%ndiskdat) then
@ -92,13 +83,6 @@ subroutine jt9a()
call multimode_decoder(shared_data%ss,shared_data%id2,local_params,12000) call multimode_decoder(shared_data%ss,shared_data%id2,local_params,12000)
call timer('decoder ',1) call timer('decoder ',1)
call date_and_time(values=itime)
tsec=mod(itime(7)+0.001*itime(8),15.0)
if(tsec.lt.9.0) tsec=tsec+15.0
write(71,3001) 'CC Done ',local_params%nzhsym,nint(shared_data%ss(1,1)), &
local_params%nutc,tsec
flush(71)
! Wait here until GUI routine decodeDone() has re-created the .lock file ! Wait here until GUI routine decodeDone() has re-created the .lock file
100 inquire(file=trim(temp_dir)//'/.lock',exist=fileExists) 100 inquire(file=trim(temp_dir)//'/.lock',exist=fileExists)
if(fileExists) go to 10 if(fileExists) go to 10