Release v1.1.1

#1 #2
PianetaRadio · Mar 19, 2022 · 55ffcb8 · 55ffcb8
1 parent 07b5a29
commit 55ffcb8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -2,7 +2,7 @@ CatRadio
 
 (+ New, * Updated, - Removed)
 
-1.1.1 -
+1.1.1 -	2022-03-19
 	* VFO operations: check rig caps before perform VFO operations
 	* Sub VFO: improve sub VFO functions using targetable_vfo caps
 

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -156,7 +156,7 @@ void MainWindow::guiInit()
     }
 
     //* Mode combobox
-    if (my_rig->state.mode_list==RIG_MODE_NONE)
+    if (my_rig->state.mode_list == RIG_MODE_NONE)
     {
         ui->comboBox_Mode->setDisabled(true);
         ui->comboBox_ModeSub->setDisabled(true);
@@ -240,7 +240,7 @@ void MainWindow::guiInit()
         ui->radioButton_VFOSub->setCheckable(false);    //disable VFOsub radio button
         }
     }
-    else    //NET rigctl, assume targetable_vfo
+    else    //NET rigctl, as workaround assume targetable_vfo
     {
         rigCap.freqSub = 1;
         rigCap.modeSub = 1;

diff --git a/rigdaemon.cpp b/rigdaemon.cpp
@@ -209,7 +209,7 @@ void RigDaemon::rigUpdate()
             //* VFO Exchange
             if (rigCmd.vfoXchange)
             {
-                if (my_rig->caps->vfo_ops == RIG_OP_XCHG)
+                if (my_rig->caps->vfo_ops & RIG_OP_XCHG)
                 {
                     mode_t tempMode = rigGet.mode;
                     retcode = rig_vfo_op(my_rig, RIG_VFO_CURR, RIG_OP_XCHG);
@@ -221,7 +221,7 @@ void RigDaemon::rigUpdate()
                     }
                 }
 
-                else if (my_rig->caps->vfo_ops == RIG_OP_TOGGLE)
+                else if (my_rig->caps->vfo_ops & RIG_OP_TOGGLE)
                 {
                     freq_t tempFreq = rigGet.freqMain;
                     mode_t tempMode = rigGet.mode;
@@ -240,7 +240,7 @@ void RigDaemon::rigUpdate()
             //* VFO Copy
             if (rigCmd.vfoCopy)
             {
-                if (my_rig->caps->vfo_ops == RIG_OP_CPY)
+                if (my_rig->caps->vfo_ops & RIG_OP_CPY)
                 {
                     retcode = rig_vfo_op(my_rig, RIG_VFO_CURR, RIG_OP_CPY);
                     if (retcode == RIG_OK)
@@ -255,7 +255,7 @@ void RigDaemon::rigUpdate()
             //* Band Up
             if (rigCmd.bandUp)
             {
-                if (my_rig->caps->vfo_ops == RIG_OP_BAND_UP)
+                if (my_rig->caps->vfo_ops & RIG_OP_BAND_UP)
                 {
                     retcode = rig_vfo_op(my_rig, RIG_VFO_CURR, RIG_OP_BAND_UP);
                     if (retcode == RIG_OK)
@@ -270,7 +270,7 @@ void RigDaemon::rigUpdate()
             //* Band Down
             if (rigCmd.bandDown)
             {
-                if (my_rig->caps->vfo_ops == RIG_OP_BAND_DOWN)
+                if (my_rig->caps->vfo_ops & RIG_OP_BAND_DOWN)
                 {
                     retcode = rig_vfo_op(my_rig, RIG_VFO_CURR, RIG_OP_BAND_DOWN);
                     if (retcode == RIG_OK)
@@ -290,7 +290,7 @@ void RigDaemon::rigUpdate()
             }
 
             //* Tune
-            if (rigCmd.tune)
+            if (rigCmd.tune && (my_rig->caps->vfo_ops & RIG_OP_TUNE))
             {
                 rig_vfo_op(my_rig, RIG_VFO_CURR, RIG_OP_TUNE);
                 rigCmd.tune = 0;
@@ -500,7 +500,6 @@ void RigDaemon::rigUpdate()
             rig_get_split_vfo(my_rig, RIG_VFO_CURR, &rigGet.split, &rigGet.vfoTx);            
 
             rig_get_vfo(my_rig, &rigGet.vfoMain);
-            qDebug() << "get - " << "Main:" << rigGet.vfoMain << "Sub:" << rigGet.vfoSub << "Tx:" << rigGet.vfoTx << "Curr:" << RIG_VFO_CURR;
         }
 
         //* Tuner