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

[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  228cc10aeb3e24c244066f518629bd5b2e0ac0fe (commit)
       via  bd4c8c2e04d866230cb8b8fc977c8af171bd07ae (commit)
      from  b53eed7cd34ca5a2457fa5ae1029e54e913826a9 (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 228cc10aeb3e24c244066f518629bd5b2e0ac0fe
Author: root <ro...@lo...>
Date:   Wed Feb 3 06:13:12 2021 +0100

    Fix compile warnings with -O2 flag

diff --git a/src/rig.c b/src/rig.c
index 868bbcc7..27cd7640 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -303,7 +303,7 @@ const char *HAMLIB_API rigerror(int errnum)
     }
 
     static char msg[25000];
-    snprintf(msg, sizeof(msg), "%80s\n%15000s", rigerror_table[errnum], debugmsgsave);
+    snprintf(msg, sizeof(msg), "%.80s\n%.15000s", rigerror_table[errnum], debugmsgsave);
     return msg;
 }
 
@@ -1573,7 +1573,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
         if (retcode != RIG_OK)
         {
-            rig_debug(RIG_DEBUG_ERR, "%s: set_vfo err %s\n", __func__, rigerror(retcode));
+            rig_debug(RIG_DEBUG_ERR, "%s: set_vfo err %.10000s\n", __func__, rigerror(retcode));
             RETURNFUNC(retcode);
         }
 
@@ -2257,7 +2257,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
     }
     else
     {
-        rig_debug(RIG_DEBUG_ERR, "%s: set_vfo %s failed with '%s'\n", __func__,
+        rig_debug(RIG_DEBUG_ERR, "%s: set_vfo %s failed with '%.10000s'\n", __func__,
                   rig_strvfo(vfo), rigerror(retcode));
     }
 
@@ -2266,7 +2266,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
     if (retcode == RIG_OK && caps->get_freq)
     {
         retcode = caps->get_freq(rig, vfo, &curr_freq);
-        rig_debug(RIG_DEBUG_TRACE, "%s: retcode from rig_get_freq = %s\n", __func__,
+        rig_debug(RIG_DEBUG_TRACE, "%s: retcode from rig_get_freq = %.10000s\n", __func__,
                   rigerror(retcode));
     }
     else // don't expire cache if we just read it
@@ -2351,7 +2351,7 @@ int HAMLIB_API rig_get_vfo(RIG *rig, vfo_t *vfo)
 
     if (retcode != RIG_OK)
     {
-        rig_debug(RIG_DEBUG_ERR, "%s: returning %d(%s)\n", __func__, retcode,
+        rig_debug(RIG_DEBUG_ERR, "%s: returning %d(%.10000s)\n", __func__, retcode,
                   rigerror(retcode));
     }
 

commit bd4c8c2e04d866230cb8b8fc977c8af171bd07ae
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Feb 1 17:45:42 2021 -0600

    Add 0W reference for FTDX101D power meter
    https://github.com/Hamlib/Hamlib/issues/524

diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c
index 3871e810..3bb1eeaf 100644
--- a/rigs/yaesu/ftdx101.c
+++ b/rigs/yaesu/ftdx101.c
@@ -76,7 +76,7 @@ const struct rig_caps ftdx101d_caps =
     RIG_MODEL(RIG_MODEL_FTDX101D),
     .model_name =         "FTDX-101D",
     .mfg_name =           "Yaesu",
-    .version =            NEWCAT_VER ".8z",
+    .version =            NEWCAT_VER ".9",
     .copyright =          "LGPL",
     .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
diff --git a/rigs/yaesu/ftdx101.h b/rigs/yaesu/ftdx101.h
index 24713352..c13d2d03 100644
--- a/rigs/yaesu/ftdx101.h
+++ b/rigs/yaesu/ftdx101.h
@@ -74,8 +74,9 @@
 // Borrowed from FLRig -- Thanks to Dave W1HKJ
 #define FTDX101D_RFPOWER_METER_CAL \
     { \
-        5, \
+        6, \
         { \
+            {0, 0.0f}, \
             {35, 5.0f}, \
             {94, 25.0f}, \
             {147, 50.0f}, \

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

Summary of changes:
 rigs/yaesu/ftdx101.c |  2 +-
 rigs/yaesu/ftdx101.h |  3 ++-
 src/rig.c            | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)


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