[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 8407fcf6c1c792cf1d35f46a717d11d44036dea3

[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  8407fcf6c1c792cf1d35f46a717d11d44036dea3 (commit)
       via  2d975feb6240c0b0e28c8b3d6d08c2ff9584f053 (commit)
      from  803a8d9e5e3f153cee47cb713ee411cee2d032bb (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 8407fcf6c1c792cf1d35f46a717d11d44036dea3
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Wed Mar 10 14:35:38 2021 -0600

    FT1000MP set_vfo updates internal state
    https://github.com/Hamlib/Hamlib/issues/597

diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 59c53c67..1809eacf 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -1128,6 +1128,9 @@ int ft1000mp_set_vfo(RIG *rig, vfo_t vfo)
     ft1000mp_send_priv_cmd(rig, cmd_index);
 #endif
 
+    // we just store the requested vfo in our internal state
+    rig->state.current_vfo = vfo;
+
     RETURNFUNC(RIG_OK);
 
 }

commit 2d975feb6240c0b0e28c8b3d6d08c2ff9584f053
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Wed Mar 10 14:33:19 2021 -0600

    Default FT1000MP rigs to VFOA as we are just emulating VFOs
    https://github.com/Hamlib/Hamlib/issues/597

diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index a6f091a6..59c53c67 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -222,7 +222,7 @@ const struct rig_caps ft1000mp_caps =
     RIG_MODEL(RIG_MODEL_FT1000MP),
     .model_name =         "FT-1000MP",
     .mfg_name =           "Yaesu",
-    .version =            "20210225.0",
+    .version =            "20210310.0",
     .copyright =          "LGPL",
     .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
@@ -356,7 +356,7 @@ const struct rig_caps ft1000mpmkv_caps =
     RIG_MODEL(RIG_MODEL_FT1000MPMKV),
     .model_name =         "MARK-V FT-1000MP",
     .mfg_name =           "Yaesu",
-    .version =            "20210225.0",
+    .version =            "20210310.0",
     .copyright =          "LGPL",
     .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
@@ -490,7 +490,7 @@ const struct rig_caps ft1000mpmkvfld_caps =
     RIG_MODEL(RIG_MODEL_FT1000MPMKVFLD),
     .model_name =         "MARK-V Field FT-1000MP",
     .mfg_name =           "Yaesu",
-    .version =            "20210225.0",
+    .version =            "20210310.0",
     .copyright =          "LGPL",
     .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
@@ -1164,6 +1164,10 @@ int ft1000mp_get_vfo(RIG *rig, vfo_t *vfo)
     else // we are emulating vfo status
     {
         *vfo = rig->state.current_vfo;
+        if (*vfo == RIG_VFO_CURR) {
+            rig_debug(RIG_DEBUG_TRACE, "%s: no get_vfo, defaulting to VFOA\n", __func__);
+            *vfo = RIG_VFO_A;
+        }
     }
 
 #if 0

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

Summary of changes:
 rigs/yaesu/ft1000mp.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)


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