diff --git a/Configuration.hpp b/Configuration.hpp index 128ec570b..3f5bc1a50 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -134,8 +134,6 @@ public: bool twoPass() const; bool bFox() const; bool bHound() const; - bool bGenerate77() const; - bool bDecode77() const; bool x2ToneSpacing() const; bool x4ToneSpacing() const; bool MyDx() const; diff --git a/commons.h b/commons.h index 926cbc848..7c202d26e 100644 --- a/commons.h +++ b/commons.h @@ -44,7 +44,6 @@ extern struct dec_data { bool lft8apon; bool lapcqonly; bool ljt65apon; - bool ldecode77; int napwid; int ntxmode; int nmode; diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 064fc907e..e1fb40436 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -100,8 +100,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample) params%nftx,newdat,params%nutc,params%nfa,params%nfb, & params%ndepth,ncontest,logical(params%nagain), & logical(params%lft8apon),logical(params%lapcqonly), & - logical(params%ldecode77),params%napwid, & - mycall,hiscall,hisgrid) + params%napwid,mycall,hiscall,hisgrid) call timer('decft8 ',1) if(nfox.gt.0) then n30min=minval(n30fox(1:nfox)) diff --git a/lib/ft8/sync8.f90 b/lib/ft8/sync8.f90 index 50817a93c..f68e0a9c8 100644 --- a/lib/ft8/sync8.f90 +++ b/lib/ft8/sync8.f90 @@ -1,11 +1,10 @@ -subroutine sync8(dd,nfa,nfb,syncmin,nfqso,ldecode77,maxcand,s,candidate, & +subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,s,candidate, & ncand,sbase) include 'ft8_params.f90' ! Search over +/- 2.5s relative to 0.5s TX start time. parameter (JZ=62) complex cx(0:NH1) - logical ldecode77 real s(NH1,NHSYM) real savg(NH1) real sbase(NH1) diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 4d2a7152d..511252c42 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -33,7 +33,7 @@ module ft8_decode contains subroutine decode(this,callback,iwave,nQSOProgress,nfqso,nftx,newdat, & - nutc,nfa,nfb,ndepth,ncontest,nagain,lft8apon,lapcqonly,ldecode77, & + nutc,nfa,nfb,ndepth,ncontest,nagain,lft8apon,lapcqonly, & napwid,mycall12,hiscall12,hisgrid6) ! use wavhdr use timer_module, only: timer @@ -47,7 +47,7 @@ contains real sbase(NH1) real candidate(3,MAXCAND) real dd(15*12000) - logical, intent(in) :: lft8apon,lapcqonly,ldecode77,nagain + logical, intent(in) :: lft8apon,lapcqonly,nagain logical newdat,lsubtract,ldupe character*12 mycall12,hiscall12,mycall12_0 character*6 hisgrid6 @@ -103,7 +103,7 @@ contains endif call timer('sync8 ',0) maxc=MAXCAND - call sync8(dd,ifa,ifb,syncmin,nfqso,ldecode77,maxc,s,candidate, & + call sync8(dd,ifa,ifb,syncmin,nfqso,maxc,s,candidate, & ncand,sbase) call timer('sync8 ',1) do icand=1,ncand diff --git a/lib/jt9.f90 b/lib/jt9.f90 index bc445fd38..ff548b46e 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -263,7 +263,6 @@ program jt9 shared_data%params%ndepth=ndepth shared_data%params%lft8apon=.true. shared_data%params%ljt65apon=.true. - shared_data%params%ldecode77=.false. shared_data%params%napwid=75 shared_data%params%dttol=3. diff --git a/lib/jt9com.f90 b/lib/jt9com.f90 index 4ce7b6ea6..c595582d6 100644 --- a/lib/jt9com.f90 +++ b/lib/jt9com.f90 @@ -26,7 +26,6 @@ logical(c_bool) :: lft8apon logical(c_bool) :: lapcqonly logical(c_bool) :: ljt65apon - logical(c_bool) :: ldecode77 integer(c_int) :: napwid integer(c_int) :: ntxmode integer(c_int) :: nmode diff --git a/mainwindow.cpp b/mainwindow.cpp index 388c86a1d..bd23b3d07 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2770,7 +2770,6 @@ void MainWindow::decode() //decode() dec_data.params.nexp_decode = static_cast (m_config.special_op_id()); if(m_config.single_decode()) dec_data.params.nexp_decode += 32; if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64; - dec_data.params.ldecode77 = true; strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20); strncpy(dec_data.params.mycall, (m_config.my_callsign()+" ").toLatin1(),12);