From 843add9ff32e7efc504bc60da96dbc8730772dad Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 28 Jun 2007 20:36:17 +0000 Subject: [PATCH] Making progress, but I will need to double-buffer ss(), savg(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@433 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- decode1.F90 | 4 +++- map65.py | 5 +++-- map65a.f90 | 1 + symspec.f | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/decode1.F90 b/decode1.F90 index c0fe69488..c927fba5b 100644 --- a/decode1.F90 +++ b/decode1.F90 @@ -30,6 +30,7 @@ subroutine decode1(iarg) if((kk-kkdone).gt.32768) call symspec(id,kbuf,kk,kkdone,rxnoise, & newspec,newdat,ndecoding) + print*,'A',kbuf,kk,kkdone,newspec,newdat,ndecoding if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then ndecdone=0 @@ -66,7 +67,8 @@ subroutine decode1(iarg) endif #ifdef Win32 - call sleepqq(100) +! call sleepqq(100) + call sleepqq(1000) #else call usleep(100*1000) #endif diff --git a/map65.py b/map65.py index 494d0e128..407df98c4 100644 --- a/map65.py +++ b/map65.py @@ -966,7 +966,8 @@ def update(): Audio.gcom2.nfreeze=1 if Audio.gcom2.monitoring: Audio.gcom2.ndecoding=1 - Audio.gcom2.nagain=0 + # Audio.gcom2.nagain=0 + Audio.gcom2.nagain=1 else: Audio.gcom2.ndecoding=4 Audio.gcom2.nagain=1 @@ -1009,7 +1010,7 @@ def update(): # if g.ndecphase==2: bc='yellow' bdecode.configure(bg=bc,activebackground=bc,state=DISABLED) else: - bdecode.configure(bg='gray85',activebackground='gray95',state=ACTIVE) + bdecode.configure(bg='gray85',activebackground='gray85',state=ACTIVE) g.ndecphase=0 tx1.configure(bg='white') diff --git a/map65a.f90 b/map65a.f90 index 6196bba8f..f34cb750c 100644 --- a/map65a.f90 +++ b/map65a.f90 @@ -24,6 +24,7 @@ subroutine map65a(newdat) include 'gcom2.f90' save +! print*,'a',newdat,nagain,kbuf,kk,kkdone pctlost=nlost/331.03 if(nlost.ne.0) write(*,1001) nutc,nlost,pctlost 1001 format('UTC:',i5.4,' Lost packets:',i6,', or',f6.1,' %') diff --git a/symspec.f b/symspec.f index bf63ca0b7..ab99f9f2f 100644 --- a/symspec.f +++ b/symspec.f @@ -51,7 +51,7 @@ C Compute spectra at four polarizations, using half-symbol steps. call four2a(cy,NFFT,1,1,1) n=n+1 - print*,'B',n,kbuf,kkdone,kk,i0,npts + print*,'B',n,kbuf,kkdone,kk,i0 do i=1,NFFT !Save and accumulate power spectra sx=real(cx(i))**2 + aimag(cx(i))**2 ss(1,n,i)=sx ! Pol = 0