PlutoSDR MIMO: added missing gain lock button

pull/891/head v6.11.0
f4exb 2021-05-06 07:28:37 +02:00
rodzic 5384f3b21e
commit 60e8105147
5 zmienionych plików z 70 dodań i 32 usunięć

Plik binarny nie jest wyświetlany.

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 44 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 45 KiB

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -758,6 +758,22 @@ void PlutoSDRMIMOGUI::on_lpFIRGain_currentIndexChanged(int index)
sendSettings(); sendSettings();
} }
void PlutoSDRMIMOGUI::on_gainLock_toggled(bool checked)
{
if (!m_gainLock && checked)
{
m_settings.m_rx1GainMode = m_settings.m_rx0GainMode;
m_settings.m_rx1Gain = m_settings.m_rx0Gain;
m_settings.m_tx1Att = m_settings.m_rx0Gain;
blockApplySettings(true);
displaySettings();
blockApplySettings(false);
sendSettings();
}
m_gainLock = checked;
}
void PlutoSDRMIMOGUI::on_gainMode_currentIndexChanged(int index) void PlutoSDRMIMOGUI::on_gainMode_currentIndexChanged(int index)
{ {
if (m_streamIndex == 0) if (m_streamIndex == 0)

Wyświetl plik

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>382</width> <width>344</width>
<height>344</height> <height>320</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -18,8 +18,8 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>350</width> <width>344</width>
<height>260</height> <height>320</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -1006,6 +1006,25 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QLabel" name="temperatureText">
<property name="minimumSize">
<size>
<width>24</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Board temperature (degrees C)</string>
</property>
<property name="text">
<string>00C</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -1016,6 +1035,24 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item>
<widget class="QToolButton" name="gainLock">
<property name="toolTip">
<string>Lock both channels gain</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/unlocked.png</normaloff>
<normalon>:/locked.png</normalon>:/unlocked.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QComboBox" name="gainMode"> <widget class="QComboBox" name="gainMode">
<property name="maximumSize"> <property name="maximumSize">
@ -1218,25 +1255,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="temperatureText">
<property name="minimumSize">
<size>
<width>24</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Board temperature (degrees C)</string>
</property>
<property name="text">
<string>00C</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>

Wyświetl plik

@ -197,7 +197,15 @@ The FIR filter block can provide a decimation or interpolation by 1 (no decimati
The FIR filter can introduce a gain that can be set to -12, -6, 0 or 6 dB. The FIR has a fixed gain of 6 dB so to maximize dynamic range one would set the gain at -6 dB so that the overall gain is set at 0 dB. The FIR filter can introduce a gain that can be set to -12, -6, 0 or 6 dB. The FIR has a fixed gain of 6 dB so to maximize dynamic range one would set the gain at -6 dB so that the overall gain is set at 0 dB.
<h3>20: Rx gain mode</h3> <h3>20: Board temperature</h3>
This is the board temperature in degrees Celsius updated every ~5s.
<h3>21. Lock both streams gains</h3>
When engaged this applies the same gain controls (22, 23, 25) to both streams (Rx or Tx)
<h3>22: Rx gain mode</h3>
Use this combo to select between gain options: Use this combo to select between gain options:
@ -208,22 +216,18 @@ Use this combo to select between gain options:
See AD9363 documentation for details on AGC options. See AD9363 documentation for details on AGC options.
<h3>21: Rx global manual gain</h3> <h3>23: Rx global manual gain</h3>
Use this button to adjust the global gain manually in manual gain mode. This button is disabled when AGC modes are selected with combo (15). Use this button to adjust the global gain manually in manual gain mode. This button is disabled when AGC modes are selected with combo (15).
<h3>22: Actual Rx gain fetched from device</h3> <h3>24: Actual Rx gain fetched from device</h3>
This is the actual gain in dB set in the device. This is the actual gain in dB set in the device.
<h4>23: Tx attenuation</h4> <h4>25: Tx attenuation</h4>
Use this button to adjust the attenuation. It can be varied from -89.75 to 0 dB in 0.25 dB steps. Use this button to adjust the attenuation. It can be varied from -89.75 to 0 dB in 0.25 dB steps.
<h3>24: Indicative RSSI</h3> <h3>26: Indicative RSSI</h3>
This is the indicative RSSI of the receiver. This is the indicative RSSI of the receiver.
<h3>25: Board temperature</h3>
This is the board temperature in degrees Celsius updated every ~5s.