diff --git a/CMakeLists.txt b/CMakeLists.txt index ddf108af9..80866a67e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -427,7 +427,6 @@ set (wsjt_FSRCS lib/fspread_lorentz.f90 lib/ft8/foxfilt.f90 lib/ft8/foxgen.f90 - lib/superfox/foxgen2.f90 lib/ft8/foxgen_wrap.f90 lib/freqcal.f90 lib/ft8/ft8apset.f90 diff --git a/Configuration.cpp b/Configuration.cpp index 870639172..6c387bcbd 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -725,7 +725,6 @@ private: bool decode_at_52s_; bool single_decode_; bool twoPass_; - bool bSuperFox_; bool Individual_Contest_Name_; bool bSpecialOp_; int SelectedActivity_; @@ -834,7 +833,6 @@ bool Configuration::enable_VHF_features () const {return m_->enable_VHF_features bool Configuration::decode_at_52s () const {return m_->decode_at_52s_;} bool Configuration::single_decode () const {return m_->single_decode_;} bool Configuration::twoPass() const {return m_->twoPass_;} -bool Configuration::superFox() const {return m_->bSuperFox_;} bool Configuration::Individual_Contest_Name() const {return m_->Individual_Contest_Name_;} bool Configuration::x2ToneSpacing() const {return m_->x2ToneSpacing_;} bool Configuration::x4ToneSpacing() const {return m_->x4ToneSpacing_;} @@ -1465,7 +1463,6 @@ void Configuration::impl::initialize_models () ui_->decode_at_52s_check_box->setChecked(decode_at_52s_); ui_->single_decode_check_box->setChecked(single_decode_); ui_->cbTwoPass->setChecked(twoPass_); - ui_->cbSuperFox->setChecked(bSuperFox_); ui_->cbContestName->setChecked(Individual_Contest_Name_); ui_->gbSpecialOpActivity->setChecked(bSpecialOp_); ui_->special_op_activity_button_group->button (SelectedActivity_)->setChecked (true); @@ -1734,7 +1731,6 @@ void Configuration::impl::read_settings () decode_at_52s_ = settings_->value("Decode52",false).toBool (); single_decode_ = settings_->value("SingleDecode",false).toBool (); twoPass_ = settings_->value("TwoPass",true).toBool (); - bSuperFox_ = settings_->value("SuperFox",true).toBool (); Individual_Contest_Name_ = settings_->value("Individual_Contest_Name",true).toBool (); bSpecialOp_ = settings_->value("SpecialOpActivity",false).toBool (); SelectedActivity_ = settings_->value("SelectedActivity",1).toInt (); @@ -1883,7 +1879,6 @@ void Configuration::impl::write_settings () settings_->setValue ("Decode52", decode_at_52s_); settings_->setValue ("SingleDecode", single_decode_); settings_->setValue ("TwoPass", twoPass_); - settings_->setValue ("SuperFox", bSuperFox_); settings_->setValue ("Individual_Contest_Name", Individual_Contest_Name_); settings_->setValue ("SelectedActivity", SelectedActivity_); settings_->setValue ("SpecialOpActivity", bSpecialOp_); @@ -2313,7 +2308,6 @@ void Configuration::impl::accept () decode_at_52s_ = ui_->decode_at_52s_check_box->isChecked (); single_decode_ = ui_->single_decode_check_box->isChecked (); twoPass_ = ui_->cbTwoPass->isChecked (); - bSuperFox_ = ui_->cbSuperFox->isChecked (); Individual_Contest_Name_ = ui_->cbContestName->isChecked (); bSpecialOp_ = ui_->gbSpecialOpActivity->isChecked (); SelectedActivity_ = ui_->special_op_activity_button_group->checkedId(); diff --git a/Configuration.hpp b/Configuration.hpp index 6ae241f76..bb2322c3d 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -137,7 +137,6 @@ public: bool decode_at_52s () const; bool single_decode () const; bool twoPass() const; - bool superFox() const; bool bFox() const; bool bHound() const; bool bLowSidelobes() const; diff --git a/Configuration.ui b/Configuration.ui index 8f6662590..c29cc5722 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2907,33 +2907,20 @@ Right click for insert and delete options. false - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 18 - - + + + - <html><head/><body><p>Exchange 4-character locator instead of signal report. Provides q3-level sensitivities for the DX operator. Especially useful for 6m EME DXpeditions.</p></body></html> + <html><head/><body><p>FT8 DXpedition mode: Hound operator calling the DX.</p></body></html> + + + Hound - Q65 Pileup + Hound + + + true special_op_activity_button_group @@ -2962,212 +2949,7 @@ Right click for insert and delete options. - - - - - 0 - 18 - - - - <html><head/><body><p>World-Wide Digi-mode contest</p><p><br/></p></body></html> - - - WW Digital Contest - - - WW Digi Contest - - - special_op_activity_button_group - - - - - - - - - <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - - - R T T Y Roundup - - - FT Roundup - - - special_op_activity_button_group - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - RTTY Roundup exchange - - - FT RU Exch: - - - RTTY_Exchange - - - - - - - - 70 - 0 - - - - <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - - - NJ - - - Qt::AlignCenter - - - - - - - - - - - - - <html><head/><body><p>Call CQ with an individual contest name instead of TEST, RU, or WW. </p></body></html> - - - CQ with individual contest name - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Contest name: - - - - - - - - 70 - 16777215 - - - - - - - 4 - - - 0 - - - Qt::AlignCenter - - - - - - - - - - - <html><head/><body><p>ARRL International Digital Contest</p></body></html> - - - ARRL Digi Contest - - - special_op_activity_button_group - - - - - - - - 0 - 0 - - - - <html><head/><body><p>European VHF+ contests requiring a signal report, serial number, and 6-character locator.</p></body></html> - - - EU VHF Contest - - - EU VHF Contest - - - special_op_activity_button_group - - - - - - - <html><head/><body><p>FT8 DXpedition mode: Fox (DXpedition) operator.</p></body></html> - - - Fox - - - Fox - - - false - - - special_op_activity_button_group - - - - + @@ -3236,32 +3018,243 @@ Right click for insert and delete options. - - + + - <html><head/><body><p>FT8 DXpedition mode: Hound operator calling the DX.</p></body></html> - - - Hound + <html><head/><body><p>ARRL International Digital Contest</p></body></html> - Hound - - - true + ARRL Digi Contest special_op_activity_button_group - - - - SuperFox + + + + Qt::Horizontal + + + 40 + 20 + + + + + + + + + 0 + 18 + + + + <html><head/><body><p>World-Wide Digi-mode contest</p><p><br/></p></body></html> + + + WW Digital Contest + + + WW Digi Contest + + + special_op_activity_button_group + + + + + + 0 + 18 + + + + <html><head/><body><p>Exchange 4-character locator instead of signal report. Provides q3-level sensitivities for the DX operator. Especially useful for 6m EME DXpeditions.</p></body></html> + + + Q65 Pileup + + + special_op_activity_button_group + + + + + + + + + <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> + + + R T T Y Roundup + + + FT Roundup + + + special_op_activity_button_group + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + RTTY Roundup exchange + + + FT RU Exch: + + + RTTY_Exchange + + + + + + + + 70 + 0 + + + + <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> + + + NJ + + + Qt::AlignCenter + + + + + + + + + + + <html><head/><body><p>FT8 DXpedition mode: Fox (DXpedition) operator.</p></body></html> + + + Fox + + + Fox + + + false + + + special_op_activity_button_group + + + + + + + + 0 + 0 + + + + <html><head/><body><p>European VHF+ contests requiring a signal report, serial number, and 6-character locator.</p></body></html> + + + EU VHF Contest + + + EU VHF Contest + + + special_op_activity_button_group + + + + + + + + + <html><head/><body><p>Call CQ with an individual contest name instead of TEST, RU, or WW. </p></body></html> + + + CQ with individual contest name + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Contest name: + + + + + + + + 70 + 16777215 + + + + + + + 4 + + + 0 + + + Qt::AlignCenter + + + + + + + @@ -3505,13 +3498,13 @@ Right click for insert and delete options. + + + - - - diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90 index 18450395e..a2899e526 100644 --- a/lib/ft8/foxgen.f90 +++ b/lib/ft8/foxgen.f90 @@ -1,4 +1,4 @@ -subroutine foxgen(bSuperFox) +subroutine foxgen() ! Called from MainWindow::foxTxSequencer() to generate the Tx waveform in ! FT8 Fox mode. The Tx message can contain up to 5 "slots", each carrying @@ -17,7 +17,6 @@ subroutine foxgen(bSuperFox) parameter (NN=79,ND=58,NSPS=4*1920) parameter (NWAVE=(160+2)*134400*4) !the biggest waveform we generate (FST4-1800 at 48kHz) parameter (NFFT=614400,NH=NFFT/2) - logical*1 bSuperFox character*40 cmsg character*37 msg,msgsent integer itone(79) @@ -30,11 +29,6 @@ subroutine foxgen(bSuperFox) common/foxcom2/itone2(NN),msgbits2(77) equivalence (x,cx),(y,cy) - if(bSuperFox) then - call foxgen2(nslots,cmsg) - return - endif - fstep=60.d0 dfreq=6.25d0 dt=1.d0/48000.d0