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

Fix minor flaws in reporting bad messages by jt65code and jt9code.

This commit is contained in:
Joe Taylor 2018-08-31 11:22:06 -04:00
parent a8ad1569cc
commit 81af6f1ed3
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jt65code.f90
View File

@ -82,10 +82,12 @@ program JT65code
call fmtmsg(decoded,iz) call fmtmsg(decoded,iz)
10 bad=" " 10 bad=" "
if(decoded.ne.msgchk) bad="*"
expected = 'EXACT' expected = 'EXACT'
if (msg0.ne.msgchk) expected = 'TRUNCATED' if(decoded.ne.msg0) then
if (nmsg.eq.1) expected = 'UNKNOWN' bad="*"
if(decoded(1:13).eq.msg0(1:13) .and. &
decoded(14:22).eq. ' ') expected = 'TRUNCATED'
endif
write(*,1020) imsg,msg0,decoded,bad,itype,msgtype,expected write(*,1020) imsg,msg0,decoded,bad,itype,msgtype,expected
1020 format(i2,'.',1x,a22,1x,a22,1x,a1,i3,":",a10,2x,a22) 1020 format(i2,'.',1x,a22,1x,a22,1x,a1,i3,":",a10,2x,a22)
enddo enddo

8
lib/jt9code.f90
View File

@ -71,9 +71,11 @@ program jt9code
10 bad=" " 10 bad=" "
expected = 'EXACT' expected = 'EXACT'
if (msg0.ne.msgchk) expected = 'TRUNCATED' if(decoded.ne.msg0) then
if (nmsg.eq.1) expected = 'UNKNOWN' bad="*"
if(decoded.ne.msgchk) bad="*" if(decoded(1:13).eq.msg0(1:13) .and. &
decoded(14:22).eq. ' ') expected = 'TRUNCATED'
endif
write(*,1020) imsg,msg0,decoded,bad,itype,msgtype,expected write(*,1020) imsg,msg0,decoded,bad,itype,msgtype,expected
1020 format(i2,'.',1x,a22,1x,a22,1x,a1,i3,":",a10,2x,a22) 1020 format(i2,'.',1x,a22,1x,a22,1x,a1,i3,":",a10,2x,a22)
enddo enddo

2
lib/testmsg.f90
View File

@ -16,7 +16,7 @@
"KA1ABC WB9XYZ RRR", & "KA1ABC WB9XYZ RRR", &
"KA1ABC WB9XYZ 73", & "KA1ABC WB9XYZ 73", &
"KA1ABC WB9XYZ", & "KA1ABC WB9XYZ", &
"CQ 000 WB9XYZ EN34", & "CQ 010 WB9XYZ EN34", &
"CQ 999 WB9XYZ EN34", & "CQ 999 WB9XYZ EN34", &
"CQ EU WB9XYZ EN34", & "CQ EU WB9XYZ EN34", &
"CQ WY WB9XYZ EN34", & "CQ WY WB9XYZ EN34", &