w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-25 13:39:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sfox5a' into sfox5

Browse Source
This commit is contained in:
Joe Taylor 2024-09-16 09:15:16 -04:00
commit 398a2dc671
4 changed files with 57 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Configuration.cpp
View File

@ -611,7 +611,6 @@ private:
Q_SLOT void on_cbAutoLog_clicked(bool);
Q_SLOT void on_Field_Day_Exchange_textEdited (QString const&);
Q_SLOT void on_RTTY_Exchange_textEdited (QString const&);
Q_SLOT void on_FoxKey_textEdited (QString const&);
Q_SLOT void on_OTPUrl_textEdited (QString const&);
Q_SLOT void on_OTPSeed_textEdited (QString const&);
Q_SLOT void on_Contest_Name_textEdited (QString const&);
@ -712,7 +711,6 @@ private:
QString RTTY_exchange_;
QString Contest_Name_;
QString hamlib_backed_up_;
QString FoxKey_;
QString OTPUrl_;
QString OTPSeed_;
@ -1048,11 +1046,6 @@ QString Configuration::RTTY_Exchange() const
return m_->RTTY_exchange_;
}
QString Configuration::FoxKey() const
{
return m_->FoxKey_;
}
QString Configuration::Contest_Name() const
{
return m_->Contest_Name_;
@ -1670,11 +1663,9 @@ void Configuration::impl::read_settings ()
my_grid_ = settings_->value ("MyGrid", QString {}).toString ();
FD_exchange_ = settings_->value ("Field_Day_Exchange",QString {}).toString ();
RTTY_exchange_ = settings_->value ("RTTY_Exchange",QString {}).toString ();
FoxKey_ = settings_->value ("FoxKey",QString {}).toString ();
Contest_Name_ = settings_->value ("Contest_Name",QString {}).toString ();
ui_->Field_Day_Exchange->setText(FD_exchange_);
ui_->RTTY_Exchange->setText(RTTY_exchange_);
ui_->FoxKey->setText(FoxKey_);
ui_->Contest_Name->setText(Contest_Name_);
hamlib_backed_up_ = settings_->value ("HamlibBackedUp",QString {}).toString ();
@ -1916,7 +1907,6 @@ void Configuration::impl::write_settings ()
settings_->setValue ("MyGrid", my_grid_);
settings_->setValue ("Field_Day_Exchange", FD_exchange_);
settings_->setValue ("RTTY_Exchange", RTTY_exchange_);
settings_->setValue ("FoxKey", FoxKey_);
settings_->setValue ("Contest_Name", Contest_Name_);
settings_->setValue ("Font", font_.toString ());
settings_->setValue ("DecodedTextFont", decoded_text_font_.toString ());
@ -2389,7 +2379,6 @@ void Configuration::impl::accept ()
my_grid_ = ui_->grid_line_edit->text ();
FD_exchange_= ui_->Field_Day_Exchange->text ().toUpper ();
RTTY_exchange_= ui_->RTTY_Exchange->text ().toUpper ();
FoxKey_= ui_->FoxKey->text().toUpper();
Contest_Name_= ui_->Contest_Name->text ().toUpper ();
spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked ();
psk_reporter_tcpip_ = ui_->psk_reporter_tcpip_check_box->isChecked ();
@ -3305,13 +3294,6 @@ void Configuration::impl::on_cbHideOTP_clicked(bool)
void Configuration::impl::check_visibility ()
{
if (ui_->rbFox->isChecked() and ui_->cbSuperFox->isChecked() and ui_->gbSpecialOpActivity->isChecked()) {
ui_->sfkey_label->setEnabled (true);
ui_->FoxKey->setEnabled (true);
} else {
ui_->sfkey_label->setEnabled (false);
ui_->FoxKey->setEnabled (false);
}
if (ui_->rbField_Day->isChecked() and ui_->gbSpecialOpActivity->isChecked()) {
ui_->labFD->setEnabled (true);
ui_->Field_Day_Exchange->setEnabled (true);
@ -3410,11 +3392,6 @@ void Configuration::impl::on_RTTY_Exchange_textEdited (QString const& exchange)
ui_->RTTY_Exchange->setText (exchange.toUpper ());
}
void Configuration::impl::on_FoxKey_textEdited (QString const& ckey)
{
ui_->FoxKey->setText (ckey.toUpper ());
}
void Configuration::impl::on_Contest_Name_textEdited (QString const& exchange)
{
ui_->Contest_Name->setText (exchange.toUpper ());

1
Configuration.hpp
View File

@ -101,7 +101,6 @@ public:
QString my_grid () const;
QString Field_Day_Exchange() const;
QString RTTY_Exchange() const;
QString FoxKey() const;
QString Contest_Name() const;
void setEU_VHF_Contest();
QFont text_font () const;

94
Configuration.ui
View File

@ -3202,7 +3202,7 @@ Right click for insert and delete options.</string>
</widget>
</item>
<item row="0" column="3">
<layout class="QHBoxLayout" name="horizontalLayout_27" stretch="0,1,0,1">
<layout class="QHBoxLayout" name="horizontalLayout_27" stretch="0,1">
<item>
<widget class="QCheckBox" name="cbSuperFox">
<property name="toolTip">
@ -3226,44 +3226,6 @@ Right click for insert and delete options.</string>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="sfkey_label">
<property name="text">
<string>Key:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="FoxKey">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SuperFox operator must enter a valid key to enable transmission.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="maxLength">
<number>9</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
@ -3334,9 +3296,15 @@ Right click for insert and delete options.</string>
</item>
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -3351,16 +3319,31 @@ Right click for insert and delete options.</string>
</item>
<item>
<widget class="QLineEdit" name="OTPUrl">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;URL used to verify OTP codes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>https://www.9dx.cc</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -3388,9 +3371,15 @@ Right click for insert and delete options.</string>
</item>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -3411,9 +3400,15 @@ Right click for insert and delete options.</string>
</item>
<item>
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -3430,13 +3425,16 @@ Right click for insert and delete options.</string>
<widget class="QLineEdit" name="OTPSeed">
<property name="minimumSize">
<size>
<width>70</width>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fox's key to generate OTP Codes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>M2ZUU5CW6EVOY2HU</string>
</property>
</widget>
</item>
</layout>
@ -3679,13 +3677,13 @@ Right click for insert and delete options.</string>
</connection>
</connections>
<buttongroups>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="split_mode_button_group"/>
</buttongroups>
</ui>

16
widgets/mainwindow.cpp
View File

@ -5400,7 +5400,7 @@ void MainWindow::guiUpdate()
// qint64 n64 = QDateTime::currentSecsSinceEpoch();
// n64=n64/30;
// n64=n64*30;
// qDebug() << "bb" << m_config.FoxKey() << nsec%60 << dec_data.params.nutc << n64 << n64%60;
// qDebug() << "bb" << nsec%60 << dec_data.params.nutc << n64 << n64%60;
// prevent tuning on top of a SuperFox message
if (SpecOp::HOUND==m_specOp && m_config.superFox() && m_tune) {
@ -8571,8 +8571,16 @@ void MainWindow::setXIT(int n, Frequency base)
void MainWindow::setFreq4(int rxFreq, int txFreq)
{
if (m_mode=="ECHO") return; // we do not adjust rx/tx for echo mode -- always 1500Hz
if (ui->RxFreqSpinBox->isEnabled () && !(SpecOp::HOUND==m_specOp && m_config.superFox() &&
(rxFreq < 700 or rxFreq > 800))) ui->RxFreqSpinBox->setValue(rxFreq);
if(m_mode=="FT8" and m_config.superFox() and (m_specOp == SpecOp::HOUND) and
(qAbs(rxFreq-750)>200)) {
// SuperHound should normally keep RxFreq close to 750 Hz
if(MessageBox::No == MessageBox::query_message (this,
tr ("Please confirm setting RxFreq to %1 Hz").arg
(QString::number(rxFreq)))) return;
}
if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq);
if(m_mode=="WSPR" or m_mode=="FST4W") {
ui->WSPRfreqSpinBox->setValue(txFreq);
} else {
@ -11445,8 +11453,6 @@ void MainWindow::sfox_tx() {
LOG_INFO(QString("TOTP SF: seed not long enough"));
}
}
#else
args.append(m_config.FoxKey());
#endif
// qDebug() << "aa" << QDir::toNativeSeparators(m_appDir)+QDir::separator()+"sftx";
// qDebug() << "bb" << args;