jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 15:04:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibreVNA TCP driver

Browse source
This commit is contained in:
Jan Käberich 2023-01-29 18:02:32 +01:00
parent 80c5fc0ff6
commit 2c86cf1d6c
16 changed files with 550 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Software/PC_Application/LibreVNA-GUI/appwindow.cpp
View file

@ -26,6 +26,7 @@
#include "modehandler.h"
#include "modewindow.h"
#include "Device/LibreVNA/librevnausbdriver.h"
#include "Device/LibreVNA/librevnatcpdriver.h"
#include <QDockWidget>
#include <QDesktopWidget>
@ -101,6 +102,7 @@ AppWindow::AppWindow(QWidget *parent)
// Register device drivers
deviceDrivers.push_back(new LibreVNAUSBDriver());
deviceDrivers.push_back(new LibreVNATCPDriver());
for(auto driver : deviceDrivers) {
driver->registerTypes();
@ -240,7 +242,7 @@ void AppWindow::SetupMenu()
});
// connect(ui->actionManual_Control, &QAction::triggered, this, &AppWindow::StartManualControl);
connect(ui->actionUSB_log, &QAction::triggered, this, &AppWindow::ShowUSBLog);
connect(ui->actionDevice_log, &QAction::triggered, this, &AppWindow::ShowDeviceLog);
// connect(ui->actionFirmware_Update, &QAction::triggered, this, &AppWindow::StartFirmwareUpdateDialog);
// connect(ui->actionSource_Calibration, &QAction::triggered, this, &AppWindow::SourceCalibrationDialog);
// connect(ui->actionReceiver_Calibration, &QAction::triggered, this, &AppWindow::ReceiverCalibrationDialog);
@ -369,12 +371,13 @@ bool AppWindow::ConnectToDevice(QString serial, DeviceDriver *driver)
connect(device, &DeviceDriver::LogLineReceived, &deviceLog, &DeviceLog::addLine);
connect(device, &DeviceDriver::ConnectionLost, this, &AppWindow::DeviceConnectionLost);
connect(device, &DeviceDriver::StatusUpdated, this, &AppWindow::DeviceStatusUpdated);
connect(device, &DeviceDriver::releaseControl, [=](){
connect(device, &DeviceDriver::FlagsUpdated, this, &AppWindow::DeviceFlagsUpdated);
connect(device, &DeviceDriver::releaseControl, this, [=](){
if(lastActiveMode) {
modeHandler->activate(lastActiveMode);
}
});
connect(device, &DeviceDriver::acquireControl, [=](){
connect(device, &DeviceDriver::acquireControl, this, [=](){
lastActiveMode = modeHandler->getActiveMode();
modeHandler->deactivate(lastActiveMode);
});
@ -440,6 +443,8 @@ void AppWindow::DisconnectDevice()
ui->menuDevice->removeAction(a);
}
device->disconnectDevice();
disconnect(device, nullptr, &deviceLog, nullptr);
disconnect(device, nullptr, this, nullptr);
device = nullptr;
}
ui->actionDisconnect->setEnabled(false);
@ -465,7 +470,7 @@ void AppWindow::DisconnectDevice()
void AppWindow::DeviceConnectionLost()
{
DisconnectDevice();
InformationBox::ShowError("Disconnected", "The USB connection to the device has been lost");
InformationBox::ShowError("Disconnected", "The connection to the device has been lost");
UpdateDeviceList();
}
@ -1084,7 +1089,7 @@ void AppWindow::UpdateReference()
device->setExtRef(toolbars.reference.type->currentText(), toolbars.reference.outFreq->currentText());
}
void AppWindow::ShowUSBLog()
void AppWindow::ShowDeviceLog()
{
auto d = new DeviceUSBLogView();
if(AppWindow::showGUI()) {