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

Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.cpp

@@ -14,6 +14,7 @@ using USBID = struct {
 static constexpr USBID IDs[] = {
     {0x0483, 0x564e},
     {0x0483, 0x4121},
+    {0x1209, 0x4121},
 };
 
 USBInBuffer::USBInBuffer(libusb_device_handle *handle, unsigned char endpoint, int buffer_size) :

Software/PC_Application/LibreVNA-GUI/appwindow.cpp

@@ -477,7 +477,10 @@ void AppWindow::CreateToolbars()
 void AppWindow::SetupSCPI()
 {
     scpi.add(new SCPICommand("*IDN", nullptr, [=](QStringList){
-        return "LibreVNA-GUI";
+        return "LibreVNA,LibreVNA-GUI,dummy_serial,"+appVersion;
+    }));
+    scpi.add(new SCPICommand("*OPC", nullptr, [=](QStringList){
+        return "1";
     }));
     auto scpi_dev = new SCPINode("DEVice");
     scpi.add(scpi_dev);
@@ -518,6 +521,27 @@ void AppWindow::SetupSCPI()
         ret.chop(1);
         return ret;
     }));
+    auto scpi_setup = new SCPINode("SETUP");
+    scpi_dev->add(scpi_setup);
+    scpi_setup->add(new SCPICommand("SAVE", [=](QStringList params) -> QString {
+        if(params.size() != 1) {
+            // no filename given
+            return SCPI::getResultName(SCPI::Result::Error);
+        }
+        SaveSetup(params[0]);
+        return SCPI::getResultName(SCPI::Result::Empty);
+    }, nullptr, false));
+    scpi_setup->add(new SCPICommand("LOAD", nullptr, [=](QStringList params) -> QString {
+        if(params.size() != 1) {
+            // no filename given
+            return SCPI::getResultName(SCPI::Result::False);
+        }
+        if(!LoadSetup(params[0])) {
+            // some error when loading the setup file
+            return SCPI::getResultName(SCPI::Result::False);
+        }
+        return SCPI::getResultName(SCPI::Result::True);
+    }, false));
     auto scpi_ref = new SCPINode("REFerence");
     scpi_dev->add(scpi_ref);
     scpi_ref->add(new SCPICommand("OUT", [=](QStringList params) -> QString {
@@ -1182,13 +1206,13 @@ nlohmann::json AppWindow::SaveSetup()
     return j;
 }
 
-void AppWindow::LoadSetup(QString filename)
+bool AppWindow::LoadSetup(QString filename)
 {
     ifstream file;
     file.open(filename.toStdString());
     if(!file.is_open()) {
         qWarning() << "Unable to open file:" << filename;
-        return;
+        return false;
     }
     nlohmann::json j;
     try {
@@ -1197,12 +1221,13 @@ void AppWindow::LoadSetup(QString filename)
         InformationBox::ShowError("Error", "Failed to parse the setup file (" + QString(e.what()) + ")");
         qWarning() << "Parsing of setup file failed: " << e.what();
         file.close();
-        return;
+        return false;
     }
     file.close();
     LoadSetup(j);
     QFileInfo fi(filename);
     lSetupName.setText("Setup: "+fi.fileName());
+    return true;
 }
 
 void AppWindow::LoadSetup(nlohmann::json j)

Software/PC_Application/LibreVNA-GUI/appwindow.h

@@ -68,7 +68,7 @@ private slots:
     void DeviceFlagsUpdated();
     void DeviceInfoUpdated();
     void SaveSetup(QString filename);
-    void LoadSetup(QString filename);
+    bool LoadSetup(QString filename);
 private:
     nlohmann::json SaveSetup();
     void LoadSetup(nlohmann::json j);

Software/PC_Application/LibreVNA-GUI/scpi.cpp

@@ -105,7 +105,6 @@ void SCPI::input(QString line)
         if(cmd[0] == ':') {
             cmd.remove(0, 1);
         }
-        cmd = cmd.toUpper();
         auto response = lastNode->parse(cmd, lastNode);
         emit output(response);
     }
@@ -274,7 +273,7 @@ QString SCPINode::parse(QString cmd, SCPINode* &lastNode)
         // have not reached a leaf, find next subnode
         auto subnode = cmd.left(splitPos);
         for(auto n : subnodes) {
-            if(SCPI::match(n->name, subnode)) {
+            if(SCPI::match(n->name, subnode.toUpper())) {
                 // pass on to next level
                 return n->parse(cmd.right(cmd.size() - splitPos - 1), lastNode);
             }
@@ -292,9 +291,14 @@ QString SCPINode::parse(QString cmd, SCPINode* &lastNode)
             cmd.chop(1);
         }
         for(auto c : commands) {
-            if(SCPI::match(c->name(), cmd)) {
+            if(SCPI::match(c->name(), cmd.toUpper())) {
                 // save current node in case of non-root for the next command
                 lastNode = this;
+                if(c->convertToUppercase()) {
+                    for(auto &p : params) {
+                        p = p.toUpper();
+                    }
+                }
                 if(isQuery) {
                     return c->query(params);
                 } else {

Software/PC_Application/LibreVNA-GUI/scpi.h

@@ -8,20 +8,23 @@
 
 class SCPICommand {
 public:
-    SCPICommand(QString name, std::function<QString(QStringList)> cmd, std::function<QString(QStringList)> query) :
+    SCPICommand(QString name, std::function<QString(QStringList)> cmd, std::function<QString(QStringList)> query, bool convertToUppercase = true) :
         _name(name),
         fn_cmd(cmd),
-        fn_query(query){}
+        fn_query(query),
+        argAlwaysUppercase(convertToUppercase){}
 
     QString execute(QStringList params);
     QString query(QStringList params);
     QString name() {return _name;}
     bool queryable() { return fn_query != nullptr;}
     bool executable() { return fn_cmd != nullptr;}
+    bool convertToUppercase() { return argAlwaysUppercase;}
 private:
     const QString _name;
     std::function<QString(QStringList)> fn_cmd;
     std::function<QString(QStringList)> fn_query;
+    bool argAlwaysUppercase;
 };
 
 class SCPINode {