From 5f2788467bdc738b8ad5c9ad71d1939484e89dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 29 Jun 2024 12:47:44 +0200 Subject: [PATCH] remove duplicate RUN and STOP commands for spectrum analyzer --- .../LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp | 10 ---------- Software/PC_Application/LibreVNA-GUI/scpi.cpp | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp index 31feae9..43161a9 100644 --- a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp +++ b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp @@ -1084,16 +1084,6 @@ void SpectrumAnalyzer::SetupSCPI() }, [=](QStringList) -> QString { return singleSweep ? SCPI::getResultName(SCPI::Result::True): SCPI::getResultName(SCPI::Result::False); })); - scpi_acq->add(new SCPICommand("RUN", [=](QStringList) -> QString { - Run(); - return SCPI::getResultName(SCPI::Result::Empty); - }, [=](QStringList) -> QString { - return running ? SCPI::getResultName(SCPI::Result::True) : SCPI::getResultName(SCPI::Result::False); - })); - scpi_acq->add(new SCPICommand("STOP", [=](QStringList) -> QString { - Stop(); - return SCPI::getResultName(SCPI::Result::Empty); - }, nullptr)); auto scpi_tg = new SCPINode("TRACKing"); SCPINode::add(scpi_tg); scpi_tg->add(new SCPICommand("ENable", [=](QStringList params) -> QString { diff --git a/Software/PC_Application/LibreVNA-GUI/scpi.cpp b/Software/PC_Application/LibreVNA-GUI/scpi.cpp index 9f6a0e6..023871b 100644 --- a/Software/PC_Application/LibreVNA-GUI/scpi.cpp +++ b/Software/PC_Application/LibreVNA-GUI/scpi.cpp @@ -296,7 +296,7 @@ bool SCPINode::remove(SCPINode *node) bool SCPINode::add(SCPICommand *cmd) { if(nameCollision(cmd->name())) { - qWarning() << "Unable to add SCPI node, name collision: " << cmd->name(); + qWarning() << "Unable to add SCPI command, name collision: " << cmd->name(); return false; } commands.push_back(cmd);