mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-07 17:46:04 -05:00
Working better ...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@432 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
66677dab41
commit
92514ba855
@ -28,10 +28,12 @@ subroutine decode1(iarg)
|
|||||||
newdat=1
|
newdat=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if((kk-kkdone).gt.32768) call symspec(id,kbuf,kk,kkdone,rxnoise,newspec)
|
if((kk-kkdone).gt.32768) call symspec(id,kbuf,kk,kkdone,rxnoise, &
|
||||||
|
newspec,newdat,ndecoding)
|
||||||
|
|
||||||
if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then
|
if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then
|
||||||
ndecdone=0
|
ndecdone=0
|
||||||
|
print*,'C',nutc,newdat,kbuf,kk,kkdone
|
||||||
call map65a(newdat)
|
call map65a(newdat)
|
||||||
if(mousebutton.eq.0) ndecoding0=ndecoding
|
if(mousebutton.eq.0) ndecoding0=ndecoding
|
||||||
ndecoding=0
|
ndecoding=0
|
||||||
|
14
recvpkt.F90
14
recvpkt.F90
@ -46,6 +46,11 @@ subroutine recvpkt(iarg)
|
|||||||
endif
|
endif
|
||||||
first=.false.
|
first=.false.
|
||||||
|
|
||||||
|
!###
|
||||||
|
! kbuf=kb
|
||||||
|
! kk=k
|
||||||
|
!###
|
||||||
|
|
||||||
nsec=msec/1000
|
nsec=msec/1000
|
||||||
if(mod(nsec,60).eq.1) nreset=1
|
if(mod(nsec,60).eq.1) nreset=1
|
||||||
if(mod(nsec,60).eq.0 .and. nreset.eq.1) then
|
if(mod(nsec,60).eq.0 .and. nreset.eq.1) then
|
||||||
@ -108,13 +113,14 @@ subroutine recvpkt(iarg)
|
|||||||
nsec0=nsec
|
nsec0=nsec
|
||||||
ntx=ntx+transmitting
|
ntx=ntx+transmitting
|
||||||
if(mod(nsec,60).eq.52) then
|
if(mod(nsec,60).eq.52) then
|
||||||
|
kk=k
|
||||||
kbuf=kb
|
kbuf=kb
|
||||||
nutc=mutc
|
nutc=mutc
|
||||||
klost=nlost
|
klost=nlost
|
||||||
if(ntx.lt.20) then
|
! if(ntx.lt.20) then
|
||||||
newdat=1
|
! newdat=1
|
||||||
ndecoding=1
|
! ndecoding=1
|
||||||
endif
|
! endif
|
||||||
ntx=0
|
ntx=0
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
@ -257,9 +257,13 @@ def update():
|
|||||||
draw2.line((0,0,749,0),fill=128) #Draw the minute separator
|
draw2.line((0,0,749,0),fill=128) #Draw the minute separator
|
||||||
|
|
||||||
t=g.ftnstr(Audio.gcom2.utcdata)
|
t=g.ftnstr(Audio.gcom2.utcdata)
|
||||||
|
|
||||||
|
# This test shouldn.t be needed, but ...
|
||||||
|
try:
|
||||||
draw.text((4,1),t[0:5],fill=253) #Insert time label
|
draw.text((4,1),t[0:5],fill=253) #Insert time label
|
||||||
draw2.text((4,1),t[0:5],fill=253) #Insert time label
|
draw2.text((4,1),t[0:5],fill=253) #Insert time label
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
pim=ImageTk.PhotoImage(im) #Convert Image to PhotoImage
|
pim=ImageTk.PhotoImage(im) #Convert Image to PhotoImage
|
||||||
graph1.delete(ALL)
|
graph1.delete(ALL)
|
||||||
|
13
symspec.f
13
symspec.f
@ -1,4 +1,5 @@
|
|||||||
subroutine symspec(id,kbuf,kk,kkdone,rxnoise,newspec)
|
subroutine symspec(id,kbuf,kk,kkdone,rxnoise,newspec,newdat,
|
||||||
|
+ ndecoding)
|
||||||
|
|
||||||
C Compute spectra at four polarizations, using half-symbol steps.
|
C Compute spectra at four polarizations, using half-symbol steps.
|
||||||
|
|
||||||
@ -30,6 +31,7 @@ C Compute spectra at four polarizations, using half-symbol steps.
|
|||||||
do nn=1,ntot
|
do nn=1,ntot
|
||||||
i0=ts+hsym !Starting sample pointer
|
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 999 !See if we have enough points
|
||||||
|
i1=ts+2*hsym !Next starting sample pointer
|
||||||
ts=ts+hsym !OK, update the exact sample pointer
|
ts=ts+hsym !OK, update the exact sample pointer
|
||||||
do i=1,npts !Copy data to FFT arrays
|
do i=1,npts !Copy data to FFT arrays
|
||||||
xr=fac*id(1,i0+i)
|
xr=fac*id(1,i0+i)
|
||||||
@ -49,6 +51,7 @@ C Compute spectra at four polarizations, using half-symbol steps.
|
|||||||
call four2a(cy,NFFT,1,1,1)
|
call four2a(cy,NFFT,1,1,1)
|
||||||
|
|
||||||
n=n+1
|
n=n+1
|
||||||
|
print*,'B',n,kbuf,kkdone,kk,i0,npts
|
||||||
do i=1,NFFT !Save and accumulate power spectra
|
do i=1,NFFT !Save and accumulate power spectra
|
||||||
sx=real(cx(i))**2 + aimag(cx(i))**2
|
sx=real(cx(i))**2 + aimag(cx(i))**2
|
||||||
ss(1,n,i)=sx ! Pol = 0
|
ss(1,n,i)=sx ! Pol = 0
|
||||||
@ -84,11 +87,15 @@ C Compute spectra at four polarizations, using half-symbol steps.
|
|||||||
ss5(n,i)=0.707*sqrt(q*q + u*u)
|
ss5(n,i)=0.707*sqrt(q*q + u*u)
|
||||||
|
|
||||||
enddo
|
enddo
|
||||||
if(n.eq.ntot) then
|
! if(n.eq.ntot) then
|
||||||
|
if(n.ge.279) then
|
||||||
newspec=1
|
newspec=1
|
||||||
|
newdat=1
|
||||||
|
ndecoding=1
|
||||||
go to 999
|
go to 999
|
||||||
endif
|
endif
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
999 return
|
999 kkdone=i1-1
|
||||||
|
return
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user