BladeRF2: implemented transverter mode

2026-06-01 21:54:55 -04:00 · 2018-10-03 06:14:26 +02:00
parent 3f7cfb4dd8
commit c579d66b59
21 changed files with 348 additions and 22 deletions
@@ -749,6 +749,9 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo

    struct bladerf *dev = m_deviceShared.m_dev->getDev();
    int requestedChannel = m_deviceAPI->getItemIndex();
+    qint64 xlatedDeviceCenterFrequency = settings.m_centerFrequency;
+    xlatedDeviceCenterFrequency -= settings.m_transverterMode ? settings.m_transverterDeltaFrequency : 0;
+    xlatedDeviceCenterFrequency = xlatedDeviceCenterFrequency < 0 ? 0 : xlatedDeviceCenterFrequency;

    if ((m_settings.m_dcBlock != settings.m_dcBlock) ||
        (m_settings.m_iqCorrection != settings.m_iqCorrection) || force)
@@ -824,13 +827,15 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
    }

    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)
        || (m_settings.m_fcPos != settings.m_fcPos)
        || (m_settings.m_log2Decim != settings.m_log2Decim) || force)
    {
        qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency(
-                settings.m_centerFrequency,
+                xlatedDeviceCenterFrequency,
                0,
                settings.m_log2Decim,
                (DeviceSampleSource::fcPos_t) settings.m_fcPos,
@@ -943,6 +948,8 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
    m_settings = settings;

    qDebug() << "BladeRF2Input::applySettings: "
+            << " m_transverterMode: " << m_settings.m_transverterMode
+            << " m_transverterDeltaFrequency: " << m_settings.m_transverterDeltaFrequency
            << " m_centerFrequency: " << m_settings.m_centerFrequency << " Hz"
            << " m_LOppmTenths: " << m_settings.m_LOppmTenths
            << " m_bandwidth: " << m_settings.m_bandwidth
@@ -1009,6 +1016,12 @@ int BladeRF2Input::webapiSettingsPutPatch(
    if (deviceSettingsKeys.contains("globalGain")) {
        settings.m_globalGain = response.getBladeRf2InputSettings()->getGlobalGain();
    }
+    if (deviceSettingsKeys.contains("transverterDeltaFrequency")) {
+        settings.m_transverterDeltaFrequency = response.getBladeRf2InputSettings()->getTransverterDeltaFrequency();
+    }
+    if (deviceSettingsKeys.contains("transverterMode")) {
+        settings.m_transverterMode = response.getBladeRf2InputSettings()->getTransverterMode() != 0;
+    }
    if (deviceSettingsKeys.contains("fileRecordName")) {
        settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName();
    }
@@ -1047,6 +1060,8 @@ void BladeRF2Input::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r
    response.getBladeRf2InputSettings()->setBiasTee(settings.m_biasTee ? 1 : 0);
    response.getBladeRf2InputSettings()->setGainMode(settings.m_gainMode);
    response.getBladeRf2InputSettings()->setGlobalGain(settings.m_globalGain);
+    response.getBladeRf2InputSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
+    response.getBladeRf2InputSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0);

    if (response.getBladeRf2InputSettings()->getFileRecordName()) {
        *response.getBladeRf2InputSettings()->getFileRecordName() = settings.m_fileRecordName;
@@ -146,6 +146,32 @@ bool BladeRF2InputGui::deserialize(const QByteArray& data)
    }
 }

+void BladeRF2InputGui::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_sampleSource->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 BladeRF2InputGui::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 BladeRF2InputGui::handleMessage(const Message& message)
 {
    if (BladeRF2Input::MsgConfigureBladeRF2::match(message))
@@ -355,6 +381,16 @@ void BladeRF2InputGui::on_gain_valueChanged(int value)
    sendSettings();
 }

+void BladeRF2InputGui::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 BladeRF2InputGui::on_startStop_toggled(bool checked)
 {
    if (m_doApplySettings)
@@ -69,6 +69,8 @@ private:
    void displaySettings();
    void sendSettings();
    void updateSampleRateAndFrequency();
+    void updateFrequencyLimits();
+    void setCenterFrequencySetting(uint64_t kHzValue);
    void blockApplySettings(bool block);

 private slots:
@@ -84,6 +86,7 @@ private slots:
    void on_fcPos_currentIndexChanged(int index);
    void on_gainMode_currentIndexChanged(int index);
    void on_gain_valueChanged(int value);
+    void on_transverter_clicked();
    void on_startStop_toggled(bool checked);
    void on_record_toggled(bool checked);
    void updateHardware();
@@ -310,12 +310,18 @@
      </widget>
     </item>
     <item row="0" column="7">
-      <widget class="ButtonSwitch" name="biasTee">
+      <widget class="TransverterButton" name="transverter">
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
       <property name="toolTip">
-        <string>Bias Tee</string>
+        <string>Transverter frequency translation dialog</string>
       </property>
       <property name="text">
-        <string>BT</string>
+        <string>X</string>
       </property>
      </widget>
     </item>
@@ -487,7 +493,7 @@
    </layout>
   </item>
   <item>
-    <layout class="QGridLayout" name="gridLayout_decim" columnstretch="0,0,0,0">
+    <layout class="QGridLayout" name="gridLayout_decim" columnstretch="0,0,0,0,0">
     <property name="spacing">
      <number>3</number>
     </property>
@@ -531,6 +537,16 @@
       </property>
      </widget>
     </item>
+     <item row="0" column="4">
+      <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>
@@ -571,6 +587,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"/>
@@ -36,6 +36,8 @@ void BladeRF2InputSettings::resetToDefaults()
    m_fcPos = FC_POS_INFRA;
    m_dcBlock = false;
    m_iqCorrection = false;
+    m_transverterMode = false;
+    m_transverterDeltaFrequency = 0;
    m_fileRecordName = "";
 }

@@ -53,6 +55,8 @@ QByteArray BladeRF2InputSettings::serialize() const
    s.writeBool(8, m_dcBlock);
    s.writeBool(9, m_iqCorrection);
    s.writeS32(10, m_LOppmTenths);
+    s.writeBool(11, m_transverterMode);
+    s.writeS64(12, m_transverterDeltaFrequency);

    return s.final();
 }
@@ -82,6 +86,8 @@ bool BladeRF2InputSettings::deserialize(const QByteArray& data)
        d.readBool(8, &m_dcBlock);
        d.readBool(9, &m_iqCorrection);
        d.readS32(10, &m_LOppmTenths);
+        d.readBool(11, &m_transverterMode, false);
+        d.readS64(12, &m_transverterDeltaFrequency, 0);

        return true;
    }
@@ -39,6 +39,8 @@ struct BladeRF2InputSettings {
    fcPos_t m_fcPos;
    bool m_dcBlock;
    bool m_iqCorrection;
+    bool     m_transverterMode;
+    qint64   m_transverterDeltaFrequency;
    QString m_fileRecordName;

    BladeRF2InputSettings();