From f088e5b8f914feb3e669ad98d0c89a158169d8e1 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Mon, 25 Mar 2024 13:04:24 +0000 Subject: [PATCH] Make initial commands immediate to improve initial connection --- cachingqueue.cpp | 4 ++-- wfmain.cpp | 49 ------------------------------------------------ 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/cachingqueue.cpp b/cachingqueue.cpp index 2ffcb2b..b35fb4d 100644 --- a/cachingqueue.cpp +++ b/cachingqueue.cpp @@ -129,7 +129,7 @@ void cachingQueue::add(queuePriority prio ,queueItem item) // also insert an immediate command to get the current value "now" (removes the need to get rigstate) queueItem it=item; it.recurring=false; - queue.insert(queue.cend(),priorityHighest, it); + queue.insert(queue.cend(),priorityImmediate, it); qDebug() << "adding" << funcString[item.command] << "recurring" << item.recurring << "priority" << prio << "vfo" << item.vfo; } queue.insert(prio, item); @@ -171,7 +171,7 @@ void cachingQueue::addUnique(queuePriority prio ,queueItem item) // also insert an immediate command to get the current value "now" (removes the need to get initial rigstate) queueItem it = item; it.recurring=false; - queue.insert(queue.cend(),priorityHighest, it); + queue.insert(queue.cend(),priorityImmediate, it); qDebug() << "adding unique" << funcString[item.command] << "recurring" << item.recurring << "priority" << prio << "vfo" << item.vfo; } queue.insert(prio, item); diff --git a/wfmain.cpp b/wfmain.cpp index 3a51374..b2a1dfe 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -3798,55 +3798,6 @@ void wfmain::initPeriodicCommands() } } -/* - queue->add(priorityMedium,funcSelectedFreq,true,false); - queue->add(priorityMedium,funcSelectedMode,true,false); - //queue->add(priorityMedium,(rigCaps->commands.contains(funcSelectedMode)?funcNone:funcDataModeWithFilter),true,false); - queue->add(priorityMedium,funcUnselectedFreq,true,true); - queue->add(priorityMedium,funcUnselectedMode,true,true); - - if (rigCaps->hasSpectrum) - { - queue->add(priorityHigh,funcOverflowStatus,true,false); - queue->add(priorityMediumHigh,funcScopeMainMode,true,false); - queue->add(priorityMediumHigh,funcScopeSubMode,true,true); - queue->add(priorityMediumHigh,funcScopeMainSpan,true,false); - queue->add(priorityMediumHigh,funcScopeSubSpan,true,true); - queue->add(priorityMediumHigh,funcScopeSingleDual,true,false); - queue->add(priorityMediumHigh,funcScopeMainSub,true,false); - queue->add(priorityMedium,funcScopeMainSpeed,true,false); - queue->add(priorityMedium,funcScopeSubSpeed,true,true); - queue->add(priorityMedium,funcScopeMainHold,true,false); - queue->add(priorityMedium,funcScopeSubHold,true,true); - queue->add(priorityMedium,funcVFODualWatch,true,false); - } - - if(rigCaps->hasTransmit) { - queue->add(priorityHigh,funcTransceiverStatus,true,false); - queue->add(priorityMediumHigh,funcDATAOffMod,true,false); - queue->add(priorityMediumHigh,funcDATA1Mod,true,false); - queue->add(priorityMediumHigh,funcDATA2Mod,true,false); - queue->add(priorityMediumHigh,funcDATA3Mod,true,false); - queue->add(priorityMedium,funcRFPower,true,false); - queue->add(priorityMediumLow,funcMonitorGain,true,false); - queue->add(priorityMediumLow,funcMonitor,true,false); - } - - // Medium/MediumLow Priority commands on all rigs (if supported) - queue->add(priorityMedium,funcRfGain,true,false); - queue->add(priorityMedium,funcTunerStatus,true,false); - - queue->add(priorityMediumLow,funcTuningStep,true,false); - queue->add(priorityMediumLow,funcAttenuator,true,false); - queue->add(priorityMediumLow,funcPreamp,true,false); - queue->add(priorityMediumLow,funcAntenna,true,false); - queue->add(priorityMediumLow,funcSplitStatus,true,false); - queue->add(priorityMediumLow,funcToneSquelchType,true,false); - - queue->add(priorityHighest,queueItem(funcSMeter,true)); - - - */ meter* marray[2]; marray[0] = ui->meter2Widget; marray[1] = ui->meter3Widget;