w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 20:28:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks in formatting, etc.

Browse Source
This commit is contained in:
Joe Taylor 2019-01-16 13:58:56 -05:00
parent dc5d9f1617
commit 3023f7e5c6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ft2/ft2.f90
View File

@ -174,6 +174,8 @@ subroutine update(total_time,ic1,ic2)
if(nrx.eq.3) then if(nrx.eq.3) then
call transmit(4,ftx,iptt) call transmit(4,ftx,iptt)
QSO_in_progress=.false. QSO_in_progress=.false.
write(*,1032)
1032 format('QSO complete: S+P side')
else else
call transmit(2,ftx,iptt) call transmit(2,ftx,iptt)
endif endif
@ -181,6 +183,8 @@ subroutine update(total_time,ic1,ic2)
if(ntxed.eq.3) then if(ntxed.eq.3) then
if(nrx.eq.4) then if(nrx.eq.4) then
QSO_in_progress=.false. QSO_in_progress=.false.
write(*,1034)
1034 format('QSO complete: CQ side')
else else
call transmit(3,ftx,iptt) call transmit(3,ftx,iptt)
endif endif
@ -205,6 +209,8 @@ subroutine transmit(nfunc,ftx,iptt)
character*17 cdatetime character*17 cdatetime
integer ptt integer ptt
if(nTxOK.eq.1) return
if(nfunc.eq.1) txmsg='CQ '//trim(mycall)//' '//mygrid if(nfunc.eq.1) txmsg='CQ '//trim(mycall)//' '//mygrid
if(nfunc.eq.2) txmsg=trim(hiscall)//' '//trim(mycall)// & if(nfunc.eq.2) txmsg=trim(hiscall)//' '//trim(mycall)// &
' 559 '//trim(exch) ' 559 '//trim(exch)
@ -218,7 +224,7 @@ subroutine transmit(nfunc,ftx,iptt)
n=len(trim(txmsg)) n=len(trim(txmsg))
write(*,1010) cdatetime(),0,0.0,nint(ftx),(txmsg(i:i),i=1,n) write(*,1010) cdatetime(),0,0.0,nint(ftx),(txmsg(i:i),i=1,n)
write(12,1010) cdatetime(),0,0.0,nint(ftx),(txmsg(i:i),i=1,n) write(12,1010) cdatetime(),0,0.0,nint(ftx),(txmsg(i:i),i=1,n)
1010 format(a17,' Tx',i4,f6.2,i6,2x,37a1) 1010 format(a17,i4,f6.2,i5,' Tx ',37a1)
if(nfunc.ge.1 .and. nfunc.le.4) ntxed=nfunc if(nfunc.ge.1 .and. nfunc.le.4) ntxed=nfunc
if(nfunc.ge.1 .and. nfunc.le.5) ltx(nfunc)=.true. if(nfunc.ge.1 .and. nfunc.le.5) ltx(nfunc)=.true.
if(nfunc.eq.2 .or. nfunc.eq.3) QSO_in_progress=.true. if(nfunc.eq.2 .or. nfunc.eq.3) QSO_in_progress=.true.

2
lib/ft2/ft2_decode.f90
View File

@ -195,7 +195,7 @@ subroutine ft2_decode(cdatetime,nfqso,iwave,ndecodes,mycall,hiscall,nrx)
nseq,nharderror,nhardmin nseq,nharderror,nhardmin
write(12,1000) cdatetime,nsnr,ibest/750.0,nint(freq),message, & write(12,1000) cdatetime,nsnr,ibest/750.0,nint(freq),message, &
nseq,nharderror,nhardmin nseq,nharderror,nhardmin
1000 format(a17,' Rx',i4,f6.2,i6,3x,a37,3i5) 1000 format(a17,i4,f6.2,i5,' Rx ',a37,3i5)
!### Temporary: assume most recent decoded message conveys "hiscall". !### Temporary: assume most recent decoded message conveys "hiscall".
i0=index(message,' ') i0=index(message,' ')