diff --git a/Configuration.ui b/Configuration.ui index fa16476e9..44a57af24 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -357,7 +357,7 @@ - Enable VHF/UHF/Microwave features + Enable VHF and submode features @@ -3110,11 +3110,11 @@ Right click for insert and delete options. - + + - diff --git a/lib/fst280/fst280.txt b/lib/fst280/fst280.txt index 5e2c1c935..8c9757e40 100644 --- a/lib/fst280/fst280.txt +++ b/lib/fst280/fst280.txt @@ -1,10 +1,10 @@ ------------------------------------------------------------------- NSPS T/R TxT Tst Txtra Txtra-2.6s DF BW SNR77 SNR50 - (s) (s) (s) (s) (s) (Hz) (Hz) (dB) (dB) + (s) (s) (s) (s) (s) (Hz) (Hz) (dB)? (dB)? ------------------------------------------------------------------- - 800 15 10.93 0.5 3.57 0.97 15.00 60.0 -21.3 -23.2 - 1680 30 22.96 1.0 6.04 3.44 7.14 28.6 -24.5 -26.4 - 4000 60 54.67 1.0 4.33 1.73 3.00 12.0 -28.3 -30.2 - 8400 120 114.80 1.0 4.20 1.60 1.43 5.7 -31.5 -33.4 -21504 300 293.89 1.0 5.11 2.51 0.56 2.2 -35.5 -37.4 + 800 15 10.93 0.5 3.57 0.97 15.00 60.0 -21.3 -22.6 + 1680 30 22.96 1.0 6.04 3.44 7.14 28.6 -24.5 -25.8 + 4000 60 54.67 1.0 4.33 1.73 3.00 12.0 -28.3 -29.6 + 8400 120 114.80 1.0 4.20 1.60 1.43 5.7 -31.5 -32.8 +21504 300 293.89 1.0 5.11 2.51 0.56 2.2 -35.5 -36.8 ------------------------------------------------------------------- diff --git a/lib/fst280_decode.f90 b/lib/fst280_decode.f90 index 27eccafb3..98c8cd191 100644 --- a/lib/fst280_decode.f90 +++ b/lib/fst280_decode.f90 @@ -159,7 +159,7 @@ contains do isync=0,1 if(isync.eq.0) then fc1=0.0 - is0=nint(fs2) + is0=2*nint(fs2) ishw=is0 isst=4*hmod ifhw=12 diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 750e40520..6b17d8e24 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -959,7 +959,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, m_bFastDone=false; m_bAltV=false; m_bNoMoreFiles=false; - m_bVHFwarned=false; m_bDoubleClicked=false; m_bCallingCQ=false; m_bCheckedContest=false; @@ -4082,11 +4081,6 @@ void MainWindow::guiUpdate() //Once per second: if(nsec != m_sec0) { // qDebug() << "onesec" << m_mode; - if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { - if(!m_bVHFwarned) vhfWarning(); - } else { - m_bVHFwarned=false; - } m_currentBand=m_config.bands()->find(m_freqNominal); if( SpecOp::HOUND == m_config.special_op_id() ) { @@ -6436,7 +6430,6 @@ void MainWindow::switch_mode (Mode mode) ui->RxFreqSpinBox->setMaximum(5000); ui->RxFreqSpinBox->setSingleStep(1); } - m_bVHFwarned=false; bool b=m_mode=="FreqCal"; ui->tabWidget->setVisible(!b); if(b) { @@ -6671,20 +6664,11 @@ void MainWindow::band_changed (Frequency f) { m_frequency_list_fcal_iter = m_config.frequencies ()->find (f); } - float r=m_freqNominal/(f+0.0001); - if(r<0.9 or r>1.1) m_bVHFwarned=false; setRig (f); setXIT (ui->TxFreqSpinBox->value ()); } } -void MainWindow::vhfWarning() -{ - MessageBox::warning_message (this, tr ("VHF features warning"), - "VHF/UHF/Microwave features is enabled on a lower frequency band."); - m_bVHFwarned=true; -} - void MainWindow::enable_DXCC_entity (bool on) { if (on and !m_mode.startsWith ("WSPR") and m_mode!="Echo") { diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index ac8c22d15..51a935c93 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -677,7 +677,6 @@ private: bool m_tx_watchdog; // true when watchdog triggered bool m_block_pwr_tooltip; bool m_PwrBandSetOK; - bool m_bVHFwarned; bool m_bDisplayedOnce; Frequency m_lastMonitoredFrequency; double m_toneSpacing; @@ -762,7 +761,6 @@ private: void tx_watchdog (bool triggered); qint64 nWidgets(QString t); void displayWidgets(qint64 n); - void vhfWarning(); QChar current_submode () const; // returns QChar {0} if submode is not appropriate void write_transmit_entry (QString const& file_name); void selectHound(QString t);