BladeRF2: implemented transverter mode

2026-08-14 15:33:34 -04:00 · 2018-10-03 06:14:26 +02:00
parent 3f7cfb4dd8
commit c579d66b59
21 changed files with 348 additions and 22 deletions
@@ -686,6 +686,9 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, bool
    struct bladerf *dev = m_deviceShared.m_dev->getDev();
    int requestedChannel = m_deviceAPI->getItemIndex();
    int nbChannels = getNbChannels();
+    qint64 deviceCenterFrequency = settings.m_centerFrequency;
+    deviceCenterFrequency -= settings.m_transverterMode ? settings.m_transverterDeltaFrequency : 0;
+    deviceCenterFrequency = deviceCenterFrequency < 0 ? 0 : deviceCenterFrequency;

    if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || (m_settings.m_log2Interp != settings.m_log2Interp) || force)
    {
@@ -778,6 +781,8 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, bool
    }

    if ((m_settings.m_centerFrequency != settings.m_centerFrequency)
+        || (m_settings.m_transverterMode != settings.m_transverterMode)
+        || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)
        || (m_settings.m_LOppmTenths != settings.m_LOppmTenths)
        || (m_settings.m_devSampleRate != settings.m_devSampleRate) || force)
    {
@@ -786,7 +791,7 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, bool

        if (dev != 0)
        {
-            if (setDeviceCenterFrequency(dev, requestedChannel, settings.m_centerFrequency))
+            if (setDeviceCenterFrequency(dev, requestedChannel, deviceCenterFrequency))
            {
                if (getMessageQueueToGUI())
                {
@@ -869,6 +874,9 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, bool
    m_settings = settings;

    qDebug() << "BladeRF2Output::applySettings: "
+            << " m_transverterMode: " << m_settings.m_transverterMode
+            << " m_transverterDeltaFrequency: " << m_settings.m_transverterDeltaFrequency
+            << " deviceCenterFrequency: " << deviceCenterFrequency
            << " m_centerFrequency: " << m_settings.m_centerFrequency << " Hz"
            << " m_LOppmTenths: " << m_settings.m_LOppmTenths
            << " m_bandwidth: " << m_settings.m_bandwidth
@@ -931,6 +939,12 @@ int BladeRF2Output::webapiSettingsPutPatch(
    if (deviceSettingsKeys.contains("globalGain")) {
        settings.m_globalGain = response.getBladeRf2OutputSettings()->getGlobalGain();
    }
+    if (deviceSettingsKeys.contains("transverterDeltaFrequency")) {
+        settings.m_transverterDeltaFrequency = response.getBladeRf2OutputSettings()->getTransverterDeltaFrequency();
+    }
+    if (deviceSettingsKeys.contains("transverterMode")) {
+        settings.m_transverterMode = response.getBladeRf2OutputSettings()->getTransverterMode() != 0;
+    }

    MsgConfigureBladeRF2 *msg = MsgConfigureBladeRF2::create(settings, force);
    m_inputMessageQueue.push(msg);
@@ -962,6 +976,8 @@ void BladeRF2Output::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings&
    response.getBladeRf2OutputSettings()->setLog2Interp(settings.m_log2Interp);
    response.getBladeRf2OutputSettings()->setBiasTee(settings.m_biasTee ? 1 : 0);
    response.getBladeRf2OutputSettings()->setGlobalGain(settings.m_globalGain);
+    response.getBladeRf2OutputSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
+    response.getBladeRf2OutputSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0);
 }

 void BladeRF2Output::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
@@ -134,6 +134,32 @@ bool BladeRF2OutputGui::deserialize(const QByteArray& data)
    }
 }

+void BladeRF2OutputGui::updateFrequencyLimits()
+{
+    // values in kHz
+    uint64_t f_min, f_max;
+    int step;
+    qint64 deltaFrequency = m_settings.m_transverterMode ? m_settings.m_transverterDeltaFrequency/1000 : 0;
+    m_sampleSink->getFrequencyRange(f_min, f_max, step);
+    qint64 minLimit = f_min/1000 + deltaFrequency;
+    qint64 maxLimit = f_max/1000 + deltaFrequency;
+
+    minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit;
+    maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit;
+
+    qDebug("BladeRF2OutputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit);
+
+    ui->centerFrequency->setValueRange(7, minLimit, maxLimit);
+}
+
+void BladeRF2OutputGui::setCenterFrequencySetting(uint64_t kHzValue)
+{
+    int64_t centerFrequency = kHzValue*1000;
+
+    m_settings.m_centerFrequency = centerFrequency < 0 ? 0 : (uint64_t) centerFrequency;
+    ui->centerFrequency->setToolTip(QString("Main center frequency in kHz (LO: %1 kHz)").arg(centerFrequency/1000));
+}
+
 bool BladeRF2OutputGui::handleMessage(const Message& message)
 {
    if (BladeRF2Output::MsgConfigureBladeRF2::match(message))
@@ -282,6 +308,16 @@ void BladeRF2OutputGui::on_gain_valueChanged(int value)
    sendSettings();
 }

+void BladeRF2OutputGui::on_transverter_clicked()
+{
+    m_settings.m_transverterMode = ui->transverter->getDeltaFrequencyAcive();
+    m_settings.m_transverterDeltaFrequency = ui->transverter->getDeltaFrequency();
+    qDebug("LimeSDRInputGUI::on_transverter_clicked: %lld Hz %s", m_settings.m_transverterDeltaFrequency, m_settings.m_transverterMode ? "on" : "off");
+    updateFrequencyLimits();
+    setCenterFrequencySetting(ui->centerFrequency->getValueNew());
+    sendSettings();
+}
+
 void BladeRF2OutputGui::on_startStop_toggled(bool checked)
 {
    if (m_doApplySettings)
@@ -70,6 +70,8 @@ private:
    void displaySettings();
    void sendSettings();
    void updateSampleRateAndFrequency();
+    void updateFrequencyLimits();
+    void setCenterFrequencySetting(uint64_t kHzValue);

 private slots:
    void handleInputMessages();
@@ -81,6 +83,7 @@ private slots:
    void on_interp_currentIndexChanged(int index);
    void on_gain_valueChanged(int value);
    void on_startStop_toggled(bool checked);
+    void on_transverter_clicked();
    void updateHardware();
    void updateStatus();
 };
@@ -261,16 +261,6 @@
       </property>
      </widget>
     </item>
-     <item row="0" column="5">
-      <widget class="ButtonSwitch" name="biasTee">
-       <property name="toolTip">
-        <string>Bias Tee</string>
-       </property>
-       <property name="text">
-        <string>BT</string>
-       </property>
-      </widget>
-     </item>
     <item row="0" column="4">
      <spacer name="horizontalSpacer_2">
       <property name="orientation">
@@ -284,6 +274,22 @@
       </property>
      </spacer>
     </item>
+     <item row="0" column="5">
+      <widget class="TransverterButton" name="transverter">
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Transverter frequency translation dialog</string>
+       </property>
+       <property name="text">
+        <string>X</string>
+       </property>
+      </widget>
+     </item>
    </layout>
   </item>
   <item>
@@ -411,7 +417,7 @@
    </layout>
   </item>
   <item>
-    <layout class="QGridLayout" name="gridLayout_gain" columnstretch="0,0,0">
+    <layout class="QGridLayout" name="gridLayout_gain" columnstretch="0,0,0,0">
     <property name="spacing">
      <number>3</number>
     </property>
@@ -448,6 +454,16 @@
       </property>
      </widget>
     </item>
+     <item row="0" column="3">
+      <widget class="ButtonSwitch" name="biasTee">
+       <property name="toolTip">
+        <string>Bias Tee</string>
+       </property>
+       <property name="text">
+        <string>BT</string>
+       </property>
+      </widget>
+     </item>
    </layout>
   </item>
   <item>
@@ -488,6 +504,11 @@
   <extends>QToolButton</extends>
   <header>gui/buttonswitch.h</header>
  </customwidget>
+  <customwidget>
+   <class>TransverterButton</class>
+   <extends>QPushButton</extends>
+   <header>gui/transverterbutton.h</header>
+  </customwidget>
 </customwidgets>
 <resources>
  <include location="../../../sdrgui/resources/res.qrc"/>
@@ -34,6 +34,8 @@ void BladeRF2OutputSettings::resetToDefaults()
    m_globalGain = -3;
    m_biasTee = false;
    m_log2Interp = 0;
+    m_transverterMode = false;
+    m_transverterDeltaFrequency = 0;
 }

 QByteArray BladeRF2OutputSettings::serialize() const
@@ -46,6 +48,8 @@ QByteArray BladeRF2OutputSettings::serialize() const
    s.writeS32(4, m_globalGain);
    s.writeBool(5, m_biasTee);
    s.writeU32(6, m_log2Interp);
+    s.writeBool(7, m_transverterMode);
+    s.writeS64(8, m_transverterDeltaFrequency);

    return s.final();
 }
