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

[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  afc6ee76fea6c90d34e826a3e8ee738bebe2627f (commit)
       via  dfef8770cd65386496f9ec8ed51d8eaf863be28a (commit)
       via  1fa84652f4bf27376d8ed3cff6bc203da8b357d8 (commit)
       via  055ac839c0b6b4c41148ed86a94c3e202cd3c021 (commit)
      from  b6a960d48e12035a94530ad56ceff469849491fd (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 afc6ee76fea6c90d34e826a3e8ee738bebe2627f
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Jun 23 12:01:29 2020 -0500

    Fix flrig.c compile warning

diff --git a/dummy/flrig.c b/dummy/flrig.c
index 49af67f9..03f89383 100644
--- a/dummy/flrig.c
+++ b/dummy/flrig.c
@@ -442,8 +442,8 @@ static int read_transaction(RIG *rig, char *xml, int xml_len)
         else
         {
             rig_debug(RIG_DEBUG_ERR,
-                      "%s: xml buffer overflow!!\nTrying to add len=%d\n%sTo len=%d\n%s", __func__,
-                      (int)strlen(tmp_buf), tmp_buf, (int)strlen(xml), xml);
+                      "%s: xml buffer overflow!!\nTrying to add len=%d\nTo len=%d\n", __func__,
+                      (int)strlen(tmp_buf), (int)strlen(xml));
             return -RIG_EPROTO;
         }
     }

commit dfef8770cd65386496f9ec8ed51d8eaf863be28a
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Jun 23 11:21:22 2020 -0500

    Move chk_vfo_executed so it will work without readline support
    https://github.com/Hamlib/Hamlib/issues/326

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 56f8d18e..a4e9d084 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -94,9 +94,10 @@ extern int read_history();
 #define ARG_IN  (ARG_IN1|ARG_IN2|ARG_IN3|ARG_IN4)
 #define ARG_OUT (ARG_OUT1|ARG_OUT2|ARG_OUT3|ARG_OUT4)
 
+static int chk_vfo_executed;
+
 /* variables for readline support */
 #ifdef HAVE_LIBREADLINE
-static int chk_vfo_executed;
 static char *input_line = (char *)NULL;
 static char *result = (char *)NULL;
 static char *parsed_input[sizeof(char *) * 5];

commit 1fa84652f4bf27376d8ed3cff6bc203da8b357d8
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Jun 23 11:12:15 2020 -0500

    Fix compatibility between 3.3 rigctl and 4.0 rigctld
    https://github.com/Hamlib/Hamlib/issues/326

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 5d8c8f89..56f8d18e 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -96,6 +96,7 @@ extern int read_history();
 
 /* variables for readline support */
 #ifdef HAVE_LIBREADLINE
+static int chk_vfo_executed;
 static char *input_line = (char *)NULL;
 static char *result = (char *)NULL;
 static char *parsed_input[sizeof(char *) * 5];
@@ -4081,9 +4082,12 @@ declare_proto_rig(dump_state)
     // protocol 1 allows fields can be listed/processed in any order
     // protocol 1 fields can be multi-line -- just write the thing to allow for it
     // backward compatible as new values will just generate warnings
-    fprintf(fout, "vfo_ops=0x%x\n", rig->caps->vfo_ops);
-    fprintf(fout, "ptt_type=0x%x\n", rig->state.pttport.type.ptt);
-    fprintf(fout, "done\n");
+    if (chk_vfo_executed) // for 3.3 compatiblility
+    {
+       fprintf(fout, "vfo_ops=0x%x\n", rig->caps->vfo_ops);
+       fprintf(fout, "ptt_type=0x%x\n", rig->state.pttport.type.ptt);
+       fprintf(fout, "done\n");
+    }
 
 #if 0 // why isn't this implemented?  Does anybody care?
     gran_t level_gran[RIG_SETTING_MAX];   /*!< level granularity */
@@ -4520,6 +4524,8 @@ declare_proto_rig(chk_vfo)
 
     fprintf(fout, "%d\n", rig->state.vfo_opt);
 
+    chk_vfo_executed = 1; // this allows us to control dump_state version
+
     return RIG_OK;
 }
 

commit 055ac839c0b6b4c41148ed86a94c3e202cd3c021
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Jun 23 10:14:10 2020 -0500

    Add debug to rigctl_parse.c to show full command
    https://github.com/Hamlib/Hamlib/issues/326

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 36e4fe99..5d8c8f89 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -730,6 +730,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
 
                     *pcmd = '\0';
                     cmd = parse_arg((char *)cmd_name);
+                    rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, cmd_name);
                     break;
                 }
 

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

Summary of changes:
 dummy/flrig.c        |  4 ++--
 tests/rigctl_parse.c | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)


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