diff --git a/gcom2.f90 b/gcom2.f90 index 39aa55b70..7aa596cc5 100644 --- a/gcom2.f90 +++ b/gcom2.f90 @@ -20,7 +20,7 @@ integer mcall3 !CALL3.TXT has been modified GUI,Decoder integer mousebutton !Which button was clicked? GUI integer multicast !1 for multicast data, 0 for unicast GUI integer ndecdone !Is decoder finished? GUI,Decoder -integer nfloat !Floating-point data from Linrad? GUI +integer nfloat !Floating-point data from Linrad? recvpkt integer ierr !Error opening *.tf2 file GUI integer lauto !Are we in Auto mode? GUI integer mantx !Manual transmission requested? GUI,SoundIn diff --git a/map65.py b/map65.py index 67aacf5ad..096d5a326 100644 --- a/map65.py +++ b/map65.py @@ -59,8 +59,6 @@ bm_geom="" bm2_geom="" cmap0="Linrad" fileopened="" -floatpt=IntVar() -floatpt.set(0) font1='Helvetica' fqso0=125 hiscall="" @@ -1002,7 +1000,8 @@ def update(): t=time.strftime('%Y %b %d\n%H:%M:%S',utc) Audio.gcom2.utcdate=t[:12] ldate.configure(text=t) - t="Rx: %.1f dB %.1f %%" % (Audio.gcom2.rxnoise,Audio.gcom2.pctblank) + t="Rx: %.1f dB %.1f %% %d" % (Audio.gcom2.rxnoise, \ + Audio.gcom2.pctblank,Audio.gcom2.nfloat) msg4.configure(text=t) t="Drop: %.2f %%" % Audio.gcom2.pctlost msg5.configure(text=t) @@ -1315,7 +1314,6 @@ def update(): Audio.gcom2.neme=neme.get() Audio.gcom2.ndepth=ndepth.get() Audio.gcom2.multicast=multicast.get() - Audio.gcom2.nfloat=floatpt.get() Audio.gcom2.nxant=options.xant.get() try: Audio.gcom2.idinterval=options.IDinterval.get() @@ -1414,8 +1412,6 @@ setupmenu.add_radiobutton(label = 'Input data multicast', variable=multicast, \ setupmenu.add_radiobutton(label = 'Input data unicast', variable=multicast, \ value=0) setupmenu.add_separator() -setupmenu.add_checkbutton(label = 'Floating point data', variable=floatpt) -setupmenu.add_separator() setupmenu.add_checkbutton(label = 'Enable diagnostics',variable=ndebug) setupmenu.add_checkbutton(label = 'Verbose diagnostics',variable=ndebug2) @@ -1890,7 +1886,6 @@ try: elif key == 'Multicast': multicast.set(value) elif key == 'Debug': ndebug.set(value) elif key == 'Debug2': ndebug2.set(value) - elif key == 'FloatPt': floatpt.set(value) elif key == 'HisCall': Audio.gcom2.hiscall=(value+' ')[:12] ToRadio.delete(0,99) @@ -1988,7 +1983,6 @@ f.write("NDepth " + str(ndepth.get()) + "\n") f.write("Multicast " + str(multicast.get()) + "\n") f.write("Debug " + str(ndebug.get()) + "\n") f.write("Debug2 " + str(ndebug2.get()) + "\n") -f.write("FloatPt " + str(floatpt.get()) + "\n") mrudir2=mrudir.replace(" ","#") f.write("MRUDir " + mrudir2 + "\n") if g.astro_geom[:7]=="200x200": g.astro_geom="316x373" + g.astro_geom[7:] diff --git a/recvpkt.F90 b/recvpkt.F90 index ab0d0fc2f..039963d90 100644 --- a/recvpkt.F90 +++ b/recvpkt.F90 @@ -40,6 +40,12 @@ subroutine recvpkt(iarg) 10 if(multicast.ne.multicast0) go to 1 call recv_pkt(center_freq) + if(userx_no.lt.0) then + nfloat=1 + else + nfloat=0 + endif + iz=174 if(nfloat.ne.0) iz=87