From c5f99815cef87b8acae489f91334c1ef7d5bd405 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Sun, 28 Apr 2024 11:40:11 +0100
Subject: [PATCH] Improve OVF and Squelch.

---
 rigs/IC-705.rig  |  2 +-
 rigs/IC-7300.rig |  2 +-
 rigs/IC-7610.rig |  4 ++--
 rigs/IC-785x.rig |  4 ++--
 rigs/IC-905.rig  |  2 +-
 rigs/IC-9700.rig |  5 ++++-
 wfmain.cpp       | 13 +++++++------
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/rigs/IC-705.rig b/rigs/IC-705.rig
index f797bec..8555fd7 100644
--- a/rigs/IC-705.rig
+++ b/rigs/IC-705.rig
@@ -876,7 +876,7 @@ Periodic\5\VFO=0
 Periodic\6\Priority=Medium Low
 Periodic\6\Command=Monitor Status
 Periodic\6\VFO=0
-Periodic\7\Priority=Medium
+Periodic\7\Priority=High
 Periodic\7\Command=Overflow Status
 Periodic\7\VFO=0
 Periodic\8\Priority=Medium Low
diff --git a/rigs/IC-7300.rig b/rigs/IC-7300.rig
index 984a91c..60d9f70 100644
--- a/rigs/IC-7300.rig
+++ b/rigs/IC-7300.rig
@@ -600,7 +600,7 @@ Periodic\4\VFO=0
 Periodic\5\Priority=Medium Low
 Periodic\5\Command=Monitor Status
 Periodic\5\VFO=0
-Periodic\6\Priority=Medium
+Periodic\6\Priority=High
 Periodic\6\Command=Overflow Status
 Periodic\6\VFO=0
 Periodic\7\Priority=Medium Low
diff --git a/rigs/IC-7610.rig b/rigs/IC-7610.rig
index 10bfb2c..6c3ffda 100644
--- a/rigs/IC-7610.rig
+++ b/rigs/IC-7610.rig
@@ -1035,7 +1035,7 @@ Periodic\9\VFO=0
 Periodic\10\Priority=Medium Low
 Periodic\10\Command=Monitor Status
 Periodic\10\VFO=0
-Periodic\11\Priority=Medium
+Periodic\11\Priority=High
 Periodic\11\Command=Overflow Status
 Periodic\11\VFO=0
 Periodic\12\Priority=Medium Low
@@ -1082,7 +1082,7 @@ Periodic\25\Command=Scope Sub Speed
 Periodic\25\VFO=1
 Periodic\26\Priority=Medium Low
 Periodic\26\Command=Squelch
-Periodic\26\VFO=0
+Periodic\26\VFO=-1
 Periodic\27\Priority=Medium
 Periodic\27\Command=Sub RX Frequency
 Periodic\27\VFO=1
diff --git a/rigs/IC-785x.rig b/rigs/IC-785x.rig
index 8210dc3..f7b988f 100644
--- a/rigs/IC-785x.rig
+++ b/rigs/IC-785x.rig
@@ -1049,7 +1049,7 @@ Periodic\9\VFO=0
 Periodic\10\Priority=Medium Low
 Periodic\10\Command=Monitor Status
 Periodic\10\VFO=0
-Periodic\11\Priority=Medium
+Periodic\11\Priority=High
 Periodic\11\Command=Overflow Status
 Periodic\11\VFO=0
 Periodic\12\Priority=Medium Low
@@ -1096,7 +1096,7 @@ Periodic\25\Command=Scope Sub Speed
 Periodic\25\VFO=1
 Periodic\26\Priority=Medium Low
 Periodic\26\Command=Squelch
-Periodic\26\VFO=0
+Periodic\26\VFO=-1
 Periodic\27\Priority=Medium
 Periodic\27\Command=Sub RX Frequency
 Periodic\27\VFO=1
diff --git a/rigs/IC-905.rig b/rigs/IC-905.rig
index 9c954df..2534823 100644
--- a/rigs/IC-905.rig
+++ b/rigs/IC-905.rig
@@ -761,7 +761,7 @@ Periodic\4\VFO=0
 Periodic\5\Priority=Medium Low
 Periodic\5\Command=Monitor Status
 Periodic\5\VFO=0
