Fixed the "Eddie's ghost" problem.

Fixed the "long decode time" problem.
Leading blanks in Tx message are now ignored.
Decodes of callsign '000AAA ' are now suppressed.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2704 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-10-30 15:02:27 +00:00
parent 408636819f
commit c065fb2067
6 changed files with 17 additions and 7 deletions

View File

@ -49,6 +49,7 @@ subroutine decode9(i1SoftSymbols,msg)
call unpackbits(i4DecodedBytes,nbytes,8,i1DecodedBits)
call packbits(i1DecodedBits,12,6,i4Decoded6BitWords)
call unpackmsg(i4Decoded6BitWords,msg) !Unpack decoded msg
if(index(msg,'000AAA ').gt.0) msg=' '
endif
return

View File

@ -68,10 +68,8 @@ subroutine decoder(ntrSeconds,nRxLog,c0)
if((i.eq.ipk .or. ccfred(i).ge.10.0) .and. f.gt.fgood+10.0*df8) then
call spec9(c0,npts8,nsps,f,fpk,xdt,i1SoftSymbols)
call decode9(i1SoftSymbols,msg)
call pctile(ccfred(ia),ib-ia+1,50,xmed)
snr=10.0*log10(ccfred(i)/xmed) - 10.0*log10(2500.0/df3) + 2.0
sync=ccfred(i)/xmed - 2.0
snr=10.0*log10(ccfred(i)) - 10.0*log10(2500.0/df3) + 2.0
sync=ccfred(i) - 2.0
if(sync.lt.0.0) sync=0.0
nsync=sync
if(nsync.gt.10) nsync=10

View File

@ -16,6 +16,11 @@ subroutine genjt9(message,msgsent,i4tone)
include 'jt9sync.f90'
save
do i=1,22
if(message(1:1).ne.' ') exit
message=message(i+1:)
enddo
call packmsg(message,i4Msg6BitWords) !Pack message into 12 6-bit bytes
call unpackmsg(i4Msg6BitWords,msgsent) !Unpack to get msgsent
call entail(i4Msg6BitWords,i1Msg8BitBytes) !Add tail, convert to 8-bit bytes

View File

@ -64,7 +64,10 @@ subroutine symspec(k,ntrperiod,nsps,nb,nbslider,pxdb,s,red, &
k1=0
k8=0
x2=0.
if(ndiskdat.eq.0) id2(k+1:60*ntrperiod*12000)=0
if(ndiskdat.eq.0) then
id2(k+1:)=0
c0=0. !This is necessary to prevent "ghosts". Not sure why.
endif
endif
k0=k

View File

@ -44,5 +44,8 @@ subroutine sync9(ss,tstep,df3,ntol,nfqso,ccfred,ia,ib,ipkbest)
endif
enddo
call pctile(ccfred(ia),ib-ia+1,50,xmed)
ccfred=ccfred/xmed
return
end subroutine sync9

View File

@ -1,6 +1,6 @@
[Setup]
AppName=wsjtx
AppVerName=wsjtx Version 0.1 r2695
AppVerName=wsjtx Version 0.2 r2704
AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx
@ -14,7 +14,7 @@ Source: "c:\Users\joe\wsjt\wsjtx_install\met8.21"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Quick_Start_Guide.pdf"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\wsjtx_install\save\000000_0000.wav"; DestDir: "{app}\save";
Source: "c:\Users\joe\wsjt\wsjtx_install\000000_0000.wav"; DestDir: "{app}\save";
[Icons]
Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico