Working version 0.7. Could be sent to beta testers.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@448 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-06-30 17:08:27 +00:00
parent 2c06698a94
commit d4b37f2419
4 changed files with 23 additions and 19 deletions

View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------- MAP65
#-------------------------------------------------------------------- MAP65
# $Date$ $Revision$
#
from Tkinter import *

View File

@ -12,7 +12,6 @@ subroutine map65a(newdat)
character*3 shmsg0(4),shmsg
integer indx(MAXMSG),nsiz(MAXMSG)
logical done(MAXMSG)
logical even
character decoded*22,blank*22
include 'spcom.f90'
real short(3,NFFT) !SNR dt ipol for potential shorthands
@ -23,11 +22,11 @@ subroutine map65a(newdat)
data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/
save
print*,'C ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym
pctlost=nlost/331.03
if(nlost.ne.0) write(*,1001) nutc,nlost,pctlost
1001 format('UTC:',i5.4,' Lost packets:',i6,', or',f6.1,' %')
even=mod(nutc,2).eq.0
! if(nlost.ne.0) then
pctlost=nlost/331.03
write(*,3001) nutc,mod(mid_sec(),60),nlost,pctlost
3001 format('mod65a 1:',i5.4,i3.2,i8,f6.1,' %')
! endif
rewind 11
rewind 12
@ -227,7 +226,8 @@ subroutine map65a(newdat)
write(11,*) '$EOF'
call flushqqq(11)
print*,'D ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym
write(*,3002) mod(mid_sec(),60)
3002 format('mod65a 2:'i8.2)
ndecdone=1
endif
if(nagain.eq.1) go to 999
@ -309,6 +309,7 @@ subroutine map65a(newdat)
if(kbuf.eq.1) kkdone=60*96000
if(kbuf.eq.2 .or. ndiskdat.eq.1) kkdone=0
kk=kkdone
print*,'E ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,ndiskdat
write(*,3003) mod(mid_sec(),60)
3003 format('mod65a 3:'i8.2)
return
end subroutine map65a

View File

@ -102,20 +102,19 @@ subroutine recvpkt(iarg)
ns=mod(nsec,60)
nsec0=nsec
ntx=ntx+transmitting
print*,ns,kb,kbuf,k,kk,kkdone
if(ns.eq.48) then
nutc=mutc
kbuf=kb
kk=k
print*,'A1',mod(mid_sec(),60),nutc,kk,kbuf,kkdone
ndiskdat=0
write(*,3001) nutc,mod(mid_sec(),60),ns !,kk,kbuf,kkdone
3001 format('recvpkt 1:',i5.4,2i3.2)
endif
if(ns.eq.52) then
nutc=mutc
kbuf=kb
kk=k
ndiskdat=0
print*,'A2',mod(mid_sec(),60),nutc,kk,kbuf,kkdone
write(*,3002) nutc,mod(mid_sec(),60),ns !,kk,kbuf,kkdone
3002 format('recvpkt 2:',i5.4,2i3.2)
endif
endif
go to 10

View File

@ -12,7 +12,8 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
data kbuf0/-999/
save
print*,'B ',mod(mid_sec(),60),0,kk,kbuf,kkdone
write(*,3001) nutc,mod(mid_sec(),60) !,kk,kbuf,kkdone
3001 format('symspec 1:',i5.4,i3.2)
fac=0.0002 * 10.0**(0.05*(-rxnoise))
hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
npts=hsym !Integral samples per half symbol
@ -33,7 +34,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
do nn=1,ntot
i0=ts+hsym !Starting sample pointer
if((i0+npts-1).gt.kk) go to 999 !See if we have enough points
if((i0+npts-1).gt.kk) go to 998 !See if we have enough points
i1=ts+2*hsym !Next starting sample pointer
ts=ts+hsym !OK, update the exact sample pointer
do i=1,npts !Copy data to FFT arrays
@ -100,13 +101,16 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
call move(szavg,savg,4*NFFT)
newdat=1
ndecoding=1
return
go to 999
endif
kkdone=i1-1
nhsym=n
call sleep_msec(0)
enddo
999 kkdone=i1-1
998 kkdone=i1-1
999 continue
write(*,3002) mod(mid_sec(),60),n !,kk,kbuf,kkdone
3002 format('symspec 2:',i8.2,i5)
return
end subroutine symspec