mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-25 13:48:42 -05:00
Suppressed duplicate decodes must also be at the same frequency.
This commit is contained in:
parent
2af2d8131d
commit
f11b38fb28
@ -9,6 +9,7 @@ subroutine display(nkeep,ftol)
|
||||
real freqkHz(MAXLINES)
|
||||
integer utc(MAXLINES),utc2(MX),utcz
|
||||
real*8 f0
|
||||
save
|
||||
|
||||
out0=' '
|
||||
rewind(26)
|
||||
@ -134,8 +135,9 @@ subroutine display(nkeep,ftol)
|
||||
index(livecq,' CQH ').gt.0) write(19,1029) livecq
|
||||
1029 format(a58)
|
||||
|
||||
! Suppress listing duplicate (same time, same decoded message)
|
||||
if(out(14:17).ne.out0(14:17) .or. out(26:50).ne.out0(26:50)) then
|
||||
! Suppress listing duplicate (same time, decoded message, and frequency)
|
||||
if(out(14:17).ne.out0(14:17) .or. out(26:50).ne.out0(26:50) .or. &
|
||||
out(1:3).ne.out0(1:3)) then
|
||||
write(*,1030) out !Messages
|
||||
1030 format('@',a52)
|
||||
out0=out
|
||||
|
@ -38,6 +38,7 @@ subroutine q65b(nutc,nqd,nxant,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
|
||||
data nutc00/-1/,msg00/' '/
|
||||
save
|
||||
|
||||
if(newdat.eq.1) nutc00=-1
|
||||
open(9,file='wsjtx_dir.txt',status='old')
|
||||
read(9,'(a)') wsjtx_dir !Establish the working directory
|
||||
close(9)
|
||||
@ -174,13 +175,15 @@ subroutine q65b(nutc,nqd,nxant,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
|
||||
':',cp,cmode
|
||||
1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i5.4,4x,a22,1x,2a1,2x,a2)
|
||||
|
||||
! Suppress writing duplicates (same time, same decoded message) to map65_rx.log
|
||||
if(nutc.ne.nutc00 .or. msg0(1:28).ne.msg00) then
|
||||
! Suppress writing duplicates (same time, decoded message, and frequency)
|
||||
! to map65_rx.log
|
||||
if(nutc.ne.nutc00 .or. msg0(1:28).ne.msg00 .or. freq1.ne.freq1_00) then
|
||||
! Write to file map65_rx.log:
|
||||
write(21,1110) freq1,ndf,xdt0,npol,nsnr0,nutc,msg0(1:28),cq0
|
||||
1110 format(f8.3,i5,f5.1,2i4,i5.4,2x,a28,': A',2x,a3)
|
||||
nutc00=nutc
|
||||
msg00=msg0(1:28)
|
||||
freq1_00=freq1
|
||||
endif
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user