mirror of
https://github.com/jankae/LibreVNA.git
synced 2025-12-06 07:12:10 +01:00
improve handling of SCPI commands received with short/no time between
This commit is contained in:
parent
57e6812cf8
commit
82e215881a
|
|
@ -32,8 +32,6 @@ class TestBase(unittest.TestCase):
|
|||
if self.vna.query(":DEV:CONN?") == "Not connected":
|
||||
self.tearDown()
|
||||
raise AssertionError("Not connected")
|
||||
# Tests occasionally fail without this timeout - give GUI a little bit more time to properly start
|
||||
time.sleep(1)
|
||||
|
||||
def tearDown(self):
|
||||
self.gui.send_signal(SIGINT)
|
||||
|
|
|
|||
3
Software/PC_Application/.gitignore
vendored
3
Software/PC_Application/.gitignore
vendored
|
|
@ -78,6 +78,9 @@ Application
|
|||
/LibreVNA-GUI/users*appdatalocaltemp*
|
||||
/LibreVNA/build
|
||||
|
||||
# qmake.stash
|
||||
LibreVNA-GUI/.qmake.stash
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -342,6 +342,7 @@ void SpectrumAnalyzer::deactivate()
|
|||
{
|
||||
setOperationPending(false);
|
||||
StoreSweepSettings();
|
||||
configurationTimer.stop();
|
||||
Mode::deactivate();
|
||||
}
|
||||
|
||||
|
|
@ -874,6 +875,7 @@ void SpectrumAnalyzer::Stop()
|
|||
|
||||
void SpectrumAnalyzer::ConfigureDevice()
|
||||
{
|
||||
configurationTimer.stop();
|
||||
if(running) {
|
||||
changingSettings = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -738,6 +738,7 @@ void VNA::deactivate()
|
|||
{
|
||||
setOperationPending(false);
|
||||
StoreSweepSettings();
|
||||
configurationTimer.stop();
|
||||
Mode::deactivate();
|
||||
}
|
||||
|
||||
|
|
@ -1839,6 +1840,7 @@ void VNA::Stop()
|
|||
|
||||
void VNA::ConfigureDevice(bool resetTraces, std::function<void(bool)> cb)
|
||||
{
|
||||
configurationTimer.stop();
|
||||
if(running) {
|
||||
if (resetTraces) {
|
||||
ResetLiveTraces();
|
||||
|
|
|
|||
|
|
@ -1020,7 +1020,7 @@ void AppWindow::SetupSCPI()
|
|||
void AppWindow::StartTCPServer(int port)
|
||||
{
|
||||
server = new TCPServer(port);
|
||||
connect(server, &TCPServer::received, &scpi, &SCPI::input);
|
||||
connect(server, &TCPServer::received, &scpi, &SCPI::input, Qt::QueuedConnection);
|
||||
connect(&scpi, &SCPI::output, server, &TCPServer::send);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue