[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 09474b17fb4b73fe1d4043a696c19ec555724dee

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  09474b17fb4b73fe1d4043a696c19ec555724dee (commit)
      from  3b84802846701d080bc35024c11a6b931ceaed4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 09474b17fb4b73fe1d4043a696c19ec555724dee
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Mar 22 16:04:55 2021 -0500

    Reset x25cmdfails when satmode is changed

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 029a86ca..06d399e5 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -5252,6 +5252,7 @@ int icom_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
     if (rig->caps->has_get_func & RIG_FUNC_SATMODE)
     {
         rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode);
+        priv->x25cmdfails = satmode; // reset this so it tries again
     }
 
     rig->state.cache.satmode = satmode;
@@ -5625,7 +5626,7 @@ int icom_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
             fct_sc = S_MEM_SATMODE;
         }
 
-        priv->x25cmdfails = 0; // we reset this to try it again
+        priv->x25cmdfails = status; // we reset this to current status -- fails in SATMODE
         priv->x1cx03cmdfails = 0; // we reset this to try it again
         rig->state.cache.satmode = status;
 
@@ -5835,7 +5836,6 @@ int icom_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
             fct_cn = C_CTL_FUNC;
             fct_sc = S_MEM_SATMODE;
         }
-
         break;
 
 
@@ -5867,6 +5867,14 @@ int icom_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
     else
     {
         *status = ackbuf[2] == 2 ? 1 : 0;
+        if (func == RIG_FUNC_SATMODE)
+        {
+            struct rig_state *rs = &rig->state;
+            //struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
+            struct icom_priv_data *priv = rs->priv;
+            // we'll reset this based on current status
+            priv->x25cmdfails = *status;
+        }
     }
 
     RETURNFUNC(RIG_OK);

-----------------------------------------------------------------------

Summary of changes:
 rigs/icom/icom.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries