diff --git a/deep65.F b/deep65.F index 595fef997..75989b44d 100644 --- a/deep65.F +++ b/deep65.F @@ -83,6 +83,7 @@ mz=1 if(n.eq.1 .and. j3.lt.1 .and. j4.lt.1 .and. + callsign(1:6).ne.' ') mz=MAXRPT+1 + C Test for messages with MyCall + HisCall + report do m=1,mz if(m.gt.1) grid=rpt(m-1) @@ -93,7 +94,9 @@ C Test for messages with MyCall + HisCall + report testmsg(k)=message call encode65(message,ncode(1,k)) nflip(k)=flip + C Insert CQ message + if(j4.lt.1) callgrid(icall)=callsign(1:j2)//' '//grid message='CQ '//callgrid(icall) k=k+1 testmsg(k)=message diff --git a/display.F90 b/display.F90 index 59e1f8ecf..1a4f08be9 100644 --- a/display.F90 +++ b/display.F90 @@ -28,8 +28,8 @@ subroutine display(nkeep) enddo 10 nz=i-1 - utcz=utc(nz) + nz=nz-1 nquad=nkeep/4 do i=1,nz nage=utcz-utc(i) diff --git a/map65.py b/map65.py index 5ccc7d3b9..f32dc53cb 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#--------------------------------------------------------------------- MAP65 +#-------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import * diff --git a/map65a.F90 b/map65a.F90 index 53b640490..f4d81fbfe 100644 --- a/map65a.F90 +++ b/map65a.F90 @@ -333,6 +333,9 @@ subroutine map65a(newdat) endif j=j+nsiz(n) enddo + write(26,1015) nutc +1015 format(39x,i4.4) + call flushqqq(26) call display(nkeep) ndecdone=2 diff --git a/specjt.py b/specjt.py index 5dfc3563f..3c235112a 100644 --- a/specjt.py +++ b/specjt.py @@ -150,6 +150,9 @@ def df_mark(): df=96.0/750.0 x1=393.0 + (Audio.gcom2.mousefqso-125)/df c.create_line(x1,25,x1,12,fill=color,width=2) + x1=393.0 + (Audio.gcom2.nfa-125)/df + x2=393.0 + (Audio.gcom2.nfb-125)/df + c.create_line(x1,25,x2,25,fill=color,width=2) df=96000.0/32768.0 # Mark sync tone and top JT65 tone (green) and shorthand tones (red) @@ -195,7 +198,7 @@ def freeze_decode2(event): #---------------------------------------------------- update def update(): global a,a2,b0,c0,g0,im,im2,isec0,line0,line02,newMinute,\ - nscroll,pim,pim2, \ + nscroll,pim,pim2,nfa0,nfb0, \ root_geom,t0,mousedf0,mousefqso0,nfreeze0,tol0,mode0,nmark0, \ fmid,fmid0,frange,frange0,dftolerance0 @@ -274,14 +277,16 @@ def update(): if (Audio.gcom2.mousedf != mousedf0 or Audio.gcom2.mousefqso != mousefqso0 or - Audio.gcom2.dftolerance != dftolerance0): + Audio.gcom2.dftolerance != dftolerance0 or + Audio.gcom2.nfa != nfa0 or Audio.gcom2.nfb != nfb0): df_mark() - # The following int() calls are to ensure that the values copied to # mousedf0 and mousefqso0 are static. mousedf0=int(Audio.gcom2.mousedf) mousefqso0=int(Audio.gcom2.mousefqso) dftolerance0=int(Audio.gcom2.dftolerance) + nfa0=int(Audio.gcom2.nfa) + nfb0=int(Audio.gcom2.nfb) if Audio.gcom2.nfreeze != nfreeze0: if not Audio.gcom2.nfreeze: draw_axis()