diff --git a/datcom.f90 b/datcom.f90 index c09c0f726..86a7e4594 100644 --- a/datcom.f90 +++ b/datcom.f90 @@ -1,5 +1,5 @@ parameter (NSMAX=60*96000) !Samples per 60 s file integer*2 id !46 MB: raw data from Linrad timf2 character*80 fname80 -common/datcom/id(4,NSMAX,2),nutc,newdat2,kbuf,kk,kkdone,nlost, & +common/datcom/id(4,NSMAX,2),nutc,newdat2,kbuf,kxp,kk,kkdone,nlost, & nlen,fname80 diff --git a/map65.py b/map65.py index 4004933bb..df6122e64 100644 --- a/map65.py +++ b/map65.py @@ -17,7 +17,7 @@ from types import * import array root = Tk() -Version="0.7 r" + "$Rev$"[6:-1] +Version="0.8 r" + "$Rev$"[6:-1] print "******************************************************************" print "MAP65 Version " + Version + ", by K1JT" print "Revision date: " + \ @@ -61,6 +61,7 @@ hisgrid="" isec0=-99 k2txb=IntVar() kb8rq=IntVar() +kxp0=0 loopall=0 mode=StringVar() mode.set("") @@ -187,6 +188,8 @@ def messages(event=NONE): bm.geometry(bm_geom) if g.Win32: bm.iconbitmap("wsjt.ico") iframe_bm1 = Frame(bm, bd=1, relief=SUNKEN) + Label(iframe_bm1,text='Freq DF Pol UTC').pack(anchor=W, \ + pady=0,side='top') msgtext=Text(iframe_bm1, height=35, width=41, bg="Navy", fg="yellow") msgtext.bind('',dbl_click_msgtext) msgtext.pack(side=LEFT, fill=X, padx=1, pady=3) @@ -922,7 +925,7 @@ def GenAltMsgs(event=NONE): #------------------------------------------------------ update def update(): - global root_geom,isec0,naz,nel,ndmiles,ndkm,nopen, \ + global root_geom,isec0,naz,nel,ndmiles,ndkm,nopen,kxp0, \ im,pim,cmap0,isync,isync_save,idsec,first,itol,txsnrdb,tx6alt,\ bm_geom,bm2_geom @@ -949,6 +952,12 @@ def update(): options.MyGrid.get().upper(),HisGrid.get().upper(),utchours) azdist() g.nfreq=nfreq.get() + kxp=int(Audio.datcom.kxp) + if kxp-kxp0 < 50000: + msg5.configure(text='No data',bg='red') + else: + msg5.configure(bg='gray85') + kxp0=kxp if Audio.gcom2.ndecoding==0: g.AzSun,g.ElSun,g.AzMoon,g.ElMoon,g.AzMoonB,g.ElMoonB,g.ntsky, \ @@ -1105,8 +1114,6 @@ def update(): lines="" msgtext.configure(state=NORMAL) msgtext.delete('1.0',END) - msgtext.insert(END,'Freq DF Pol UTC\n') - msgtext.insert(END,'----------------------------------------\n') for i in range(len(lines)): try: nage=int(lines[i][41:]) diff --git a/map65a.F90 b/map65a.F90 index b5d61ae66..53b640490 100644 --- a/map65a.F90 +++ b/map65a.F90 @@ -254,12 +254,14 @@ subroutine map65a(newdat) iloop=iloop+1 go to 1 endif - write(11,*) '$EOF' - call flushqqq(11) - ndecdone=1 - t2=sec_midn() - if(ndebug.eq.2) write(*,3002) mod(int(t2),60) -3002 format('mod65a 2:'i8.2) + if(nqd.eq.1) then + write(11,*) '$EOF' + call flushqqq(11) + ndecdone=1 + t2=sec_midn() + if(ndebug.eq.2) write(*,3002) mod(int(t2),60) +3002 format('mod65a 2:'i8.2) + endif if(nagain.eq.1) go to 999 enddo diff --git a/recvpkt.F90 b/recvpkt.F90 index 92970039d..fc8a613b5 100644 --- a/recvpkt.F90 +++ b/recvpkt.F90 @@ -76,6 +76,7 @@ subroutine recvpkt(iarg) enddo sqave=sqave + u*(sq-sqave) rxnoise=10.0*log10(sqave) - 48.0 + kxp=k if(mode.eq.'Measur') then npkt=npkt+1 diff --git a/specjt.py b/specjt.py index 277294204..5dfc3563f 100644 --- a/specjt.py +++ b/specjt.py @@ -289,7 +289,7 @@ def update(): nfreeze0=int(Audio.gcom2.nfreeze) if g.mode!=mode0: - draw_axis() + df_mark() ### was draw_axis() mode0=g.mode if nmark.get()!=nmark0: