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

[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  f43e190e0739f142c70d700c00d2c80503b06ce7 (commit)
      from  b263ea1697ec6af19ffae763ec38797555ef72f3 (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 f43e190e0739f142c70d700c00d2c80503b06ce7
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Dec 17 23:57:25 2020 -0600

    Fix SH command for FT-450
    Comment out on/off flag for future possibilities
    CAT manual doesn't match what rig is returning...7 bytes vs 6 in the manual
    https://github.com/Hamlib/Hamlib/issues/469

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index c2515a76..858b4039 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -7675,8 +7675,14 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
         if (strlen(priv->ret_data) == 7)
         {
             int on;
-            int n = sscanf(priv->ret_data, "SH0%1d%3d", &on, &w);
+            // do we need to pay attention to the Main/Sub here?
+            int n = sscanf(priv->ret_data, "SH%*1d%1d%3d", &on, &w);
+            if (n != 2)
+            {
+                err = -RIG_EPROTO;
+            }
 
+#if 0 // this may apply to another Yaesu rig
             if (n == 2)
             {
                 if (!on) { w = 0; }
@@ -7685,6 +7691,7 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
             {
                 err = -RIG_EPROTO;
             }
+#endif
         }
         else if (strlen(priv->ret_data) == 6)
         {
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index bf7b1dcd..faa00a1b 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20201216"
+#define NEWCAT_VER "20201217"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129

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

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


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