Few more fixes

cachingqueue.cpp

@@ -173,19 +173,22 @@ void cachingQueue::addUnique(queuePriority prio ,queueItem item)
 
 void cachingQueue::del(funcs func)
 {
-    QMutexLocker locker(&mutex);
+    if (func != funcNone)
+    {
+        QMutexLocker locker(&mutex);
 #if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
-    queue.erase(std::remove_if(queue.begin(), queue.end(), [func](const queueItem& c) {  return (c.command == func); }), queue.end());
+        queue.erase(std::remove_if(queue.begin(), queue.end(), [func](const queueItem& c) {  return (c.command == func); }), queue.end());
 #else
-    auto it(queue.begin());
-    while (it != queue.end()) {
-        if (it.value().command == func)
-            it = queue.erase(it);
-        else
-            it++;
-    }
+        auto it(queue.begin());
+        while (it != queue.end()) {
+            if (it.value().command == func)
+                it = queue.erase(it);
+            else
+                it++;
+        }
 #endif
-    qInfo() << "deleting" << funcString[func];
+        qInfo() << "deleting" << funcString[func];
+    }
 }
 
 queuePriority cachingQueue::isRecurring(funcs func)

rigcommander.cpp

@@ -1980,6 +1980,7 @@ void rigCommander::parseCommand()
     funcs func = funcNone;
     bool sub = false;
 
+
     if (rigCaps.hasCommand29 && payloadIn[0] == '\x29')
     {
         sub = static_cast<bool>(payloadIn[1]);
@@ -2003,7 +2004,9 @@ void rigCommander::parseCommand()
 #endif
 
     if (!rigCaps.commands.contains(func)) {
-        qInfo(logRig()) << "Unsupported command received from rig" << funcString[func] << "Check rig file (" << payloadIn.toHex() << ")";
+        // Don't warn if we haven't received rigCaps yet
+        if (haveRigCaps)
+            qInfo(logRig()) << "Unsupported command received from rig" <<  payloadIn.toHex().mid(0,10) << "Check rig file";
         return;
     }
 
@@ -2391,7 +2394,7 @@ void rigCommander::parseCommand()
         printHex(payloadIn, false ,true);
         break;
     default:
-        qWarning(logRig()) << "Unhandled command received from rig" << payloadIn.toHex() << "Contact support!";
+        qWarning(logRig()) << "Unhandled command received from rig" << payloadIn.toHex().mid(0,10) << "Contact support!";
         break;
     }
 
