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

[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  1d8a010493528168e1ac2d033892ed547782e08f (commit)
       via  9c3a12c6f05f6673446533e4b6b0821173176c9c (commit)
       via  d8bd6a5d4ed5c8542cecb117653290ad30c32ffe (commit)
      from  92492c46275c8030b754b6253a3db2c124c967f1 (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 1d8a010493528168e1ac2d033892ed547782e08f
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Feb 5 17:40:10 2021 -0600

    Fix 2nd arg prompt for rigctl
    https://github.com/Hamlib/Hamlib/issues/447
    https://github.com/Hamlib/Hamlib/issues/339

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 4e00f968..2b39527b 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -995,16 +995,12 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             {
                 rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__);
 
-#if 0 // was printing Reply: twice
-
                 if (prompt)
                 {
                     rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__);
                     fprintf_flush(fout, "%s: ", cmd_entry->arg2);
                 }
 
-#endif
-
                 if (scanfc(fin, "%s", arg2) < 1)
                 {
                     rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#9?\n", __func__);

commit 9c3a12c6f05f6673446533e4b6b0821173176c9c
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Feb 5 17:33:59 2021 -0600

    Fix netrigctl.c parsing of CHKVFO response

diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index 4b507415..cd03aedd 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -215,7 +215,11 @@ static int netrigctl_open(RIG *rig)
     len = sprintf(cmd, "\\chk_vfo\n");
     ret = netrigctl_transaction(rig, cmd, len, buf);
 
-    if (ret == 2)
+    if (sscanf(buf,"CHKVFO %d", &priv->rigctld_vfo_mode)==1)
+    {
+        rig_debug(RIG_DEBUG_TRACE, "%s: chkvfo=%d\n", __func__, priv->rigctld_vfo_mode);
+    }
+    else if (ret == 2)
     {
         if (buf[0]) { sscanf(buf, "%d", &priv->rigctld_vfo_mode); }
     }
@@ -2284,7 +2288,7 @@ struct rig_caps netrigctl_caps =
     RIG_MODEL(RIG_MODEL_NETRIGCTL),
     .model_name =     "NET rigctl",
     .mfg_name =       "Hamlib",
-    .version =        "20210108.0",
+    .version =        "20210204.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_OTHER,

commit d8bd6a5d4ed5c8542cecb117653290ad30c32ffe
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Feb 4 23:47:59 2021 -0600

    Reduce debug level in network.c

diff --git a/src/network.c b/src/network.c
index 07741a5b..b5a81000 100644
--- a/src/network.c
+++ b/src/network.c
@@ -216,7 +216,7 @@ int network_open(hamlib_port_t *rp, int default_port)
 
     if (status == 0 && res->ai_family == AF_INET6)
     {
-        rig_debug(RIG_DEBUG_ERR, "%s: Using IPV6\n", __func__);
+        rig_debug(RIG_DEBUG_TRACE, "%s: Using IPV6\n", __func__);
         //inet_pton(AF_INET6, hoststr, &h_addr.sin6_addr);
     }
 

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

Summary of changes:
 rigs/dummy/netrigctl.c | 8 ++++++--
 src/network.c          | 2 +-
 tests/rigctl_parse.c   | 4 ----
 3 files changed, 7 insertions(+), 7 deletions(-)


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