mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-05 08:51:19 -05:00
Added a "Set Tx Freq" command. (Works with station.py)
Diagnostic print for a bounds error in map65a.F90. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1032 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
5469169703
commit
c0681b2305
@ -104,13 +104,14 @@ subroutine astro0(nyear,month,nday,uth8,nfreq,grid,cauxra,cauxdec, &
|
|||||||
ih,im,is,AzSun,ElSun, &
|
ih,im,is,AzSun,ElSun, &
|
||||||
ih,im,is,AzAux,ElAux, &
|
ih,im,is,AzAux,ElAux, &
|
||||||
nfreq,doppler,dfdt,doppler00,dfdt0, &
|
nfreq,doppler,dfdt,doppler00,dfdt0, &
|
||||||
mousefqso
|
mousefqso,nsetftx
|
||||||
1010 format(i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Moon'/ &
|
1010 format(i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Moon'/ &
|
||||||
i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Sun'/ &
|
i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Sun'/ &
|
||||||
i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Source'/ &
|
i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Source'/ &
|
||||||
i4,',',f8.1,',',f8.2,',',f8.1,',',f8.2,',Doppler'/ &
|
i4,',',f8.1,',',f8.2,',',f8.1,',',f8.2,',Doppler'/ &
|
||||||
i4,',fQSO')
|
i4,',',i1,',fQSO')
|
||||||
call flushqqq(14)
|
call flushqqq(14)
|
||||||
|
nsetftx=0
|
||||||
isec0=isec
|
isec0=isec
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@ integer ntr !Are we in 2nd sequence? SoundIn
|
|||||||
integer nmsg !Length of Tx message SoundIn
|
integer nmsg !Length of Tx message SoundIn
|
||||||
integer nsave !Which files to save? GUI
|
integer nsave !Which files to save? GUI
|
||||||
integer nadd5 !Prepend 5 sec of 0's before decoding? GUI
|
integer nadd5 !Prepend 5 sec of 0's before decoding? GUI
|
||||||
|
integer nsetftx !1 to request setting TS-2000 freq GUI,astro0
|
||||||
integer dftolerance !DF tolerance (Hz) GUI
|
integer dftolerance !DF tolerance (Hz) GUI
|
||||||
logical LDecoded !Was a message decoded? Decoder
|
logical LDecoded !Was a message decoded? Decoder
|
||||||
logical rxdone !Has the Rx sequence finished? SoundIn,Decoder
|
logical rxdone !Has the Rx sequence finished? SoundIn,Decoder
|
||||||
@ -108,7 +109,7 @@ common/gcom2/fcenter,ps0(431),psavg(450),s2(64,3100),ccf(-5:540), &
|
|||||||
green(500),fselect,pctlost,pctblank,rxnoise,dphi,ngreen,dgain,iter, &
|
green(500),fselect,pctlost,pctblank,rxnoise,dphi,ngreen,dgain,iter, &
|
||||||
ndecoding,ndecoding0,mousebutton,multicast, &
|
ndecoding,ndecoding0,mousebutton,multicast, &
|
||||||
ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, &
|
ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, &
|
||||||
dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb, &
|
nsetftx,dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb, &
|
||||||
nclearave,nfreeze,nafc,ncsmin,newspec,nfa,nfb,nfcal,idphi,nkeep, &
|
nclearave,nfreeze,nafc,ncsmin,newspec,nfa,nfb,nfcal,idphi,nkeep, &
|
||||||
nmode,mode65,nbpp,ndebug,ndphi,nhispol,nt1, &
|
nmode,mode65,nbpp,ndebug,ndphi,nhispol,nt1, &
|
||||||
nblank,nport,mousedf,mousefqso,neme,nrw26,naggressive,ntx2,nagain, &
|
nblank,nport,mousedf,mousefqso,neme,nrw26,naggressive,ntx2,nagain, &
|
||||||
|
13
map65.py
13
map65.py
@ -927,6 +927,10 @@ def inc_fqso(event=NONE):
|
|||||||
def dec_fqso(event=NONE):
|
def dec_fqso(event=NONE):
|
||||||
Audio.gcom2.mousefqso=Audio.gcom2.mousefqso - 1
|
Audio.gcom2.mousefqso=Audio.gcom2.mousefqso - 1
|
||||||
|
|
||||||
|
#------------------------------------------------------ set_ftx
|
||||||
|
def set_ftx(event=NONE):
|
||||||
|
Audio.gcom2.nsetftx=1
|
||||||
|
|
||||||
#------------------------------------------------------ GenStdMsgs
|
#------------------------------------------------------ GenStdMsgs
|
||||||
def GenStdMsgs(event=NONE):
|
def GenStdMsgs(event=NONE):
|
||||||
global altmsg
|
global altmsg
|
||||||
@ -1555,8 +1559,8 @@ root.bind_all('<Control-o>',openfile)
|
|||||||
root.bind_all('<Control-O>',openfile)
|
root.bind_all('<Control-O>',openfile)
|
||||||
root.bind_all('<Alt-q>',logqso)
|
root.bind_all('<Alt-q>',logqso)
|
||||||
root.bind_all('<Alt-Q>',logqso)
|
root.bind_all('<Alt-Q>',logqso)
|
||||||
root.bind_all('<Alt-s>',stopmon)
|
root.bind_all('<Alt-s>',set_ftx)
|
||||||
root.bind_all('<Alt-S>',stopmon)
|
root.bind_all('<Alt-S>',set_ftx)
|
||||||
root.bind_all('<Alt-x>',decode_exclude)
|
root.bind_all('<Alt-x>',decode_exclude)
|
||||||
root.bind_all('<Alt-X>',decode_exclude)
|
root.bind_all('<Alt-X>',decode_exclude)
|
||||||
root.bind_all('<Alt-z>',toggle_zap)
|
root.bind_all('<Alt-z>',toggle_zap)
|
||||||
@ -1588,7 +1592,7 @@ iframe4b.pack(expand=1, fill=X, padx=4)
|
|||||||
iframe4c = Frame(frame, bd=1, relief=SUNKEN)
|
iframe4c = Frame(frame, bd=1, relief=SUNKEN)
|
||||||
blogqso=Button(iframe4c, text='Log QSO',underline=4,command=logqso,
|
blogqso=Button(iframe4c, text='Log QSO',underline=4,command=logqso,
|
||||||
padx=1,pady=1)
|
padx=1,pady=1)
|
||||||
bstop=Button(iframe4c, text='Stop',underline=0,command=stopmon,
|
bstop=Button(iframe4c, text='Stop',command=stopmon,
|
||||||
padx=1,pady=1)
|
padx=1,pady=1)
|
||||||
bmonitor=Button(iframe4c, text='Monitor',underline=0,command=monitor,
|
bmonitor=Button(iframe4c, text='Monitor',underline=0,command=monitor,
|
||||||
padx=1,pady=1)
|
padx=1,pady=1)
|
||||||
@ -1666,6 +1670,8 @@ f5b.pack(side=LEFT,expand=1,fill=BOTH)
|
|||||||
f5c=Frame(iframe5,bd=2,relief=GROOVE)
|
f5c=Frame(iframe5,bd=2,relief=GROOVE)
|
||||||
txfirst=Checkbutton(f5c,text='Tx First',justify=RIGHT,variable=TxFirst)
|
txfirst=Checkbutton(f5c,text='Tx First',justify=RIGHT,variable=TxFirst)
|
||||||
f5c2=Frame(f5c,bd=0)
|
f5c2=Frame(f5c,bd=0)
|
||||||
|
ftx=Button(f5c,text='Set fTx',underline=0,command=set_ftx,
|
||||||
|
padx=1,pady=1)
|
||||||
genmsg=Button(f5c,text='GenStdMsgs',underline=0,command=GenStdMsgs,
|
genmsg=Button(f5c,text='GenStdMsgs',underline=0,command=GenStdMsgs,
|
||||||
padx=1,pady=1)
|
padx=1,pady=1)
|
||||||
auto=Button(f5c,text='Auto is Off',underline=0,command=toggleauto,
|
auto=Button(f5c,text='Auto is Off',underline=0,command=toggleauto,
|
||||||
@ -1675,6 +1681,7 @@ auto.focus_set()
|
|||||||
txfirst.grid(column=0,row=0,sticky='W',padx=4)
|
txfirst.grid(column=0,row=0,sticky='W',padx=4)
|
||||||
f5c2.grid(column=0,row=1,sticky='W',padx=4)
|
f5c2.grid(column=0,row=1,sticky='W',padx=4)
|
||||||
#sked.grid(column=0,row=3,sticky='W',padx=4)
|
#sked.grid(column=0,row=3,sticky='W',padx=4)
|
||||||
|
ftx.grid(column=0,row=2,sticky='EW',padx=4)
|
||||||
genmsg.grid(column=0,row=4,sticky='W',padx=4)
|
genmsg.grid(column=0,row=4,sticky='W',padx=4)
|
||||||
auto.grid(column=0,row=5,sticky='EW',padx=4)
|
auto.grid(column=0,row=5,sticky='EW',padx=4)
|
||||||
|
|
||||||
|
@ -96,7 +96,13 @@ subroutine map65a(newdat)
|
|||||||
if(mod(i-ia,10).eq.0) then
|
if(mod(i-ia,10).eq.0) then
|
||||||
do jp=1,4
|
do jp=1,4
|
||||||
do ii=-50,50
|
do ii=-50,50
|
||||||
tavg(ii)=savg(jp,i+ii)
|
iii=i+ii
|
||||||
|
if(iii.ge.1 .and. iii.le.32768) then
|
||||||
|
tavg(ii)=savg(jp,iii)
|
||||||
|
else
|
||||||
|
print*,'Error in iii:',iii,ia,ib,fa,fb
|
||||||
|
stop
|
||||||
|
endif
|
||||||
enddo
|
enddo
|
||||||
call pctile(tavg,tmp,101,50,base(jp))
|
call pctile(tavg,tmp,101,50,base(jp))
|
||||||
enddo
|
enddo
|
||||||
|
Loading…
Reference in New Issue
Block a user