@@ -6918,7 +6921,7 @@ void rigCommander::receiveCommand(queueItemType type, funcs func, QVariant value
         // Used to validate payload, otherwise ignore.
         val = value.value<int>();
         //qInfo(logRig()) << "Got value" << QString(value.typeName());
-        if (func == funcMemoryContents || func == funcMemoryClear || func == funcMemoryWrite)
+        if (func == funcMemoryContents || func == funcMemoryClear || func == funcMemoryWrite || func == funcMemoryMode)
         {
             // Strip out group number from memory for validation purposes.
             val = val & 0xffff;

rigs/ic-7610.rig

@@ -612,72 +612,112 @@ Commands\118\String=\\x27\\x14\\x00
 Commands\118\Min=0
 Commands\118\Max=4
 Commands\118\Command29=false
-Commands\119\Type=Scope Main Span
-Commands\119\String=\\x27\\x15\\x00
+Commands\119\Type=Scope Sub Mode
+Commands\119\String=\\x27\\x14\\x01
 Commands\119\Min=0
-Commands\119\Max=7
+Commands\119\Max=4
 Commands\119\Command29=false
-Commands\120\Type=Scope Main Edge
-Commands\120\String=\\x27\\x16\\x00
-Commands\120\Min=1
-Commands\120\Max=4
+Commands\120\Type=Scope Main Span
+Commands\120\String=\\x27\\x15\\x00
+Commands\120\Min=0
+Commands\120\Max=7
 Commands\120\Command29=false
-Commands\121\Type=Scope Main Hold
-Commands\121\String=\\x27\\x17\\x00
+Commands\121\Type=Scope Sub Span
+Commands\121\String=\\x27\\x15\\x01
 Commands\121\Min=0
-Commands\121\Max=1
+Commands\121\Max=7
 Commands\121\Command29=false
-Commands\122\Type=Scope Main Ref
-Commands\122\String=\\x27\\x19\\x00
-Commands\122\Min=-30
-Commands\122\Max=10
+Commands\122\Type=Scope Main Edge
+Commands\122\String=\\x27\\x16\\x00
+Commands\122\Min=1
+Commands\122\Max=4
 Commands\122\Command29=false
-Commands\123\Type=Scope Main Speed
-Commands\123\String=\\x27\\x1a\\x00
-Commands\123\Min=0
-Commands\123\Max=2
+Commands\123\Type=Scope Sub Edge
+Commands\123\String=\\x27\\x16\\x01
+Commands\123\Min=1
+Commands\123\Max=4
 Commands\123\Command29=false
-Commands\124\Type=Scope During TX
-Commands\124\String=\\x27\\x1b
+Commands\124\Type=Scope Main Hold
+Commands\124\String=\\x27\\x17\\x00
 Commands\124\Min=0
 Commands\124\Max=1
 Commands\124\Command29=false
-Commands\125\Type=Scope Center Type
-Commands\125\String=\\x27\\x1c
+Commands\125\Type=Scope Sub Hold
+Commands\125\String=\\x27\\x17\\x01
 Commands\125\Min=0
-Commands\125\Max=2
+Commands\125\Max=1
 Commands\125\Command29=false
-Commands\126\Type=Scope Main VBW
-Commands\126\String=\\x27\\x1d\\x00
-Commands\126\Min=0
-Commands\126\Max=1
+Commands\126\Type=Scope Main Ref
+Commands\126\String=\\x27\\x19\\x00
+Commands\126\Min=-30
+Commands\126\Max=10
 Commands\126\Command29=false
-Commands\127\Type=Scope Fixed Edge Freq
-Commands\127\String=\\x27\\x1e
-Commands\127\Min=1
-Commands\127\Max=12
+Commands\127\Type=Scope Sub Ref
+Commands\127\String=\\x27\\x19\\x01
+Commands\127\Min=-30
+Commands\127\Max=10
 Commands\127\Command29=false
-Commands\128\Type=Scope Main RBW
-Commands\128\String=\\x27\\x1f
+Commands\128\Type=Scope Main Speed
+Commands\128\String=\\x27\\x1a\\x00
 Commands\128\Min=0
 Commands\128\Max=2
 Commands\128\Command29=false
-Commands\129\Type=Main/Sub Prefix
-Commands\129\String=\\x29
+Commands\129\Type=Scope Sub Speed
+Commands\129\String=\\x27\\x1a\\x01
 Commands\129\Min=0
-Commands\129\Max=1
+Commands\129\Max=2
 Commands\129\Command29=false
-Commands\130\Type=Command Error FA
-Commands\130\String=\\xfa
+Commands\130\Type=Scope During TX
+Commands\130\String=\\x27\\x1b
 Commands\130\Min=0
-Commands\130\Max=0
+Commands\130\Max=1
 Commands\130\Command29=false
-Commands\131\Type=Command OK FB
-Commands\131\String=\\xfb
+Commands\131\Type=Scope Center Type
+Commands\131\String=\\x27\\x1c
 Commands\131\Min=0
-Commands\131\Max=0
+Commands\131\Max=2
 Commands\131\Command29=false
-Commands\size=131
+Commands\132\Type=Scope Sub VBW
+Commands\132\String=\\x27\\x1d\\x01
+Commands\132\Min=0
+Commands\132\Max=1
+Commands\132\Command29=false
+Commands\133\Type=Scope Main VBW
+Commands\133\String=\\x27\\x1d\\x00
+Commands\133\Min=0
+Commands\133\Max=1
+Commands\133\Command29=false
+Commands\134\Type=Scope Fixed Edge Freq
+Commands\134\String=\\x27\\x1e
+Commands\134\Min=1
+Commands\134\Max=12
+Commands\134\Command29=false
+Commands\135\Type=Scope Main RBW
+Commands\135\String=\\x27\\x1f\\x00
+Commands\135\Min=0
+Commands\135\Max=2
+Commands\135\Command29=false
+Commands\136\Type=Scope Sub RBW
+Commands\136\String=\\x27\\x1f\\x01
+Commands\136\Min=0
+Commands\136\Max=2
+Commands\136\Command29=false
+Commands\137\Type=Main/Sub Prefix
+Commands\137\String=\\x29
+Commands\137\Min=0
+Commands\137\Max=1
+Commands\137\Command29=false
+Commands\138\Type=Command Error FA
+Commands\138\String=\\xfa
+Commands\138\Min=0
+Commands\138\Max=0
+Commands\138\Command29=false
+Commands\139\Type=Command OK FB
+Commands\139\String=\\xfb
+Commands\139\Min=0
+Commands\139\Max=0
+Commands\139\Command29=false
+Commands\size=139
 Spans\1\Num=0
 Spans\1\Name=±2.5 KHz
 Spans\1\Freq=2500