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

[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  dd4e631e598084355e7d6ea9cd855d7af2370096 (commit)
       via  252a3ead630d6fecd312455ab8cd309db685f3c7 (commit)
      from  94410f7a7176586190386119ad90275fbc9e3005 (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 dd4e631e598084355e7d6ea9cd855d7af2370096
Merge: 94410f7a 252a3ead
Author: Michael Black <mdb...@ya...>
Date:   Wed May 12 16:42:46 2021 -0500

    Merge pull request #699 from mikaelnousiainen/fix-yaesu-targetable-roofing-filter
    
    Fix Yaesu roofing filter VFO targeting


commit 252a3ead630d6fecd312455ab8cd309db685f3c7
Author: Mikael Nousiainen <mik...@ik...>
Date:   Wed May 12 23:51:35 2021 +0300

    Add RIG_TARGETABLE_ROOFING to allow Yaesu roofing filter targeting by VFO only for FTDX5000 and FTDX101. Fix TS-480 VOXDELAY level definition.

diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index c148b433..68014eb9 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -503,6 +503,7 @@ typedef unsigned int vfo_t;
 #define RIG_TARGETABLE_MEM (1<<8)
 #define RIG_TARGETABLE_BANK (1<<9)
 #define RIG_TARGETABLE_ANT (1<<10)
+#define RIG_TARGETABLE_ROOFING (1<<11) // roofing filter targetable by VFO
 #define RIG_TARGETABLE_COMMON (RIG_TARGETABLE_RITXIT | RIG_TARGETABLE_PTT | RIG_TARGETABLE_MEM | RIG_TARGETABLE_BANK)
 #define RIG_TARGETABLE_ALL  0x7fffffff
 //! @endcond
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index a18237dc..112bce34 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -1382,7 +1382,7 @@ const struct rig_caps ts480_caps =
     .vfo_ops = TS480_VFO_OPS,
     .level_gran = {
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 3000 }, .step = { .i = 150 } },
+        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},
         [LVL_BKIN_DLYMS] = {.min = {.i = 0}, .max = {.i = 1000}, .step = {.i = 50}},
diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c
index 4baeecb3..eef1d3b0 100644
--- a/rigs/yaesu/ft5000.c
+++ b/rigs/yaesu/ft5000.c
@@ -126,7 +126,7 @@ const struct rig_caps ftdx5000_caps =
     .max_xit =            Hz(9999),
     .max_ifshift =        Hz(1000),
     .vfo_ops =            FTDX5000_VFO_OPS,
-    .targetable_vfo =     RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_ANT,
+    .targetable_vfo =     RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_ANT | RIG_TARGETABLE_ROOFING,
     .transceive =         RIG_TRN_OFF,        /* May enable later as the 5000 has an Auto Info command */
     .bank_qty =           0,
     .chan_desc_sz =       0,
diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c
index b7220ce0..a85dbbb7 100644
--- a/rigs/yaesu/ftdx101.c
+++ b/rigs/yaesu/ftdx101.c
@@ -113,7 +113,7 @@ const struct rig_caps ftdx101d_caps =
     .max_xit =            Hz(9999),
     .max_ifshift =        Hz(1200),
     .vfo_ops =            FTDX101_VFO_OPS,
-    .targetable_vfo =     RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_COMMON | RIG_TARGETABLE_ANT,
+    .targetable_vfo =     RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_COMMON | RIG_TARGETABLE_ANT | RIG_TARGETABLE_ROOFING,
     .transceive =         RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */
     .bank_qty =           0,
     .chan_desc_sz =       0,
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 8ed66d2d..32439aa9 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -7994,7 +7994,7 @@ static int set_roofing_filter(RIG *rig, vfo_t vfo, int index)
 
     roofing_filters = priv_caps->roofing_filters;
 
-    if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+    if (rig->caps->targetable_vfo & RIG_TARGETABLE_ROOFING)
     {
         main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
     }
@@ -8100,7 +8100,7 @@ static int get_roofing_filter(RIG *rig, vfo_t vfo,
 
     roofing_filters = priv_caps->roofing_filters;
 
-    if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+    if (rig->caps->targetable_vfo & RIG_TARGETABLE_ROOFING)
     {
         main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
     }

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

Summary of changes:
 include/hamlib/rig.h | 1 +
 rigs/kenwood/ts480.c | 2 +-
 rigs/yaesu/ft5000.c  | 2 +-
 rigs/yaesu/ftdx101.c | 2 +-
 rigs/yaesu/newcat.c  | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)


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