w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix pack/unpack bugs reported by VE5VA.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3121 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-02 16:37:10 +00:00
parent 1017746f07
commit 3f1d3a32ec
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/packtext.f
View File

@ -2,7 +2,7 @@
parameter (MASK28=2**28 - 1) parameter (MASK28=2**28 - 1)
character*13 msg character*13 msg
character*44 c character*42 c
data c/'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ +-./?'/ data c/'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ +-./?'/
nc1=0 nc1=0
@ -10,7 +10,7 @@
nc3=0 nc3=0
do i=1,5 !First 5 characters in nc1 do i=1,5 !First 5 characters in nc1
do j=1,44 !Get character code do j=1,42 !Get character code
if(msg(i:i).eq.c(j:j)) go to 10 if(msg(i:i).eq.c(j:j)) go to 10
enddo enddo
j=37 j=37
@ -19,7 +19,7 @@
enddo enddo
do i=6,10 !Characters 6-10 in nc2 do i=6,10 !Characters 6-10 in nc2
do j=1,44 !Get character code do j=1,42 !Get character code
if(msg(i:i).eq.c(j:j)) go to 20 if(msg(i:i).eq.c(j:j)) go to 20
enddo enddo
j=37 j=37
@ -28,7 +28,7 @@
enddo enddo
do i=11,13 !Characters 11-13 in nc3 do i=11,13 !Characters 11-13 in nc3
do j=1,44 !Get character code do j=1,42 !Get character code
if(msg(i:i).eq.c(j:j)) go to 30 if(msg(i:i).eq.c(j:j)) go to 30
enddo enddo
j=37 j=37

2
lib/unpackmsg.f90
View File

@ -16,7 +16,7 @@ subroutine unpackmsg(dat,msg)
ng=ishft(iand(dat(10),15),12) + ishft(dat(11),6) + dat(12) ng=ishft(iand(dat(10),15),12) + ishft(dat(11),6) + dat(12)
if(ng.gt.32768) then if(ng.ge.32768) then
call unpacktext(nc1,nc2,ng,msg) call unpacktext(nc1,nc2,ng,msg)
go to 100 go to 100
endif endif

2
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//-------------------------------------------------------------- MainWindow //------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"

2
wsjtx.iss
View File

@ -1,6 +1,6 @@
[Setup] [Setup]
AppName=wsjtx AppName=wsjtx
AppVerName=wsjtx Version 0.8 r3113 AppVerName=wsjtx Version 0.8 r3118
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx DefaultGroupName=wsjtx