[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. v4.0rc1-58-g31115b6a

[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  31115b6a161fe147f8f70e6528051aaf1d82e6cb (commit)
       via  119f5e6eb98902177cbfdd5db9967cb1c309a644 (commit)
      from  298a1be19acbce66681597703430e77432c874d6 (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 31115b6a161fe147f8f70e6528051aaf1d82e6cb
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Jul 24 14:23:38 2020 -0500

    deprecate itu_region

diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c
index b51a62c1..5ce28495 100644
--- a/dummy/netrigctl.c
+++ b/dummy/netrigctl.c
@@ -234,7 +234,7 @@ static int netrigctl_open(RIG *rig)
         return (ret < 0) ? ret : -RIG_EPROTO;
     }
 
-    rs->itu_region = atoi(buf);
+    rs->deprecated_itu_region = atoi(buf);
 
     for (i = 0; i < FRQRANGESIZ; i++)
     {
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index e919aa88..b382f9d1 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -1970,7 +1970,7 @@ struct rig_state {
 
     double vfo_comp;        /*!< VFO compensation in PPM, 0.0 to disable */
 
-    int itu_region;         /*!< ITU region to select among freq_range_t */
+    int deprecated_itu_region;         /*!< ITU region to select among freq_range_t */
     freq_range_t rx_range_list[FRQRANGESIZ];    /*!< Receive frequency range list */
     freq_range_t tx_range_list[FRQRANGESIZ];    /*!< Transmit frequency range list */
 

commit 119f5e6eb98902177cbfdd5db9967cb1c309a644
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Jul 24 12:57:33 2020 -0500

    Remove itu_region from rigctl_paparse.c and replace with constant 0 -- it's not used at all by any rig

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 708205a4..ce37d0a5 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -4004,7 +4004,11 @@ declare_proto_rig(dump_state)
 #define RIGCTLD_PROT_VER 1
     fprintf(fout, "%d\n", RIGCTLD_PROT_VER);
     fprintf(fout, "%d\n", rig->caps->rig_model);
+#if 0 // deprecated -- not one rig uses this
     fprintf(fout, "%d\n", rs->itu_region);
+#else  // need to print something to maintain backward compatbility
+    fprintf(fout, "%d\n", 0);
+#endif
 
     for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->rx_range_list[i]); i++)
     {

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

Summary of changes:
 dummy/netrigctl.c    | 2 +-
 include/hamlib/rig.h | 2 +-
 tests/rigctl_parse.c | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)


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