mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-08-15 12:12:31 -04:00
Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0
This commit is contained in:
commit
c8fd0b0988
@ -282,7 +282,7 @@ contains
|
|||||||
call timer('sync4d ',1)
|
call timer('sync4d ',1)
|
||||||
enddo
|
enddo
|
||||||
if(iseg.eq.1) smax1=smax
|
if(iseg.eq.1) smax1=smax
|
||||||
if(smax.lt.0.7) cycle
|
if(smax.lt.1.2) cycle
|
||||||
if(iseg.gt.1 .and. smax.lt.smax1) cycle
|
if(iseg.gt.1 .and. smax.lt.smax1) cycle
|
||||||
f1=f0+real(idfbest)
|
f1=f0+real(idfbest)
|
||||||
if( f1.le.10.0 .or. f1.ge.4990.0 ) cycle
|
if( f1.le.10.0 .or. f1.ge.4990.0 ) cycle
|
||||||
@ -401,8 +401,8 @@ contains
|
|||||||
if(iaptype.eq.4 .or. iaptype.eq.5 .or. iaptype.eq.6) then
|
if(iaptype.eq.4 .or. iaptype.eq.5 .or. iaptype.eq.6) then
|
||||||
apmask=0
|
apmask=0
|
||||||
if(ncontest.le.4) then
|
if(ncontest.le.4) then
|
||||||
apmask(1:91)=1 ! mycall, hiscall, RRR|73|RR73
|
apmask(1:77)=1 ! mycall, hiscall, RRR|73|RR73
|
||||||
if(iaptype.eq.6) llrd(1:91)=apmag*apbits(1:91)
|
if(iaptype.eq.6) llrd(1:77)=apmag*apbits(1:77)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user