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

[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  dd2f0f380eb1207352b07803db16a0d59f4bbdc5 (commit)
       via  0ec349de49ded733d4c40127a4a7797f7e58084d (commit)
       via  79a7a915fba792642e7d83759617c62e5a649030 (commit)
       via  d0a12e5391e539b4fcc3de39ef5d9960fbdd9f89 (commit)
      from  fe4bf9add854ab9b1d1afb3c5f277e6c6addd3d6 (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 dd2f0f380eb1207352b07803db16a0d59f4bbdc5
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Thu May 6 12:21:48 2021 -0500

    Fix bad variable in ts890.c

diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index cf91236d..4248604e 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -124,7 +124,7 @@ int kenwood_ts890_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             return retval;
         }
 
-        sscanf(lvlbuf + 3, "%d", &levelint);
+        sscanf(ackbuf + 3, "%d", &levelint);
         val->i = levelint * 3 / 2;               /* 150ms units converted to 100ms units */
         return RIG_OK;
 

commit 0ec349de49ded733d4c40127a4a7797f7e58084d
Merge: 79a7a915 d0a12e53
Author: Michael Black <mdb...@ya...>
Date:   Thu May 6 12:15:05 2021 -0500

    Merge pull request #692 from mikaelnousiainen/fix-kenwood-vox-delay
    
    Fix Kenwood VOX delay unit


commit 79a7a915fba792642e7d83759617c62e5a649030
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Thu May 6 12:14:17 2021 -0500

    Fix TS890 vox delay level

diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index 093c7c37..cf91236d 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -116,6 +116,18 @@ int kenwood_ts890_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
     switch (level)
     {
+    case RIG_LEVEL_VOXDELAY:
+        retval = kenwood_safe_transaction(rig, "VD0", ackbuf, sizeof(ackbuf), 6);
+
+        if (retval != RIG_OK)
+        {   
+            return retval;
+        }
+
+        sscanf(lvlbuf + 3, "%d", &levelint);
+        val->i = levelint * 3 / 2;               /* 150ms units converted to 100ms units */
+        return RIG_OK;
+
     case RIG_LEVEL_RF:
         retval = kenwood_transaction(rig, "RG", ackbuf, sizeof(ackbuf));
 
@@ -228,7 +240,7 @@ const struct rig_caps ts890s_caps =
     RIG_MODEL(RIG_MODEL_TS890S),
     .model_name = "TS-890S",
     .mfg_name = "Kenwood",
-    .version = BACKEND_VER ".0",
+    .version = BACKEND_VER ".1",
     .copyright = "LGPL",
     .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,

commit d0a12e5391e539b4fcc3de39ef5d9960fbdd9f89
Author: Mikael Nousiainen <mik...@ik...>
Date:   Thu May 6 18:24:02 2021 +0300

    Hamlib VOX delay unit is 1/10th of a second

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index a6dcc95e..2fc0c3d2 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -2914,12 +2914,13 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
         break;
 
     case RIG_LEVEL_VOXDELAY:
-        if (val.i > 3000 || val.i < 0)
+        if (val.i > 30 || val.i < 0)
         {
             RETURNFUNC(-RIG_EINVAL);
         }
 
-        snprintf(levelbuf, sizeof(levelbuf), "VD%04d", val.i);
+        // Raw value is in milliseconds
+        snprintf(levelbuf, sizeof(levelbuf), "VD%04d", val.i * 100);
         break;
 
     case RIG_LEVEL_VOXGAIN:

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

Summary of changes:
 rigs/kenwood/kenwood.c |  5 +++--
 rigs/kenwood/ts890s.c  | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)


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