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

Add a new AP type for JT65 to support skeds (as recommended by Charlie G3WDG and Rex VK7MO). 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8477 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2018-02-07 22:45:26 +00:00
parent 64c0b304f1
commit cf1021d1c7
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/extract.f90
View File

@ -25,7 +25,7 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, &
character*12 mycall_12,hiscall_12
character*6 mycall,hiscall,hisgrid
character*6 mycall0,hiscall0,hisgrid0
integer apsymbols(5,12),ap(12)
integer apsymbols(6,12),ap(12)
integer nappasses(0:5) ! the number of decoding passes to use for each QSO state
integer naptypes(0:5,4) ! (nQSOProgress, decoding pass) maximum of 4 passes for now
integer dat4(12)
@ -46,11 +46,12 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, &
! 3 MyCall DxCall ???
! 4 MyCall DxCall RRR
! 5 MyCall DxCall 73
! 6 MyCall DxCall DxGrid
apsymbols=-1
nappasses=(/2,2,2,3,3,4/)
naptypes(0,1:4)=(/1,2,0,0/)
naptypes(1,1:4)=(/2,3,0,0/)
nappasses=(/3,3,2,3,3,4/)
naptypes(0,1:4)=(/1,2,6,0/)
naptypes(1,1:4)=(/2,3,6,0/)
naptypes(2,1:4)=(/2,3,0,0/)
naptypes(3,1:4)=(/3,4,5,0/)
naptypes(4,1:4)=(/3,4,5,0/)
@ -61,7 +62,8 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, &
mycall=mycall_12(1:6)
hiscall=hiscall_12(1:6)
! Fill apsymbols array
if(ljt65apon .and. (mycall.ne.mycall0 .or. hiscall.ne.hiscall0)) then
if(ljt65apon .and. &
(mycall.ne.mycall0 .or. hiscall.ne.hiscall0 .or. hisgrid.ne.hisgrid0)) then
!write(*,*) 'initializing apsymbols '
apsymbols=-1
mycall0=mycall
@ -84,6 +86,12 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, &
call packmsg(apmessage,ap,itype,.false.)
if(itype.ne.1) ap=-1
apsymbols(5,:)=ap
if(len_trim(hisgrid(1:4)).gt.0) then
apmessage=mycall//' '//hiscall//' '//hisgrid(1:4)
call packmsg(apmessage,ap,itype,.false.)
if(itype.ne.1) ap=-1
apsymbols(6,:)=ap
endif
endif
endif
endif