w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-21 04:58:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the "garbage in console window" problem. ;-0

Browse Source 
Changed rewind to flush for azel.dat.
Corrected a logic error in recvpkt.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1001 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2008-07-26 17:02:48 +00:00
parent 67f16ebfd1
commit 9845df69ae
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
astro0.F90
View File

@ -110,7 +110,7 @@ subroutine astro0(nyear,month,nday,uth8,nfreq,grid,cauxra,cauxdec, &
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,',fQSO')
rewind 14 call flushqqq(14)
isec0=isec isec0=isec
endif endif

5
map65.py
View File

@ -255,10 +255,6 @@ def stopmon(event=NONE):
bmonitor.configure(bg='gray85') bmonitor.configure(bg='gray85')
Audio.gcom2.monitoring=0 Audio.gcom2.monitoring=0
###------------------------------------------------------- toggle_multicast
##def toggle_multicast(event=NONE):
## print multicast.get()
#------------------------------------------------------ dbl_click_text #------------------------------------------------------ dbl_click_text
def dbl_click_text(event): def dbl_click_text(event):
t=text.get('1.0',END) #Entire contents of text box t=text.get('1.0',END) #Entire contents of text box
@ -271,7 +267,6 @@ def dbl_click3_text(event):
n=t1.rfind("\n") n=t1.rfind("\n")
rpt=t1[n+24:n+27] rpt=t1[n+24:n+27]
if rpt[0:1] == " ": rpt=rpt[1:] if rpt[0:1] == " ": rpt=rpt[1:]
print n,rpt,t1
dbl_click_call(t,t1,rpt,1,event) dbl_click_call(t,t1,rpt,1,event)
#------------------------------------------------------ dbl_click_msgtext #------------------------------------------------------ dbl_click_msgtext
def dbl_click_msgtext(event): def dbl_click_msgtext(event):

21
recvpkt.F90
View File

@ -7,14 +7,14 @@ subroutine recvpkt(iarg)
real*8 d8(NSZ) real*8 d8(NSZ)
integer*1 userx_no,iusb integer*1 userx_no,iusb
integer*2 nblock,nblock0 integer*2 nblock,nblock0
logical synced,reset logical synced
real*8 center_freq,buf8 real*8 center_freq,buf8
common/plrscom/center_freq,msec,fqso,iptr,nblock,userx_no,iusb,buf8(174) common/plrscom/center_freq,msec,fqso,iptr,nblock,userx_no,iusb,buf8(174)
include 'datcom.f90' include 'datcom.f90'
include 'gcom1.f90' include 'gcom1.f90'
include 'gcom2.f90' include 'gcom2.f90'
equivalence (id,d8) equivalence (id,d8)
data nblock0/0/,kb/1/,ns0/99/ data nblock0/0/,kb/1/,ns00/99/
data sqave/0.0/,u/0.001/,rxnoise/0.0/,kbuf/1/,lost_tot/0/ data sqave/0.0/,u/0.001/,rxnoise/0.0/,kbuf/1/,lost_tot/0/
data multicast0/-99/ data multicast0/-99/
save save
@ -29,7 +29,6 @@ subroutine recvpkt(iarg)
multicast0=multicast multicast0=multicast
ntx=0 ntx=0
synced=.false. synced=.false.
reset=.false.
10 if(multicast.ne.multicast0) go to 1 10 if(multicast.ne.multicast0) go to 1
call recv_pkt(center_freq) call recv_pkt(center_freq)
@ -41,18 +40,18 @@ subroutine recvpkt(iarg)
! Reset buffer pointers at start of minute. ! Reset buffer pointers at start of minute.
ns=mod(nsec,60) ns=mod(nsec,60)
if((ns.lt.ns0 .and. (lauto+monitoring.ne.0)) .or. reset) then if(ns.lt.ns00 .and. (lauto+monitoring.ne.0)) then
! print*,'new minute:',mod(nsec/60,60),ns00,ns,ntx,kb
if(ntx.eq.0) kb=3-kb if(ntx.eq.0) kb=3-kb
k=(kb-1)*60*96000 k=(kb-1)*60*96000
kxp=k
ndone1=0 ndone1=0
ndone2=0 ndone2=0
ntx=0
lost_tot=0 lost_tot=0
kxp=k
synced=.true. synced=.true.
reset=.false. ntx=0
endif endif
ns0=ns ns00=ns
if(transmitting.eq.1) ntx=1 if(transmitting.eq.1) ntx=1
@ -77,10 +76,7 @@ subroutine recvpkt(iarg)
! Test for buffer full ! Test for buffer full
if((kb.eq.1 .and. (k+174).gt.NSMAX) .or. & if((kb.eq.1 .and. (k+174).gt.NSMAX) .or. &
(kb.eq.2 .and. (k+174).gt.2*NSMAX)) then (kb.eq.2 .and. (k+174).gt.2*NSMAX)) go to 20
reset=.true.
go to 20
endif
! Move data into Rx buffer and compute average signal level. ! Move data into Rx buffer and compute average signal level.
sq=0. sq=0.
@ -126,6 +122,7 @@ subroutine recvpkt(iarg)
kk=k kk=k
nlost=lost_tot ! Save stats for printout nlost=lost_tot ! Save stats for printout
ndone2=1 ndone2=1
! print*,'recvpkt 2:',ns,kb,k
endif endif
endif endif