-Periodic\6\Priority=Medium
+Periodic\6\Priority=High
 Periodic\6\Command=Overflow Status
 Periodic\6\VFO=0
 Periodic\7\Priority=Medium Low
diff --git a/rigs/IC-9700.rig b/rigs/IC-9700.rig
index 449d6a4..1e14054 100644
--- a/rigs/IC-9700.rig
+++ b/rigs/IC-9700.rig
@@ -936,7 +936,7 @@ Periodic\4\VFO=0
 Periodic\5\Priority=Medium Low
 Periodic\5\Command=Monitor Status
 Periodic\5\VFO=0
-Periodic\6\Priority=Medium
+Periodic\6\Priority=High
 Periodic\6\Command=Overflow Status
 Periodic\6\VFO=0
 Periodic\7\Priority=Medium Low
@@ -1042,6 +1042,7 @@ Bands\1\End=1300000000
 Bands\1\Range=1300
 Bands\1\MemoryGroup=3
 Bands\1\Name=23cm
+Bands\1\Bytes=5
 Bands\2\Num=5
 Bands\2\BSR=2
 Bands\2\Start=430000000
@@ -1049,6 +1050,7 @@ Bands\2\End=450000000
 Bands\2\Range=450
 Bands\2\MemoryGroup=2
 Bands\2\Name=70cm
+Bands\2\Bytes=5
 Bands\3\Num=6
 Bands\3\BSR=1
 Bands\3\Start=144000000
@@ -1056,6 +1058,7 @@ Bands\3\End=148000000
 Bands\3\Range=148
 Bands\3\MemoryGroup=1
 Bands\3\Name=2m
+Bands\3\Bytes=5
 Bands\size=3
 Modes\1\Num=0
 Modes\1\Reg=0
diff --git a/wfmain.cpp b/wfmain.cpp
index 18b0157..71172c7 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -4256,7 +4256,7 @@ void wfmain::on_connectBtn_clicked()
 
 void wfmain::on_sqlSlider_valueChanged(int value)
 {
-    queue->addUnique(priorityImmediate,queueItem(funcSquelch,QVariant::fromValue<ushort>(value)));
+    queue->addUnique(priorityImmediate,queueItem(funcSquelch,QVariant::fromValue<ushort>(value),false,currentReceiver));
 }
 
 void wfmain::on_transmitBtn_clicked()
@@ -5363,8 +5363,10 @@ void wfmain::receiveValue(cacheItem val){
         emit sendLevel(val.command,val.value.value<uchar>());
         break;
     case funcSquelch:
-        changeSliderQuietly(ui->sqlSlider, val.value.value<uchar>());
-        emit sendLevel(val.command,val.value.value<uchar>());
+        if (val.receiver == currentReceiver) {
+            changeSliderQuietly(ui->sqlSlider, val.value.value<uchar>());
+            emit sendLevel(val.command,val.value.value<uchar>());
+        }
         break;
     case funcRFPower:
         changeSliderQuietly(ui->txPowerSlider, val.value.value<uchar>());
@@ -5392,9 +5394,7 @@ void wfmain::receiveValue(cacheItem val){
     case funcVariousSql:
         break;
     case funcOverflowStatus:
-        foreach (auto receiver, receivers) {
-            receiver->overflow(val.value.value<bool>());
-        }
+        receivers[val.receiver]->overflow(val.value.value<bool>());
         break;
     case funcCenterMeter:
         receiveMeter(meter_t::meterCenter,val.value.value<uchar>(),val.receiver);
@@ -5782,6 +5782,7 @@ void wfmain::on_scopeMainSubBtn_clicked()
     queue->add(priorityImmediate,queueItem(funcPreamp,false,currentReceiver));
     queue->add(priorityImmediate,queueItem(funcAttenuator,false,currentReceiver));
     queue->add(priorityImmediate,queueItem(funcAntenna,false,currentReceiver));
+    queue->add(priorityImmediate,queueItem(funcSquelch,false,currentReceiver));
 }
 
 void wfmain::on_scopeDualBtn_toggled(bool en)