w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 12:38:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work in progress on Echo mode. Some temporary stuff here!

Browse Source
This commit is contained in:
Joe Taylor 2022-07-21 11:39:24 -04:00
parent 9d0e211844
commit fd4a2e3b61
4 changed files with 99 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
widgets/astro.cpp
View File

@ -255,6 +255,7 @@ auto Astro::astroUpdate(QDateTime const& t, QString const& mygrid, QString const
void Astro::check_split ()
{
/* TEMPORARILY DISABLE
if (doppler_tracking () && !configuration_->split_mode ())
{
MessageBox::warning_message (this, tr ("Doppler Tracking Error"),
@ -262,6 +263,7 @@ void Astro::check_split ()
tr ("Go to \"Menu->File->Settings->Radio\" to enable split operation"));
ui_->rbNoDoppler->click ();
}
*/
}
void Astro::on_rbFullTrack_clicked(bool)
@ -331,3 +333,19 @@ void Astro::hideEvent (QHideEvent * e)
Q_EMIT tracking_update ();
QWidget::hideEvent (e);
}
bool Astro::bDither()
{
return ui_->cbDither->isChecked();
}
qint32 Astro::nfRIT()
{
if(m_DopplerMethod==0) {
ui_->sbRIT->setEnabled(true);
return ui_->sbRIT->value();
} else {
ui_->sbRIT->setEnabled(false);
return 0;
}
}

3
widgets/astro.h
View File

@ -57,6 +57,9 @@ public:
double TR_period);
bool doppler_tracking () const;
bool bDither();
qint32 nfRIT();
Q_SLOT void nominal_frequency (Frequency rx, Frequency tx);
Q_SIGNAL void tracking_update () const;

80
widgets/astro.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>359</width>
<height>342</height>
<height>401</height>
</rect>
</property>
<property name="sizePolicy">
@ -70,7 +70,7 @@
</property>
</widget>
</item>
<item>
<item>
<widget class="QRadioButton" name="rbOnDxEcho">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DX station announces their TX Freq, which is entered as the Sked Freq. Correction applied to RX and TX so you appear on the DX's station's own echo Freq.&lt;/p&gt;&lt;p&gt;If the rig does not accept CAT QSY commands while transmitting a single correction is applied for the whole transmit period.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -83,7 +83,7 @@
</property>
</widget>
</item>
<item>
<item>
<widget class="QRadioButton" name="rbCallDx">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tune radio manually and select this mode to put your echo on the same frequency.&lt;/p&gt;&lt;p&gt;If the rig does not accept CAT QSY commands while transmitting a single correction is applied for the whole transmit period.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -95,7 +95,7 @@
<bool>false</bool>
</property>
</widget>
</item>
</item>
<item>
<widget class="QRadioButton" name="rbNoDoppler">
<property name="toolTip">
@ -109,7 +109,7 @@
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item>
@ -202,6 +202,76 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="title">
<string>Echo Mode</string>
</property>
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>164</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QSpinBox" name="sbRIT">
<property name="enabled">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="suffix">
<string> Hz</string>
</property>
<property name="prefix">
<string>RIT </string>
</property>
<property name="minimum">
<number>-20000</number>
</property>
<property name="maximum">
<number>20000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="cbDither">
<property name="text">
<string>Dither</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">

3
widgets/mainwindow.cpp
View File

@ -8721,6 +8721,9 @@ void MainWindow::astroUpdate ()
m_freqNominal,
"Echo" == m_mode, m_transmitting,
!m_config.tx_QSY_allowed (), m_TRperiod);
qDebug() << "aa" << correction.tx << correction.rx << m_astroWidget->nfRIT()
<< m_astroWidget->bDither() << m_config.transceiver_resolution ()
<< m_freqNominal;
// no Doppler correction in Tx if rig can't do it
if (m_transmitting && !m_config.tx_QSY_allowed ()) return;
if (!m_astroWidget->doppler_tracking ()) return;