w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-27 07:36:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Set nearly=41; don't write <DecodeFinished> after the early decode pass.

Browse Source
This commit is contained in:
Joe Taylor 2020-02-28 15:03:39 -05:00
parent f9322f2b43
commit 8e7a56634b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/decoder.f90
View File

@ -85,7 +85,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
if(params%nmode.eq.8) then if(params%nmode.eq.8) then
! We're in FT8 mode ! We're in FT8 mode
if(ncontest.eq.6) then if(ncontest.eq.6) then
! Fox mode: initialize and open houndcallers.txt ! Fox mode: initialize and open houndcallers.txt
inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex) inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex)
@ -276,9 +276,11 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
! JT65 is not yet producing info for nsynced, ndecoded. ! JT65 is not yet producing info for nsynced, ndecoded.
800 ndecoded = my_jt4%decoded + my_jt65%decoded + my_jt9%decoded + & 800 ndecoded = my_jt4%decoded + my_jt65%decoded + my_jt9%decoded + &
my_ft8%decoded + my_ft4%decoded my_ft8%decoded + my_ft4%decoded
write(*,1010) nsynced,ndecoded if(params%nmode.ne.8 .or. params%nzhsym.ge.48) then
write(*,1010) nsynced,ndecoded
1010 format('<DecodeFinished>',2i4) 1010 format('<DecodeFinished>',2i4)
call flush(6) call flush(6)
endif
close(13) close(13)
if(ncontest.eq.6) close(19) if(ncontest.eq.6) close(19)
if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14) if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14)

2
lib/jt9.f90
View File

@ -304,7 +304,7 @@ program jt9
if(mode.eq.9 .and. fsplit.ne.2700) shared_data%params%nfa=fsplit if(mode.eq.9 .and. fsplit.ne.2700) shared_data%params%nfa=fsplit
if(mode.eq.8) then if(mode.eq.8) then
! "Early" decoding pass, FT8 only ! "Early" decoding pass, FT8 only
nearly=35 nearly=41
shared_data%params%nzhsym=nearly shared_data%params%nzhsym=nearly
id2a(1:nearly*3456)=shared_data%id2(1:nearly*3456) id2a(1:nearly*3456)=shared_data%id2(1:nearly*3456)
id2a(nearly*3456+1:)=0 id2a(nearly*3456+1:)=0

2
lib/jt9a.f90
View File

@ -64,7 +64,7 @@ subroutine jt9a()
call timer('decoder ',0) call timer('decoder ',0)
if(local_params%nmode.eq.8 .and. local_params%ndiskdat) then if(local_params%nmode.eq.8 .and. local_params%ndiskdat) then
! "Early" decoding pass for data read from disk: FT8 only ! "Early" decoding pass for data read from disk: FT8 only
nearly=35 nearly=41
local_params%nzhsym=nearly local_params%nzhsym=nearly
id2a(1:nearly*3456)=shared_data%id2(1:nearly*3456) id2a(1:nearly*3456)=shared_data%id2(1:nearly*3456)
id2a(nearly*3456+1:)=0 id2a(nearly*3456+1:)=0

2
widgets/mainwindow.h
View File

@ -467,7 +467,7 @@ private:
qint32 m_nFoxFreq; //Audio freq at which Hound received a call from Fox qint32 m_nFoxFreq; //Audio freq at which Hound received a call from Fox
qint32 m_nSentFoxRrpt=0; //Serial number for next R+rpt Hound will send to Fox qint32 m_nSentFoxRrpt=0; //Serial number for next R+rpt Hound will send to Fox
qint32 m_kin0=0; qint32 m_kin0=0;
qint32 m_earlyDecode=35; qint32 m_earlyDecode=41;
bool m_btxok; //True if OK to transmit bool m_btxok; //True if OK to transmit
bool m_diskData; bool m_diskData;