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

[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  5a9daf5f0e7fd416c5125e9336775d2936980f28 (commit)
       via  f81c9158a870fdb76f9d66f32b006d1a1d073b16 (commit)
      from  5fec08b26261259a14c75e032feea7304f0b8482 (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 5a9daf5f0e7fd416c5125e9336775d2936980f28
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Wed Jan 20 15:07:59 2021 -0600

    Fix ic703 and ic705 RIG_LEVEL_RFPOWER_METER_WATTS to scale to 10W instead of 100W

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 8d9739eb..014169bc 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -3111,8 +3111,15 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         }
         else
         {
+            float scale = 100;
+            if (rig->caps->rig_model == RIG_MODEL_IC705
+                    || rig->caps->rig_model == RIG_MODEL_IC703)
+            {
+                scale = 10;
+            }
             val->f =
-                rig_raw2val_float(icom_val, &rig->caps->rfpower_meter_cal) * 100;
+                rig_raw2val_float(icom_val, &rig->caps->rfpower_meter_cal) * scale;
+            }
         }
 
         break;
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 7d28b6e6..34e055a9 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210113"
+#define BACKEND_VER "20210120"
 
 /*
  * defines used by comp_cal_str in rig.c

commit f81c9158a870fdb76f9d66f32b006d1a1d073b16
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Wed Jan 20 15:06:14 2021 -0600

    Update newcat.h version

diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 7ee0befd..15615a35 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20210119"
+#define NEWCAT_VER "20210120"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129

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

Summary of changes:
 rigs/icom/icom.c    | 9 ++++++++-
 rigs/icom/icom.h    | 2 +-
 rigs/yaesu/newcat.h | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)


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