diff --git a/avemsg65.f b/avemsg65.f index d37bf3bed..2bf306863 100644 --- a/avemsg65.f +++ b/avemsg65.f @@ -8,6 +8,7 @@ C Decodes averaged JT65 data for the specified segment (mseg=1 or 2). character decoded*22,deepmsg*22 character mycall*12,hiscall*12,hisgrid*6 real s3(64,63) + logical ltext common/ave/ppsave(64,63,MAXAVE),nflag(MAXAVE),nsave,iseg(MAXAVE) C Count the available spectra for this Monitor segment (mseg=1 or 2), @@ -36,7 +37,7 @@ C Compute the average of all flagged spectra for this segment. enddo nadd=nused*mode65 - call extract(s3,nadd,ncount,decoded) !Extract the message + call extract(s3,nadd,ncount,decoded,ltext) !Extract the message if(ncount.lt.0) decoded=' ' nqual=0 diff --git a/decode65b.f b/decode65b.f index ec0dab467..d8b70ec22 100644 --- a/decode65b.f +++ b/decode65b.f @@ -3,7 +3,7 @@ real s2(256,126) real s3(64,63) - logical first + logical first,ltext character decoded*22,deepmsg*22 character mycall*12,hiscall*12,hisgrid*6 ! include 'avecom.h' @@ -25,10 +25,11 @@ mode65=2 nadd=mode65 - call extract(s3,nadd,ncount,nhist,decoded) !Extract the message -C Suppress "birdie messages": + call extract(s3,nadd,ncount,nhist,decoded,ltext) !Extract the message +C Suppress "birdie messages" and other garbage decodes: if(decoded(1:7).eq.'000AAA ') ncount=-1 if(decoded(1:7).eq.'0L6MWK ') ncount=-1 + if(flip.lt.0.0 .and. ltext) ncount=-1 nkv=1 if(ncount.lt.0) then nkv=0 diff --git a/extract.f b/extract.f index 77a4dfd46..2301f6f12 100644 --- a/extract.f +++ b/extract.f @@ -1,11 +1,11 @@ - subroutine extract(s3,nadd,ncount,nhist,decoded) + subroutine extract(s3,nadd,ncount,nhist,decoded,ltext) real s3(64,63) real tmp(4032) character decoded*22 integer era(51),dat4(12),indx(64) integer mrsym(63),mr2sym(63),mrprob(63),mr2prob(63) - logical first + logical first,ltext data first/.true./,nsec1/0/ save @@ -55,8 +55,10 @@ endif read(22,rec=2) nsec2,ncount,dat4 decoded=' ' + ltext=.false. if(ncount.ge.0) then call unpackmsg(dat4,decoded) !Unpack the user message + if(iand(dat4(10),8).ne.0) ltext=.true. endif endif 20 if(ndec.eq.0) then diff --git a/map65.py b/map65.py index 1c06eb2d0..e70433346 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#-------------------------------------------------------------------- MAP65 +#--------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import *