caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VFF device config update

Browse Source
This commit is contained in:
Jan Käberich 2023-02-23 15:14:49 +01:00
parent e05df7ef19
commit a0c45d3c56
4 changed files with 168 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/deviceconfigurationdialogvff.cpp
View File

@ -40,6 +40,11 @@ DeviceConfigurationDialogVFF::DeviceConfigurationDialogVFF(LibreVNADriver &dev,
} }
}); });
connect(ui->autogain, &QCheckBox::toggled, this, [=](){
ui->portgain->setEnabled(!ui->autogain->isChecked());
ui->refgain->setEnabled(!ui->autogain->isChecked());
});
dev.sendWithoutPayload(Protocol::PacketType::RequestDeviceConfiguration); dev.sendWithoutPayload(Protocol::PacketType::RequestDeviceConfiguration);
connect(ui->buttonBox, &QDialogButtonBox::accepted, this, [=](){ connect(ui->buttonBox, &QDialogButtonBox::accepted, this, [=](){
@ -66,6 +71,10 @@ void DeviceConfigurationDialogVFF::updateGUI(const Protocol::DeviceConfig &c)
ui->mask->setText(mask.toString()); ui->mask->setText(mask.toString());
gateway = QHostAddress(qFromBigEndian(c.VFF.gw)); gateway = QHostAddress(qFromBigEndian(c.VFF.gw));
ui->gateway->setText(gateway.toString()); ui->gateway->setText(gateway.toString());
ui->autogain->setChecked(c.VFF.autogain);
ui->portgain->setCurrentIndex(c.VFF.portGain);
ui->refgain->setCurrentIndex(c.VFF.refGain);
} }
void DeviceConfigurationDialogVFF::updateDevice() void DeviceConfigurationDialogVFF::updateDevice()
@ -76,5 +85,9 @@ void DeviceConfigurationDialogVFF::updateDevice()
p.deviceConfig.VFF.ip = qToBigEndian(ip.toIPv4Address()); p.deviceConfig.VFF.ip = qToBigEndian(ip.toIPv4Address());
p.deviceConfig.VFF.mask = qToBigEndian(mask.toIPv4Address()); p.deviceConfig.VFF.mask = qToBigEndian(mask.toIPv4Address());
p.deviceConfig.VFF.gw = qToBigEndian(gateway.toIPv4Address()); p.deviceConfig.VFF.gw = qToBigEndian(gateway.toIPv4Address());
p.deviceConfig.VFF.autogain = ui->autogain->isChecked() ? 1 : 0;
p.deviceConfig.VFF.portGain = ui->portgain->currentIndex();
p.deviceConfig.VFF.refGain = ui->refgain->currentIndex();
dev.SendPacket(p); dev.SendPacket(p);
} }

148
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/deviceconfigurationdialogvff.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>389</width> <width>318</width>
<height>224</height> <height>344</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,7 +17,7 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Address configuration</string> <string>Address configuration (permanently stored in device)</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
@ -69,6 +69,148 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>PGA configuration (reset after reboot)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="autogain">
<property name="text">
<string>Autogain</string>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Port gain:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="portgain">
<item>
<property name="text">
<string>1V/V</string>
</property>
</item>
<item>
<property name="text">
<string>10V/V</string>
</property>
</item>
<item>
<property name="text">
<string>20V/V</string>
</property>
</item>
<item>
<property name="text">
<string>30V/V</string>
</property>
</item>
<item>
<property name="text">
<string>40V/V</string>
</property>
</item>
<item>
<property name="text">
<string>60V/V</string>
</property>
</item>
<item>
<property name="text">
<string>80V/V</string>
</property>
</item>
<item>
<property name="text">
<string>120V/V</string>
</property>
</item>
<item>
<property name="text">
<string>157V/V</string>
</property>
</item>
<item>
<property name="text">
<string>0.25V/V</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Reference gain:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="refgain">
<item>
<property name="text">
<string>1V/V</string>
</property>
</item>
<item>
<property name="text">
<string>10V/V</string>
</property>
</item>
<item>
<property name="text">
<string>20V/V</string>
</property>
</item>
<item>
<property name="text">
<string>30V/V</string>
</property>
</item>
<item>
<property name="text">
<string>40V/V</string>
</property>
</item>
<item>
<property name="text">
<string>60V/V</string>
</property>
</item>
<item>
<property name="text">
<string>80V/V</string>
</property>
</item>
<item>
<property name="text">
<string>120V/V</string>
</property>
</item>
<item>
<property name="text">
<string>157V/V</string>
</property>
</item>
<item>
<property name="text">
<string>0.25V/V</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons"> <property name="standardButtons">

3
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp
View File

@ -327,6 +327,9 @@ void DevicePacketLogView::addEntry(const DevicePacketLog::LogEntry &e)
addString(VFF, "IP", QHostAddress(qFromBigEndian(sFF.ip)).toString()); addString(VFF, "IP", QHostAddress(qFromBigEndian(sFF.ip)).toString());
addString(VFF, "Mask", QHostAddress(qFromBigEndian(sFF.mask)).toString()); addString(VFF, "Mask", QHostAddress(qFromBigEndian(sFF.mask)).toString());
addString(VFF, "Gateway", QHostAddress(qFromBigEndian(sFF.gw)).toString()); addString(VFF, "Gateway", QHostAddress(qFromBigEndian(sFF.gw)).toString());
addBool(VFF, "PGA autogain", sFF.autogain);
addInteger(VFF, "Port gain", sFF.portGain);
addInteger(VFF, "Reference gain", sFF.refGain);
} }
break; break;
default: default:

11
Software/VNA_embedded/Application/Communication/Protocol.hpp
View File

@ -384,10 +384,13 @@ using DeviceConfig = struct _deviceconfig {
uint16_t DFTphaseInc; uint16_t DFTphaseInc;
} V1; } V1;
struct { struct {
uint32_t ip; uint32_t ip;
uint32_t mask; uint32_t mask;
uint32_t gw; uint32_t gw;
uint8_t dhcp :1; uint16_t dhcp :1;
uint16_t autogain :1;
uint16_t portGain :4;
uint16_t refGain :4;
} VFF; } VFF;
}; };
}; };