Good working version 0.7.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@449 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-06-30 18:39:18 +00:00
parent d4b37f2419
commit 5d3f2b762e
5 changed files with 16 additions and 10 deletions

View File

@ -32,7 +32,8 @@ subroutine decode1(iarg)
newdat=1 newdat=1
endif endif
if((kk-kkdone).gt.32768) call symspec(id,kbuf,kk,kkdone,nutc,t00,newdat) if(ndecoding.eq.0 .and. ((kk-kkdone).gt.32768)) &
call symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then
ndecdone=0 ndecdone=0

View File

@ -1003,7 +1003,10 @@ def update():
msg3.configure(text=t) msg3.configure(text=t)
t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),) t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),)
msg4.configure(text=t) msg4.configure(text=t)
if mode.get()[:4]=='JT65' and Audio.gcom2.ndecoding:
if mode.get()[:4]=='JT65' and \
(Audio.gcom2.ndecoding or (isec>45 and Audio.gcom2.monitoring==1)):
#Set button bg while decoding #Set button bg while decoding
bc='#66FFFF' bc='#66FFFF'
# if g.ndecphase==1: bc='orange' # if g.ndecphase==1: bc='orange'
@ -1233,6 +1236,8 @@ setupmenu.add_checkbutton(label = 'F4 sets Tx6',variable=kb8rq)
setupmenu.add_checkbutton(label = 'Double-click on callsign sets TxFirst', setupmenu.add_checkbutton(label = 'Double-click on callsign sets TxFirst',
variable=setseq) variable=setseq)
setupmenu.add_checkbutton(label = 'GenStdMsgs sets Tx1',variable=k2txb) setupmenu.add_checkbutton(label = 'GenStdMsgs sets Tx1',variable=k2txb)
setupmenu.add_separator()
setupmenu.add_checkbutton(label = 'Enable diagnostics',variable=ndebug)
#------------------------------------------------------ View menu #------------------------------------------------------ View menu
viewbutton=Menubutton(mbar,text='View') viewbutton=Menubutton(mbar,text='View')

View File

@ -24,7 +24,7 @@ subroutine map65a(newdat)
! if(nlost.ne.0) then ! if(nlost.ne.0) then
pctlost=nlost/331.03 pctlost=nlost/331.03
write(*,3001) nutc,mod(mid_sec(),60),nlost,pctlost if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60),nlost,pctlost
3001 format('mod65a 1:',i5.4,i3.2,i8,f6.1,' %') 3001 format('mod65a 1:',i5.4,i3.2,i8,f6.1,' %')
! endif ! endif
@ -226,7 +226,7 @@ subroutine map65a(newdat)
write(11,*) '$EOF' write(11,*) '$EOF'
call flushqqq(11) call flushqqq(11)
write(*,3002) mod(mid_sec(),60) if(ndebug.gt.0) write(*,3002) mod(mid_sec(),60)
3002 format('mod65a 2:'i8.2) 3002 format('mod65a 2:'i8.2)
ndecdone=1 ndecdone=1
endif endif
@ -309,7 +309,7 @@ subroutine map65a(newdat)
if(kbuf.eq.1) kkdone=60*96000 if(kbuf.eq.1) kkdone=60*96000
if(kbuf.eq.2 .or. ndiskdat.eq.1) kkdone=0 if(kbuf.eq.2 .or. ndiskdat.eq.1) kkdone=0
kk=kkdone kk=kkdone
write(*,3003) mod(mid_sec(),60) if(ndebug.gt.0) write(*,3003) mod(mid_sec(),60)
3003 format('mod65a 3:'i8.2) 3003 format('mod65a 3:'i8.2)
return return
end subroutine map65a end subroutine map65a

View File

@ -108,12 +108,12 @@ subroutine recvpkt(iarg)
kbuf=kb kbuf=kb
kk=k kk=k
ndiskdat=0 ndiskdat=0
write(*,3001) nutc,mod(mid_sec(),60),ns !,kk,kbuf,kkdone if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60),ns
3001 format('recvpkt 1:',i5.4,2i3.2) 3001 format('recvpkt 1:',i5.4,2i3.2)
endif endif
if(ns.eq.52) then if(ns.eq.52) then
kk=k kk=k
write(*,3002) nutc,mod(mid_sec(),60),ns !,kk,kbuf,kkdone if(ndebug.gt.0) write(*,3002) nutc,mod(mid_sec(),60),ns
3002 format('recvpkt 2:',i5.4,2i3.2) 3002 format('recvpkt 2:',i5.4,2i3.2)
endif endif
endif endif

View File

@ -12,7 +12,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
data kbuf0/-999/ data kbuf0/-999/
save save
write(*,3001) nutc,mod(mid_sec(),60) !,kk,kbuf,kkdone if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60)
3001 format('symspec 1:',i5.4,i3.2) 3001 format('symspec 1:',i5.4,i3.2)
fac=0.0002 * 10.0**(0.05*(-rxnoise)) fac=0.0002 * 10.0**(0.05*(-rxnoise))
hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
@ -110,7 +110,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
998 kkdone=i1-1 998 kkdone=i1-1
999 continue 999 continue
write(*,3002) mod(mid_sec(),60),n !,kk,kbuf,kkdone if(ndebug.gt.0) write(*,3002) mod(mid_sec(),60),n
3002 format('symspec 2:',i8.2,i5) 3002 format('symspec 2:',i8.2,i5)
return return
end subroutine symspec end subroutine symspec