From a93c9c65ed15f88e0ac7959d5ac2c50203ea258e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 3 Jul 2007 14:50:03 +0000 Subject: [PATCH] Don't "blue out" the decode button if we're transmitting. Display UTC and percent lost packets with debug level 1. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- map65.py | 6 ++++-- map65a.f90 | 15 +++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/map65.py b/map65.py index 8b79aea64..b5c80c411 100644 --- a/map65.py +++ b/map65.py @@ -914,7 +914,7 @@ def update(): ldate.configure(text=t) t="Rx noise: %.1f dB" % Audio.gcom2.rxnoise msg4.configure(text=t) - t="Drop: %.1f %%" % Audio.gcom2.pctlost + t="Drop: %.2f %%" % Audio.gcom2.pctlost msg5.configure(text=t) root_geom=root.geometry() try: @@ -984,8 +984,10 @@ def update(): t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),) msg3.configure(text=t) + txminute=0 + if Audio.gcom2.lauto and utc[4]%2 == Audio.gcom1.txfirst: txminute=1 if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \ - (isec>45 and Audio.gcom2.monitoring==1 and \ + (isec>45 and txminute==0 and \ Audio.datcom.kkdone!=-99 and Audio.gcom2.ndiskdat!=1)): #Set button bg while decoding bc='#66FFFF' diff --git a/map65a.f90 b/map65a.f90 index a23ec80a7..8bf8cbd78 100644 --- a/map65a.f90 +++ b/map65a.f90 @@ -307,15 +307,18 @@ subroutine map65a(newdat) if(nsave.gt.0) call savetf2(id(1,1,kbuf),nsave,nutc) -999 nagain=0 - close(23) +999 close(23) if(kbuf.eq.1) kkdone=60*96000 if(kbuf.eq.2 .or. ndiskdat.eq.1) kkdone=0 kk=kkdone - t3=sec_midn() - if(ndebug.eq.2) write(*,3003) mod(int(t3),60) + if(nagain.eq.0) then + t3=sec_midn() + if(ndebug.eq.2) write(*,3003) mod(int(t3),60) 3003 format('mod65a 3:'i8.2) - if(ndebug.eq.1) write(*,3004) mod(t2,60.0),mod(t3,60.0) -3004 format('mod65a:',2f6.1) + if(ndebug.eq.1) write(*,3004) nutc,mod(t2,60.0),mod(t3,60.0),pctlost +3004 format('mod65a:',i5.4,1x,2f6.1,f8.2,' %') + endif + nagain=0 + return end subroutine map65a