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

Merge branch 'master' of github.com:jankae/LibreVNA

Browse Source
This commit is contained in:
Jan Käberich 2022-06-06 21:52:05 +02:00
commit c248bba1ed
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Software/PC_Application/Device/device.cpp
View File

@ -234,6 +234,14 @@ Device::~Device()
} }
} }
void Device::RegisterTypes()
{
qRegisterMetaType<Protocol::Datapoint>("Datapoint");
qRegisterMetaType<Protocol::ManualStatusV1>("ManualV1");
qRegisterMetaType<Protocol::SpectrumAnalyzerResult>("SpectrumAnalyzerResult");
qRegisterMetaType<Protocol::AmplitudeCorrectionPoint>("AmplitudeCorrection");
}
bool Device::SendPacket(const Protocol::PacketInfo& packet, std::function<void(TransmissionResult)> cb, unsigned int timeout) bool Device::SendPacket(const Protocol::PacketInfo& packet, std::function<void(TransmissionResult)> cb, unsigned int timeout)
{ {
Transmission t; Transmission t;

2
Software/PC_Application/Device/device.h
View File

@ -58,6 +58,8 @@ public:
// connect to a VNA device. If serial is specified only connecting to this device, otherwise to the first one found // connect to a VNA device. If serial is specified only connecting to this device, otherwise to the first one found
Device(QString serial = QString()); Device(QString serial = QString());
~Device(); ~Device();
static void RegisterTypes();
bool SendPacket(const Protocol::PacketInfo& packet, std::function<void(TransmissionResult)> cb = nullptr, unsigned int timeout = 500); bool SendPacket(const Protocol::PacketInfo& packet, std::function<void(TransmissionResult)> cb = nullptr, unsigned int timeout = 500);
bool Configure(Protocol::SweepSettings settings, std::function<void(TransmissionResult)> cb = nullptr); bool Configure(Protocol::SweepSettings settings, std::function<void(TransmissionResult)> cb = nullptr);
bool Configure(Protocol::SpectrumAnalyzerSettings settings, std::function<void(TransmissionResult)> cb = nullptr); bool Configure(Protocol::SpectrumAnalyzerSettings settings, std::function<void(TransmissionResult)> cb = nullptr);

5
Software/PC_Application/appwindow.cpp
View File

@ -234,11 +234,6 @@ AppWindow::AppWindow(QWidget *parent)
// Set default mode // Set default mode
vna->activate(); vna->activate();
qRegisterMetaType<Protocol::Datapoint>("Datapoint");
qRegisterMetaType<Protocol::ManualStatusV1>("ManualV1");
qRegisterMetaType<Protocol::SpectrumAnalyzerResult>("SpectrumAnalyzerResult");
qRegisterMetaType<Protocol::AmplitudeCorrectionPoint>("AmplitudeCorrection");
auto pref = Preferences::getInstance(); auto pref = Preferences::getInstance();
if(pref.Startup.UseSetupFile) { if(pref.Startup.UseSetupFile) {
LoadSetup(pref.Startup.SetupFile); LoadSetup(pref.Startup.SetupFile);

3
Software/PC_Application/main.cpp
View File

@ -1,5 +1,6 @@
#include "appwindow.h" #include "appwindow.h"
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include "Device/device.h"
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
#include <signal.h> #include <signal.h>
#endif #endif
@ -23,6 +24,8 @@ int main(int argc, char *argv[]) {
QCoreApplication::setApplicationVersion(window->getAppVersion() + "-" + QCoreApplication::setApplicationVersion(window->getAppVersion() + "-" +
window->getAppGitHash().left(9)); window->getAppGitHash().left(9));
Device::RegisterTypes();
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
signal(SIGINT, tryExitGracefully); signal(SIGINT, tryExitGracefully);
#endif #endif