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

Fix a crash when a 4 character grid is used in WSPR with a compound callsign 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7041 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-08-29 17:01:53 +00:00
parent d2a191aca0
commit 55a6087403
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/wqencode.f90
View File

@ -6,7 +6,7 @@ subroutine wqencode(msg,ntype,data0)
parameter (MASK15=32767) parameter (MASK15=32767)
character*22 msg character*22 msg
character*12 call1,call2 character*12 call1,call2
character grid4*4,grid6*6 character grid4*4
logical lbad1,lbad2 logical lbad1,lbad2
integer*1 data0(11) integer*1 data0(11)
integer nu(0:9) integer nu(0:9)
@ -46,11 +46,12 @@ subroutine wqencode(msg,ntype,data0)
i4=index(msg,'>') i4=index(msg,'>')
call1=msg(2:i4-1) call1=msg(2:i4-1)
call hash(call1,i4-2,ih) call hash(call1,i4-2,ih)
grid6=msg(i1+1:i1+6) i5=index(trim(msg(i1+1:)),' ')
call2=grid6(2:6)//grid6(1:1)//' ' ! Convert grid to valid callsign format - first character moved to end
call2=msg(i1+2:i1+i5-1)//msg(i1+1:i1+1)//' '
call packcall(call2,n1,lbad1) call packcall(call2,n1,lbad1)
ndbm=0 ndbm=0
read(msg(i1+8:),*) ndbm read(msg(i1+i5+1:),*) ndbm
if(ndbm.lt.0) ndbm=0 if(ndbm.lt.0) ndbm=0
if(ndbm.gt.60) ndbm=60 if(ndbm.gt.60) ndbm=60
ndbm=ndbm+nu(mod(ndbm,10)) ndbm=ndbm+nu(mod(ndbm,10))