w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-26 15:16:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280

Browse Source
This commit is contained in:
Steven Franke 2020-06-22 14:51:08 -05:00
commit 37eff41549
5 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configuration.ui
View File

@ -357,7 +357,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="enable_VHF_features_check_box"> <widget class="QCheckBox" name="enable_VHF_features_check_box">
<property name="text"> <property name="text">
<string>Enable VHF/UHF/Microwave features</string> <string>Enable VHF and submode features</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -3110,11 +3110,11 @@ Right click for insert and delete options.</string>
<buttongroups> <buttongroups>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

12
lib/fst280/fst280.txt
View File

@ -1,10 +1,10 @@
------------------------------------------------------------------- -------------------------------------------------------------------
NSPS T/R TxT Tst Txtra Txtra-2.6s DF BW SNR77 SNR50 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 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 -26.4 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 -30.2 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 -33.4 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 -37.4 21504 300 293.89 1.0 5.11 2.51 0.56 2.2 -35.5 -36.8
------------------------------------------------------------------- -------------------------------------------------------------------

2
lib/fst280_decode.f90
View File

@ -159,7 +159,7 @@ contains
do isync=0,1 do isync=0,1
if(isync.eq.0) then if(isync.eq.0) then
fc1=0.0 fc1=0.0
is0=nint(fs2) is0=2*nint(fs2)
ishw=is0 ishw=is0
isst=4*hmod isst=4*hmod
ifhw=12 ifhw=12

16
widgets/mainwindow.cpp
View File

@ -959,7 +959,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_bFastDone=false; m_bFastDone=false;
m_bAltV=false; m_bAltV=false;
m_bNoMoreFiles=false; m_bNoMoreFiles=false;
m_bVHFwarned=false;
m_bDoubleClicked=false; m_bDoubleClicked=false;
m_bCallingCQ=false; m_bCallingCQ=false;
m_bCheckedContest=false; m_bCheckedContest=false;
@ -4082,11 +4081,6 @@ void MainWindow::guiUpdate()
//Once per second: //Once per second:
if(nsec != m_sec0) { if(nsec != m_sec0) {
// qDebug() << "onesec" << m_mode; // 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); m_currentBand=m_config.bands()->find(m_freqNominal);
if( SpecOp::HOUND == m_config.special_op_id() ) { if( SpecOp::HOUND == m_config.special_op_id() ) {
@ -6436,7 +6430,6 @@ void MainWindow::switch_mode (Mode mode)
ui->RxFreqSpinBox->setMaximum(5000); ui->RxFreqSpinBox->setMaximum(5000);
ui->RxFreqSpinBox->setSingleStep(1); ui->RxFreqSpinBox->setSingleStep(1);
} }
m_bVHFwarned=false;
bool b=m_mode=="FreqCal"; bool b=m_mode=="FreqCal";
ui->tabWidget->setVisible(!b); ui->tabWidget->setVisible(!b);
if(b) { if(b) {
@ -6671,20 +6664,11 @@ void MainWindow::band_changed (Frequency f)
{ {
m_frequency_list_fcal_iter = m_config.frequencies ()->find (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); setRig (f);
setXIT (ui->TxFreqSpinBox->value ()); 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) void MainWindow::enable_DXCC_entity (bool on)
{ {
if (on and !m_mode.startsWith ("WSPR") and m_mode!="Echo") { if (on and !m_mode.startsWith ("WSPR") and m_mode!="Echo") {

2
widgets/mainwindow.h
View File

@ -677,7 +677,6 @@ private:
bool m_tx_watchdog; // true when watchdog triggered bool m_tx_watchdog; // true when watchdog triggered
bool m_block_pwr_tooltip; bool m_block_pwr_tooltip;
bool m_PwrBandSetOK; bool m_PwrBandSetOK;
bool m_bVHFwarned;
bool m_bDisplayedOnce; bool m_bDisplayedOnce;
Frequency m_lastMonitoredFrequency; Frequency m_lastMonitoredFrequency;
double m_toneSpacing; double m_toneSpacing;
@ -762,7 +761,6 @@ private:
void tx_watchdog (bool triggered); void tx_watchdog (bool triggered);
qint64 nWidgets(QString t); qint64 nWidgets(QString t);
void displayWidgets(qint64 n); void displayWidgets(qint64 n);
void vhfWarning();
QChar current_submode () const; // returns QChar {0} if submode is not appropriate QChar current_submode () const; // returns QChar {0} if submode is not appropriate
void write_transmit_entry (QString const& file_name); void write_transmit_entry (QString const& file_name);
void selectHound(QString t); void selectHound(QString t);