w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.5.1' of bitbucket.org:k1jt/wsjtx into release-2.5.1

This commit is contained in:
Bill Somerville 2021-10-20 18:02:53 +01:00
parent 595ef8e9db 83c1a85226
commit 7695b7d331
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ft8/ft8apset.f90
View File

@ -6,20 +6,19 @@ subroutine ft8apset(mycall12,hiscall12,ncontest,apsym,aph10)
character*13 hc13 character*13 hc13
character*10 c10 character*10 c10
integer apsym(58),aph10(10) integer apsym(58),aph10(10)
logical nohiscall,unpk77_success logical nohiscall,unpk77_success,std
apsym=0 apsym=0
apsym(1)=99 apsym(1)=99
apsym(30)=99 apsym(30)=99
aph10=0 aph10=0
aph10(1)=99 aph10(1)=99
if(len(trim(mycall12)).lt.3) return if(len(trim(mycall12)).lt.3) return
nohiscall=.false. nohiscall=.false.
hiscall=hiscall12 hiscall=hiscall12
if(len(trim(hiscall)).lt.3) then if(len(trim(hiscall)).lt.3) then
hiscall=mycall12 ! use mycall for dummy hiscall - mycall won't be hashed. hiscall='KA1ABC' !Use a dummy hiscall
nohiscall=.true. nohiscall=.true.
else else
hc13=hiscall hc13=hiscall
@ -34,7 +33,9 @@ subroutine ft8apset(mycall12,hiscall12,ncontest,apsym,aph10)
! Encode a dummy standard message: i3=1, 28 1 28 1 1 15 ! Encode a dummy standard message: i3=1, 28 1 28 1 1 15
! !
msg=trim(mycall12)//' '//trim(hiscall)//' RRR' msg=trim(mycall12)//' '//trim(hiscall)//' RRR'
call stdcall(mycall12,std)
if(.not.std) msg='<'//trim(mycall12)//'> '//trim(hiscall)//' RRR'
i3=0 i3=0
n3=0 n3=0
call pack77(msg,i3,n3,c77) call pack77(msg,i3,n3,c77)

3
lib/q65_decode.f90
View File

@ -134,7 +134,8 @@ contains
ibwa=max(1,int(1.8*log(baud*mode_q65)) + 1) ibwa=max(1,int(1.8*log(baud*mode_q65)) + 1)
ibwb=min(10,ibwa+5) ibwb=min(10,ibwa+5)
maxiters=67 maxiters=67
else if(iand(ndepth,3).eq.3) then endif
if(iand(ndepth,3).eq.3) then
ibwa=max(1,ibwa-1) ibwa=max(1,ibwa-1)
ibwb=min(10,ibwb+1) ibwb=min(10,ibwb+1)
maxiters=100 maxiters=100