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

[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  b7c3aa3ad19fe6cd7cc53738a43f56b853806a1e (commit)
       via  9d542cab81f71736a7ef5a38380d8b43d2426a51 (commit)
      from  1b6d67a2789af596396ad7541793f1830d9b6684 (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 b7c3aa3ad19fe6cd7cc53738a43f56b853806a1e
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Sep 7 08:17:20 2020 -0500

    Fix range_list for ic7300

diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 0707b948..71b36604 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -325,16 +325,16 @@ const struct rig_caps ic7300_caps =
     },
 
     .rx_range_list1 =   { 
-        {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, 
-        {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END 
+        {kHz(30), MHz(199.999999), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, 
+        {MHz(400), MHz(470), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END 
         },
     .tx_range_list1 =   {
-        FRQ_RNG_HF(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
-        FRQ_RNG_60m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
-        FRQ_RNG_6m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
-        FRQ_RNG_4m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
-        FRQ_RNG_2m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
-        FRQ_RNG_70cm(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+        FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+        FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+        FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+        FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+        FRQ_RNG_2m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+        FRQ_RNG_70cm(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
         FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
         FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
         FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */

commit 9d542cab81f71736a7ef5a38380d8b43d2426a51
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sun Sep 6 23:52:48 2020 -0500

    Fix 32-bit overflow on rigctl reading rigctld caps values like get_level and set_level
    https://github.com/Hamlib/Hamlib/issues/365

diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c
index 5ce28495..3507e364 100644
--- a/dummy/netrigctl.c
+++ b/dummy/netrigctl.c
@@ -432,7 +432,7 @@ static int netrigctl_open(RIG *rig)
         return (ret < 0) ? ret : -RIG_EPROTO;
     }
 
-    rs->has_get_func = strtol(buf, NULL, 0);
+    rs->has_get_func = strtoll(buf, NULL, 0);
 
     ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
 
@@ -441,7 +441,7 @@ static int netrigctl_open(RIG *rig)
         return (ret < 0) ? ret : -RIG_EPROTO;
     }
 
-    rs->has_set_func = strtol(buf, NULL, 0);
+    rs->has_set_func = strtoll(buf, NULL, 0);
 
     ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
 
@@ -450,7 +450,7 @@ static int netrigctl_open(RIG *rig)
         return (ret < 0) ? ret : -RIG_EPROTO;
     }
 
-    rs->has_get_level = strtol(buf, NULL, 0);
+    rs->has_get_level = strtoll(buf, NULL, 0);
 
     if (rs->has_get_level & RIG_LEVEL_RAWSTR)
     {
@@ -467,7 +467,7 @@ static int netrigctl_open(RIG *rig)
         return (ret < 0) ? ret : -RIG_EPROTO;
     }
 
-    rs->has_set_level = strtol(buf, NULL, 0);
+    rs->has_set_level = strtoll(buf, NULL, 0);
 
     ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
 
@@ -476,7 +476,7 @@ static int netrigctl_open(RIG *rig)
         return (ret < 0) ? ret : -RIG_EPROTO;
     }
 
-    rs->has_get_parm = strtol(buf, NULL, 0);
+    rs->has_get_parm = strtoll(buf, NULL, 0);
 
     ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
 
@@ -485,7 +485,7 @@ static int netrigctl_open(RIG *rig)
         return (ret < 0) ? ret : -RIG_EPROTO;
     }
 
-    rs->has_set_parm = strtol(buf, NULL, 0);
+    rs->has_set_parm = strtoll(buf, NULL, 0);
 
 #if 0
     gran_t level_gran[RIG_SETTING_MAX];   /*!< level granularity */
@@ -526,7 +526,7 @@ static int netrigctl_open(RIG *rig)
         {
             if (strcmp(setting, "vfo_ops") == 0)
             {
-                rig->caps->vfo_ops = strtol(value, NULL, 0);
+                rig->caps->vfo_ops = strtoll(value, NULL, 0);
                 rig_debug(RIG_DEBUG_TRACE, "%s: %s set to %d\n", __func__, setting,
                           rig->caps->vfo_ops);
             }

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

Summary of changes:
 dummy/netrigctl.c  | 14 +++++++-------
 rigs/icom/ic7300.c | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)


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