Remove the "Floating point data" menu item; instead, determine whether

i*2 or r*4 data from sign of parameter userx_no send from Linrad.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2454 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2011-09-29 19:00:54 +00:00
parent 139848d0cb
commit 636d702690
3 changed files with 9 additions and 9 deletions

View File

@ -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

View File

@ -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:]

View File

@ -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