@@ -68,6 +72,8 @@ bool BladeRF2OutputSettings::deserialize(const QByteArray& data)
        d.readS32(4, &m_globalGain);
        d.readBool(5, &m_biasTee);
        d.readU32(6, &m_log2Interp);
+        d.readBool(7, &m_transverterMode, false);
+        d.readS64(8, &m_transverterDeltaFrequency, 0);

        return true;
    }
@@ -28,6 +28,8 @@ struct BladeRF2OutputSettings {
    int m_globalGain;
    bool m_biasTee;
    quint32 m_log2Interp;
+    bool     m_transverterMode;
+    qint64   m_transverterDeltaFrequency;

    BladeRF2OutputSettings();
    void resetToDefaults();
@@ -590,9 +590,12 @@ bool LimeSDROutput::handleMessage(const Message& message)
        m_settings.m_extClock     = report.getExtClock();
        m_settings.m_extClockFreq = report.getExtClockFeq();

-        DeviceLimeSDRShared::MsgReportClockSourceChange *reportToGUI = DeviceLimeSDRShared::MsgReportClockSourceChange::create(
-                m_settings.m_extClock, m_settings.m_extClockFreq);
-        getMessageQueueToGUI()->push(reportToGUI);
+        if (getMessageQueueToGUI())
+        {
+            DeviceLimeSDRShared::MsgReportClockSourceChange *reportToGUI = DeviceLimeSDRShared::MsgReportClockSourceChange::create(
+                    m_settings.m_extClock, m_settings.m_extClockFreq);
+            getMessageQueueToGUI()->push(reportToGUI);
+        }

        return true;
    }