From fd4a2e3b6139c2046d7028ecdcedd0ec6202f6f0 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 21 Jul 2022 11:39:24 -0400
Subject: [PATCH] Work in progress on Echo mode.  Some temporary stuff here!

---
 widgets/astro.cpp      | 18 ++++++++++
 widgets/astro.h        |  3 ++
 widgets/astro.ui       | 80 +++++++++++++++++++++++++++++++++++++++---
 widgets/mainwindow.cpp |  3 ++
 4 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/widgets/astro.cpp b/widgets/astro.cpp
index d90a29ed3..5ef9a8ec5 100644
--- a/widgets/astro.cpp
+++ b/widgets/astro.cpp
@@ -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;
+  }
+}
diff --git a/widgets/astro.h b/widgets/astro.h
index 2b544872c..e627d3bbd 100644
--- a/widgets/astro.h
+++ b/widgets/astro.h
@@ -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;
 
diff --git a/widgets/astro.ui b/widgets/astro.ui
index 6bbb15749..c1a9bc081 100644
--- a/widgets/astro.ui
+++ b/widgets/astro.ui
@@ -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">
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 8099aa7fa..86dba92c5 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -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;