[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 4df4820ad9e71b7131ee7b298cc4fe1caf982d81

[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  4df4820ad9e71b7131ee7b298cc4fe1caf982d81 (commit)
       via  20d5bc0b9ea20a7b69dc4d433c3e4112600e32c1 (commit)
      from  599974bceaea829ce07cfab6f6a8d29f5494d5c4 (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 4df4820ad9e71b7131ee7b298cc4fe1caf982d81
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Jan 21 06:45:50 2021 -0600

    Move Yaesu special_60m handling to cover any newcat_get_freq request
    get_freq with 60M freq will not attempt freq change on certain rigs as they have to use MEM mode to select 60m.  But RIG_OK will be returned.

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 385543b3..704908d6 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -745,6 +745,13 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     special_60m |= newcat_is_rig(rig, RIG_MODEL_FTDX5000);
     special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
 
+    if (special_60m && (freq >= 5300000 && freq <= 5410000))
+    {
+        rig_debug(RIG_DEBUG_TRACE, "%s: 60M VFO_MEM exception, no freq change done\n",
+                  __func__);
+        RETURNFUNC(RIG_OK); /* make it look like we changed */
+    }
+
     switch (vfo)
     {
     case RIG_VFO_A:
@@ -757,17 +764,6 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         c = 'B';
         break;
 
-    case RIG_VFO_MEM:
-        if (special_60m && (freq >= 5300000 && freq <= 5410000))
-        {
-            rig_debug(RIG_DEBUG_TRACE, "%s: 60M VFO_MEM exception, no freq change done\n",
-                      __func__);
-            RETURNFUNC(RIG_OK); /* make it look like we changed */
-        }
-
-        c = 'A';
-        break;
-
     default:
         RETURNFUNC(-RIG_ENIMPL);             /* Only VFO_A or VFO_B are valid */
     }

commit 20d5bc0b9ea20a7b69dc4d433c3e4112600e32c1
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Jan 21 06:37:26 2021 -0600

    Fix double ;; in FT450 exception handling
    Add FT450 to special 60m exceptions

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 5ee11f7d..385543b3 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -738,11 +738,12 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     }
 
     /* vfo should now be modified to a valid VFO constant. */
-    /* DX3000/DX5000 can only do VFO_MEM on 60M */
+    /* DX3000/DX5000/450 can only do VFO_MEM on 60M */
     /* So we will not change freq in that case */
     special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX3000);
     /* duplicate the following line to add more rigs */
     special_60m |= newcat_is_rig(rig, RIG_MODEL_FTDX5000);
+    special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
 
     switch (vfo)
     {
@@ -998,19 +999,19 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     {
         if (c == 'B')
         {
-            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VS1;F%c%0*"PRIll"%c;VS0;", c,
-                     priv->width_frequency, (int64_t)freq, cat_term);
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VS1;F%c%0*"PRIll";VS0;", c,
+                     priv->width_frequency, (int64_t)freq);
         }
         else
         {
-            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll"%c", c,
-                     priv->width_frequency, (int64_t)freq, cat_term);
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll";", c,
+                     priv->width_frequency, (int64_t)freq);
         }
     }
     else
     {
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll"%c", c,
-                 priv->width_frequency, (int64_t)freq, cat_term);
+        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll";", c,
+                 priv->width_frequency, (int64_t)freq);
     }
 
     rig_debug(RIG_DEBUG_TRACE, "%s:%d cmd_str = %s\n", __func__, __LINE__,
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 15615a35..1e2f87d4 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20210120"
+#define NEWCAT_VER "20210121"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129

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

Summary of changes:
 rigs/yaesu/newcat.c | 33 +++++++++++++++------------------
 rigs/yaesu/newcat.h |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)


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