[Hamlib-commits] Hamlib -- Ham radio control libraries branch Hamlib-4.0 updated. 89b290f946062e878b9f249f4205c73d7a6c6707

[Nate B. <n0...@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, Hamlib-4.0 has been updated
       via  89b290f946062e878b9f249f4205c73d7a6c6707 (commit)
       via  e92ce18a7b654279ca625a09be6830bc24148b30 (commit)
       via  a5ff863702865023dc6070d785fc75028fe6865d (commit)
       via  93eb0fe1dbe5067f58ee08a4698c4b041826eec8 (commit)
       via  7e4b0882fbb28cd11baa9eb1c0ca3d08b422c1ea (commit)
       via  15939de0018eb601e88c85a0cf662a141aae84b3 (commit)
       via  31fb3e96d4c8473b2de26af35d42bf3fb70430bf (commit)
       via  a1fbfafbdd5d39304d65b89be56a6a18306e1ff8 (commit)
       via  0f0f71eb4fb777f8d29d340da6193b7925c7fc8b (commit)
       via  f7c24262e97b6b49cf460c4ae623500075a526b7 (commit)
       via  a690a40ababf413522366c01019eccab07bda1ac (commit)
       via  06f89c7bb7e754eb0996e66ee101bc871eb559ab (commit)
       via  5a8e11ae9d45895a1356ee1029b6f9bb585e2479 (commit)
       via  db8dc5d345164463bef5123c7b76a987d79c621e (commit)
       via  94f90cb6c79c9c9c3ab3db3208e7df3205890da3 (commit)
       via  789855f4abc9240fb5f38a765e9f1160e15d703e (commit)
       via  4674a7228471c73344fe5cfda84b98155737bb2d (commit)
       via  61e4b4db5448aece25ec28ca74ad53c56e4b6904 (commit)
       via  6570916bb143669fc5c7ee8d956736a00b4ab211 (commit)
       via  e83fac63d68c9580bff4d6472218881af76dfb4a (commit)
       via  ad1d5f0b77eaff781837444ee5f5e65553d156b0 (commit)
       via  b2598a386a1b7656bcb2ab4a19e4b486d88b4786 (commit)
       via  2563f7cadc96fcba80cd3cfb4115585a1f8312d6 (commit)
       via  862db049f1eef6e3cf2d2a6cdc071788cffb8b40 (commit)
       via  efed1ae303ace29475859852b3523708e20aac35 (commit)
       via  21d8d4a8f71693ecd7b682d812c5b0717c60764e (commit)
       via  7e34c6fba1b31c44372f70df06f6fbdbbc298c4b (commit)
      from  b1a5fc3a2ca2a6e0b7d60ecba318da39ff951f3c (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 89b290f946062e878b9f249f4205c73d7a6c6707
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 26 23:10:29 2020 -0500

    Update newcat version
    https://github.com/Hamlib/Hamlib/issues/385
    
    (cherry picked from commit 37cff7ffc1e270e8214f5565082d7e830c7879bc)

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

commit e92ce18a7b654279ca625a09be6830bc24148b30
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 26 22:34:02 2020 -0500

    Add comment to is_read_cmd newcat.c and remove redundant check
    https://github.com/Hamlib/Hamlib/issues/385
    
    (cherry picked from commit 359f7549dca6396732a4afa56a2b81c92c5b3e5a)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index ce813933..e275c99a 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -6484,6 +6484,7 @@ int newcat_get_cmd(RIG *rig)
         // we drop through and do the real IF command
     }
 
+    // any command that is read only should not expire cache
     is_read_cmd = 
            strcmp(priv->cmd_str,"AG0;")==0
         || strcmp(priv->cmd_str,"AG1;")==0
@@ -6533,8 +6534,7 @@ int newcat_get_cmd(RIG *rig)
         || strcmp(priv->cmd_str,"SQ0;")==0
         || strcmp(priv->cmd_str,"SQ1;")==0
         || strcmp(priv->cmd_str,"VT0;")==0
-        || strcmp(priv->cmd_str,"VT1;")==0
-        || strcmp(priv->cmd_str,"SQ1;")==0;
+        || strcmp(priv->cmd_str,"VT1;")==0;
 
     if (priv->cmd_str[2] !=
             ';' && !is_read_cmd) // then we must be setting something so we'll invalidate the cache

commit a5ff863702865023dc6070d785fc75028fe6865d
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 26 17:45:45 2020 -0500

    Allow yaesu 3+char read cmds to not invalidate the IF cache
    https://github.com/Hamlib/Hamlib/issues/385
    
    (cherry picked from commit 60201aab40a9e3d59e8347fbef8a5679248b7c6f)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 21b98e8a..ce813933 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -889,7 +889,7 @@ int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 }
 
 /*
- * rig_set_vfo
+ * newcat_set_vfo
  *
  * set vfo and store requested vfo for later RIG_VFO_CURR
  * requests.
@@ -3779,7 +3779,12 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         }
 
         snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CT0%c", cat_term);
-        priv->cmd_str[2] = main_sub_vfo;
+
+        if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+        {
+            priv->cmd_str[2] = main_sub_vfo;
+        }
+
         break;
 
     case RIG_FUNC_TSQL:
@@ -3789,7 +3794,12 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         }
 
         snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CT0%c", cat_term);
-        priv->cmd_str[2] = main_sub_vfo;
+
+        if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+        {
+            priv->cmd_str[2] = main_sub_vfo;
+        }
+
         break;
 
     case RIG_FUNC_LOCK:
@@ -3817,7 +3827,12 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         }
 
         snprintf(priv->cmd_str, sizeof(priv->cmd_str), "NB0%c", cat_term);
-        priv->cmd_str[2] = main_sub_vfo;
+
+        if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+        {
+            priv->cmd_str[2] = main_sub_vfo;
+        }
+
         break;
 
     case RIG_FUNC_NR:
@@ -3827,7 +3842,12 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         }
 
         snprintf(priv->cmd_str, sizeof(priv->cmd_str), "NR0%c", cat_term);
-        priv->cmd_str[2] = main_sub_vfo;
+
+        if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+        {
+            priv->cmd_str[2] = main_sub_vfo;
+        }
+
         break;
 
     case RIG_FUNC_COMP:
@@ -6442,6 +6462,7 @@ int newcat_get_cmd(RIG *rig)
     struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
     int retry_count = 0;
     int rc = -RIG_EPROTO;
+    int is_read_cmd = 0;
 
     // try to cache rapid repeats of the IF command
     // this is for WSJT-X/JTDX sequence of v/f/m/t
@@ -6463,8 +6484,60 @@ int newcat_get_cmd(RIG *rig)
         // we drop through and do the real IF command
     }
 
+    is_read_cmd = 
+           strcmp(priv->cmd_str,"AG0;")==0
+        || strcmp(priv->cmd_str,"AG1;")==0
+        || strcmp(priv->cmd_str,"AN0;")==0
+        || strcmp(priv->cmd_str,"AN1;")==0
+        || strcmp(priv->cmd_str,"BP00;")==0
+        || strcmp(priv->cmd_str,"BP01;")==0
+        || strcmp(priv->cmd_str,"BP10;")==0
+        || strcmp(priv->cmd_str,"BP11;")==0
+        || strcmp(priv->cmd_str,"CN00;")==0
+        || strcmp(priv->cmd_str,"CN10;")==0
+        || strcmp(priv->cmd_str,"CO00;")==0
+        || strcmp(priv->cmd_str,"CO01;")==0
+        || strcmp(priv->cmd_str,"CO02;")==0
+        || strcmp(priv->cmd_str,"CO03;")==0
+        || strcmp(priv->cmd_str,"CO10;")==0
+        || strcmp(priv->cmd_str,"CO11;")==0
+        || strcmp(priv->cmd_str,"CO12;")==0
+        || strcmp(priv->cmd_str,"CO13;")==0
+        || strcmp(priv->cmd_str,"IS1;")==0
+        || strcmp(priv->cmd_str,"IS0;")==0
+        || strcmp(priv->cmd_str,"IS1;")==0
+        || strcmp(priv->cmd_str,"MD0;")==0
+        || strcmp(priv->cmd_str,"MD1;")==0
+        || strcmp(priv->cmd_str,"NA0;")==0
+        || strcmp(priv->cmd_str,"NA1;")==0
+        || strcmp(priv->cmd_str,"NB0;")==0
+        || strcmp(priv->cmd_str,"NB1;")==0
+        || strcmp(priv->cmd_str,"NL0;")==0
+        || strcmp(priv->cmd_str,"NL1;")==0
+        || strcmp(priv->cmd_str,"NR0;")==0
+        || strcmp(priv->cmd_str,"NR1;")==0
+        || strcmp(priv->cmd_str,"OS0;")==0
+        || strcmp(priv->cmd_str,"OS1;")==0
+        || strcmp(priv->cmd_str,"PA0;")==0
+        || strcmp(priv->cmd_str,"PA1;")==0
+        || strcmp(priv->cmd_str,"RA0;")==0
+        || strcmp(priv->cmd_str,"RA1;")==0
+        || strcmp(priv->cmd_str,"RF0;")==0
+        || strcmp(priv->cmd_str,"RF1;")==0
+        || strcmp(priv->cmd_str,"RL0;")==0
+        || strcmp(priv->cmd_str,"RL1;")==0
+        || strcmp(priv->cmd_str,"RM0;")==0
+        || strcmp(priv->cmd_str,"RM1;")==0
+        || strcmp(priv->cmd_str,"SM0;")==0
+        || strcmp(priv->cmd_str,"SM1;")==0
+        || strcmp(priv->cmd_str,"SQ0;")==0
+        || strcmp(priv->cmd_str,"SQ1;")==0
+        || strcmp(priv->cmd_str,"VT0;")==0
+        || strcmp(priv->cmd_str,"VT1;")==0
+        || strcmp(priv->cmd_str,"SQ1;")==0;
+
     if (priv->cmd_str[2] !=
-            ';') // then we must be setting something so we'll invalidate the cache
+            ';' && !is_read_cmd) // then we must be setting something so we'll invalidate the cache
     {
         rig_debug(RIG_DEBUG_TRACE, "%s: cache invalidated\n", __func__);
         priv->cache_start.tv_sec = 0;

commit 93eb0fe1dbe5067f58ee08a4698c4b041826eec8
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 19 16:09:44 2020 -0500

    Add suppress for AST broken bug in cppcheck
    
    (cherry picked from commit 7bee01f785d65dafae25d1dc1dd26e62d3bf89e7)

diff --git a/cppcheck.sh b/cppcheck.sh
index d5dfb598..bba1f980 100755
--- a/cppcheck.sh
+++ b/cppcheck.sh
@@ -55,6 +55,7 @@ CHECK="\
 -D DECLARE_INITRIG_BACKEND \
 -D DECLARE_INITRROT_BACKEND \
 -D DECLARE_INITAMP_BACKEND \
+-D B230400
 -U RIG_LEVEL_LINEOUT \
 -U O_ASYNC \
 -U F_SETSIG \
diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c
index b1445954..f7fe52fb 100644
--- a/rigs/aor/ar3030.c
+++ b/rigs/aor/ar3030.c
@@ -799,6 +799,7 @@ int ar3030_get_channel(RIG *rig, channel_t *chan, int read_only)
                   rig_passband_normal(rig, chan->mode);
 
 
+    // cppcheck-suppress *
     chan->levels[LVL_ATT].i = infobuf[6] == '0' ? 0 :
                               rig->caps->attenuator[infobuf[4] - '1'];
 
diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c
index a10a6a22..2a932479 100644
--- a/rigs/aor/ar7030.c
+++ b/rigs/aor/ar7030.c
@@ -809,6 +809,7 @@ const struct rig_caps ar7030_caps =
     .has_get_parm =  AR7030_PARM,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran =  {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index 4e16c58f..bcee8c3f 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -1675,6 +1675,7 @@ static int ar7030p_get_channel(RIG *rig, channel_t *chan, int read_only)
 
         if (RIG_OK == rc)
         {
+            // cppcheck-suppress *
             chan->levels[ LVL_SQL ].f = (float) v / 255.0;
         }
 
diff --git a/rigs/icmarine/icm700pro.c b/rigs/icmarine/icm700pro.c
index 9b1e843a..55b5f74f 100644
--- a/rigs/icmarine/icm700pro.c
+++ b/rigs/icmarine/icm700pro.c
@@ -83,6 +83,7 @@ const struct rig_caps icm700pro_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 8 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icmarine/icm710.c b/rigs/icmarine/icm710.c
index 53076a47..76e5f028 100644
--- a/rigs/icmarine/icm710.c
+++ b/rigs/icmarine/icm710.c
@@ -96,6 +96,7 @@ const struct rig_caps icm710_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 8 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icmarine/icm802.c b/rigs/icmarine/icm802.c
index b20a5e22..b39b5f10 100644
--- a/rigs/icmarine/icm802.c
+++ b/rigs/icmarine/icm802.c
@@ -84,6 +84,7 @@ const struct rig_caps icm802_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 8 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icmarine/icm803.c b/rigs/icmarine/icm803.c
index 989836e0..4daea784 100644
--- a/rigs/icmarine/icm803.c
+++ b/rigs/icmarine/icm803.c
@@ -84,6 +84,7 @@ const struct rig_caps icm803_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 8 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic2730.c b/rigs/icom/ic2730.c
index 82033d5f..dedf6d44 100644
--- a/rigs/icom/ic2730.c
+++ b/rigs/icom/ic2730.c
@@ -93,6 +93,7 @@ const struct rig_caps ic2730_caps =
     .has_get_parm =  IC2730_PARM_ALL,
     .has_set_parm =  IC2730_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c
index 874213c7..b2169943 100644
--- a/rigs/icom/ic7000.c
+++ b/rigs/icom/ic7000.c
@@ -183,6 +183,7 @@ const struct rig_caps ic7000_caps =
     .has_get_parm =  IC7000_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7000_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic703.c b/rigs/icom/ic703.c
index 95ff4a26..419bc17b 100644
--- a/rigs/icom/ic703.c
+++ b/rigs/icom/ic703.c
@@ -113,6 +113,7 @@ const struct rig_caps ic703_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE, /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic706.c b/rigs/icom/ic706.c
index f9a6f25d..95d3a400 100644
--- a/rigs/icom/ic706.c
+++ b/rigs/icom/ic706.c
@@ -477,6 +477,7 @@ const struct rig_caps ic706mkiig_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE, /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c
index 42dce0ee..1f303f53 100644
--- a/rigs/icom/ic7100.c
+++ b/rigs/icom/ic7100.c
@@ -220,6 +220,7 @@ const struct rig_caps ic7100_caps =
     .has_get_parm =  IC7100_PARM_ALL,
     .has_set_parm =  IC7100_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic718.c b/rigs/icom/ic718.c
index 5583694e..8d4b6692 100644
--- a/rigs/icom/ic718.c
+++ b/rigs/icom/ic718.c
@@ -105,6 +105,7 @@ const struct rig_caps ic718_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c
index c7703c8d..a0f56ad5 100644
--- a/rigs/icom/ic7200.c
+++ b/rigs/icom/ic7200.c
@@ -143,6 +143,7 @@ const struct rig_caps ic7200_caps =
     .has_get_parm =  IC7200_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7200_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index a7dc437d..4f059a0d 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -305,6 +305,7 @@ const struct rig_caps ic7300_caps =
     .has_get_parm =  IC7300_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7300_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = {.min = {.i = 0}, .max = {.i = 255}},
         [LVL_VOXDELAY] = {.min = {.i = 0}, .max = {.i = 20}, .step = {.i = 1}},
         [LVL_KEYSPD] = {.min = {.i = 6}, .max = {.i = 48}, .step = {.i = 1}},
diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c
index e922ee08..be194227 100644
--- a/rigs/icom/ic7410.c
+++ b/rigs/icom/ic7410.c
@@ -142,6 +142,7 @@ const struct rig_caps ic7410_caps =
     .has_get_parm =  IC7410_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7410_PARMS),    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c
index 1037e898..04be36ea 100644
--- a/rigs/icom/ic746.c
+++ b/rigs/icom/ic746.c
@@ -208,6 +208,7 @@ const struct rig_caps ic746_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_ANN,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c
index 4b682182..707e1d84 100644
--- a/rigs/icom/ic751.c
+++ b/rigs/icom/ic751.c
@@ -114,6 +114,7 @@ const struct rig_caps ic751_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran =  {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c
index 95ae2684..26d322d7 100644
--- a/rigs/icom/ic756.c
+++ b/rigs/icom/ic756.c
@@ -171,6 +171,7 @@ const struct rig_caps ic756_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE, /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c
index 28ddd476..dec54753 100644
--- a/rigs/icom/ic7600.c
+++ b/rigs/icom/ic7600.c
@@ -183,6 +183,7 @@ const struct rig_caps ic7600_caps =
     .has_get_parm =  IC7600_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7600_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c
index 8b0dcb1e..66670451 100644
--- a/rigs/icom/ic7610.c
+++ b/rigs/icom/ic7610.c
@@ -181,6 +181,7 @@ const struct rig_caps ic7610_caps =
     .has_get_parm =  IC7610_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7610_PARMS),    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c
index f8c9fa9d..03f4d5c6 100644
--- a/rigs/icom/ic7700.c
+++ b/rigs/icom/ic7700.c
@@ -166,6 +166,7 @@ const struct rig_caps ic7700_caps =
     .has_get_parm =  IC7700_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7700_PARMS),    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic78.c b/rigs/icom/ic78.c
index 1a079176..7a97a137 100644
--- a/rigs/icom/ic78.c
+++ b/rigs/icom/ic78.c
@@ -97,6 +97,7 @@ const struct rig_caps ic78_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE, /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c
index be9d82e3..e3ad8de4 100644
--- a/rigs/icom/ic7800.c
+++ b/rigs/icom/ic7800.c
@@ -169,6 +169,7 @@ const struct rig_caps ic7800_caps =
     .has_get_parm =  IC7800_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC7800_PARMS),    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c
index 70bf71c7..f100d238 100644
--- a/rigs/icom/ic785x.c
+++ b/rigs/icom/ic785x.c
@@ -175,6 +175,7 @@ const struct rig_caps ic785x_caps =
     .has_get_parm =  IC785x_PARMS,
     .has_set_parm =  RIG_PARM_SET(IC785x_PARMS),    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
diff --git a/rigs/icom/ic910.c b/rigs/icom/ic910.c
index b6caf4af..8156bbbe 100644
--- a/rigs/icom/ic910.c
+++ b/rigs/icom/ic910.c
@@ -488,6 +488,7 @@ const struct rig_caps ic910_caps =
     .has_get_parm =   RIG_PARM_NONE,
     .has_set_parm =   RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic9100.c b/rigs/icom/ic9100.c
index 3ab05461..ae74b355 100644
--- a/rigs/icom/ic9100.c
+++ b/rigs/icom/ic9100.c
@@ -138,6 +138,7 @@ const struct rig_caps ic9100_caps =
     .has_get_parm =  IC9100_PARM_ALL,
     .has_set_parm =  IC9100_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic92d.c b/rigs/icom/ic92d.c
index e000c0bd..f8355631 100644
--- a/rigs/icom/ic92d.c
+++ b/rigs/icom/ic92d.c
@@ -125,6 +125,7 @@ const struct rig_caps ic92d_caps =
     .has_get_parm =  IC92D_PARM_ALL,
     .has_set_parm =  IC92D_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icr10.c b/rigs/icom/icr10.c
index 83e228f1..be9cd16f 100644
--- a/rigs/icom/icr10.c
+++ b/rigs/icom/icr10.c
@@ -84,6 +84,7 @@ const struct rig_caps icr10_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE, /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icr20.c b/rigs/icom/icr20.c
index a35d1af3..b79fed5e 100644
--- a/rigs/icom/icr20.c
+++ b/rigs/icom/icr20.c
@@ -84,6 +84,7 @@ const struct rig_caps icr20_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE, /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icr30.c b/rigs/icom/icr30.c
index 6300b986..92f48677 100644
--- a/rigs/icom/icr30.c
+++ b/rigs/icom/icr30.c
@@ -158,6 +158,7 @@ const struct rig_caps icr30_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c
index 6403436e..60ba0e1d 100644
--- a/rigs/icom/icr6.c
+++ b/rigs/icom/icr6.c
@@ -85,6 +85,7 @@ const struct rig_caps icr6_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icr7000.c b/rigs/icom/icr7000.c
index dbc5ca8c..517b02b0 100644
--- a/rigs/icom/icr7000.c
+++ b/rigs/icom/icr7000.c
@@ -204,6 +204,7 @@ const struct rig_caps icr7100_caps =
     .has_get_parm =  ICR7100_PARMS,
     .has_set_parm =  RIG_PARM_SET(ICR7100_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c
index a813f557..2f509322 100644
--- a/rigs/icom/icr75.c
+++ b/rigs/icom/icr75.c
@@ -135,6 +135,7 @@ const struct rig_caps icr75_caps =
     .has_get_parm =  ICR75_PARM_ALL,
     .has_set_parm =  RIG_PARM_SET(ICR75_PARM_ALL),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_PBT_IN] = { .min = { .f = -1280 }, .max = { .f = +1280 }, .step = { .f = 15 } },
         [LVL_PBT_OUT] = { .min = { .f = -1280 }, .max = { .f = +1280 }, .step = { .f = 15 } },
diff --git a/rigs/icom/icr8500.c b/rigs/icom/icr8500.c
index 115bde8c..ae6d1abe 100644
--- a/rigs/icom/icr8500.c
+++ b/rigs/icom/icr8500.c
@@ -104,6 +104,7 @@ const struct rig_caps icr8500_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_IF] = { .min = { .i = 0 }, .max = { .i = 255 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/icr8600.c b/rigs/icom/icr8600.c
index a945cc22..be5368d4 100644
--- a/rigs/icom/icr8600.c
+++ b/rigs/icom/icr8600.c
@@ -137,6 +137,7 @@ const struct rig_caps icr8600_caps =
     .has_set_level = RIG_LEVEL_SET(ICR8600_LEVEL_ALL),
     .has_get_parm = ICR8600_PARM_ALL,
     .has_set_parm = RIG_PARM_SET(ICR8600_PARM_ALL),
+    // cppcheck-suppress *
     .level_gran = { [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } } },
     .parm_gran = { [PARM_TIME] = { .min = { .i = 0 }, .max = { .i = 86399} } },
     .ext_tokens = icr8600_tokens,
diff --git a/rigs/icom/icr9000.c b/rigs/icom/icr9000.c
index c8d7918b..b2aedba0 100644
--- a/rigs/icom/icr9000.c
+++ b/rigs/icom/icr9000.c
@@ -100,6 +100,7 @@ const struct rig_caps icr9000_caps =
     .has_get_parm =  ICR9000_PARMS,
     .has_set_parm =  RIG_PARM_SET(ICR9000_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c
index 2b56d301..74b42336 100644
--- a/rigs/icom/icr9500.c
+++ b/rigs/icom/icr9500.c
@@ -116,6 +116,7 @@ const struct rig_caps icr9500_caps =
     .has_get_parm =  ICR9500_PARMS,
     .has_set_parm =  RIG_PARM_SET(ICR9500_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/icrx7.c b/rigs/icom/icrx7.c
index 42d933f9..b5ba39d2 100644
--- a/rigs/icom/icrx7.c
+++ b/rigs/icom/icrx7.c
@@ -82,6 +82,7 @@ const struct rig_caps icrx7_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/id1.c b/rigs/icom/id1.c
index 4fef87e6..70dee3be 100644
--- a/rigs/icom/id1.c
+++ b/rigs/icom/id1.c
@@ -101,6 +101,7 @@ const struct rig_caps id1_caps =
     .has_get_parm =  ID1_PARM_ALL,
     .has_set_parm =  ID1_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/id31.c b/rigs/icom/id31.c
index 8da4fda4..46f97d9c 100644
--- a/rigs/icom/id31.c
+++ b/rigs/icom/id31.c
@@ -109,6 +109,7 @@ const struct rig_caps id31_caps =
     .has_get_parm =  ID31_PARM_ALL,
     .has_set_parm =  ID31_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .extparms = icom_ext_parms,
diff --git a/rigs/icom/id4100.c b/rigs/icom/id4100.c
index 72c300a7..df3e1d3d 100644
--- a/rigs/icom/id4100.c
+++ b/rigs/icom/id4100.c
@@ -113,6 +113,7 @@ const struct rig_caps id4100_caps =
     .has_get_parm =  ID4100_PARM_ALL,
     .has_set_parm =  ID4100_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .extparms = icom_ext_parms,
diff --git a/rigs/icom/id51.c b/rigs/icom/id51.c
index b871f51c..61289000 100644
--- a/rigs/icom/id51.c
+++ b/rigs/icom/id51.c
@@ -117,6 +117,7 @@ const struct rig_caps id51_caps =
     .has_get_parm =  ID51_PARM_ALL,
     .has_set_parm =  ID51_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .ext_tokens = id51_tokens,
diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c
index 822afe46..ba17b4ca 100644
--- a/rigs/icom/id5100.c
+++ b/rigs/icom/id5100.c
@@ -113,6 +113,7 @@ const struct rig_caps id5100_caps =
     .has_get_parm =  ID5100_PARM_ALL,
     .has_set_parm =  ID5100_PARM_ALL,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .extparms = icom_ext_parms,
diff --git a/rigs/icom/os456.c b/rigs/icom/os456.c
index a39c15cf..c7152817 100644
--- a/rigs/icom/os456.c
+++ b/rigs/icom/os456.c
@@ -102,6 +102,7 @@ const struct rig_caps os456_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/os535.c b/rigs/icom/os535.c
index bd355472..26df5afe 100644
--- a/rigs/icom/os535.c
+++ b/rigs/icom/os535.c
@@ -94,6 +94,7 @@ const struct rig_caps os535_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/icom/x108g.c b/rigs/icom/x108g.c
index cd2e6ade..f8f64208 100644
--- a/rigs/icom/x108g.c
+++ b/rigs/icom/x108g.c
@@ -162,6 +162,7 @@ const struct rig_caps x108g_caps =
     .has_get_parm =  X108G_PARMS,
     .has_set_parm =  RIG_PARM_SET(X108G_PARMS),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
diff --git a/rigs/jrc/nrd535.c b/rigs/jrc/nrd535.c
index c4667ee1..e7527569 100644
--- a/rigs/jrc/nrd535.c
+++ b/rigs/jrc/nrd535.c
@@ -123,6 +123,7 @@ const struct rig_caps nrd535_caps =
     .has_get_parm =  RIG_PARM_TIME,
     .has_set_parm =  RIG_PARM_SET(NRD535_PARM),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_ATT] = { .min = { .i = 0 }, .max = { .i = 20 } },
         [LVL_IF] = { .min = { .i = -2000 }, .max = { .i = 2000 } },
diff --git a/rigs/jrc/nrd545.c b/rigs/jrc/nrd545.c
index 90687ddb..ed4ba980 100644
--- a/rigs/jrc/nrd545.c
+++ b/rigs/jrc/nrd545.c
@@ -121,6 +121,7 @@ const struct rig_caps nrd545_caps =
     .has_get_parm =  RIG_PARM_TIME,
     .has_set_parm =  RIG_PARM_SET(NRD545_PARM),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_ATT] = { .min = { .i = 0 }, .max = { .i = 20 } },
         [LVL_IF] = { .min = { .i = -2550 }, .max = { .i = 2550 }, .step = { .i = 10} },
diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c
index 3ae0afc8..0b00a1fa 100644
--- a/rigs/kenwood/k3.c
+++ b/rigs/kenwood/k3.c
@@ -205,6 +205,7 @@ const struct rig_caps k3_caps =
     .has_get_parm =     RIG_PARM_NONE,
     .has_set_parm =     RIG_PARM_NONE,  /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_KEYSPD] = { .min = { .i = 8 }, .max = { .i = 50 }, .step = { .i = 1 } },
     },
     .parm_gran =        {},
diff --git a/rigs/kenwood/thd7.c b/rigs/kenwood/thd7.c
index 205afe27..ccfdf9ff 100644
--- a/rigs/kenwood/thd7.c
+++ b/rigs/kenwood/thd7.c
@@ -111,6 +111,7 @@ const struct rig_caps thd7a_caps =
     .has_get_parm =  THD7_PARMS,
     .has_set_parm =  THD7_PARMS,    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 5 } },
         [LVL_SQL] = { .min = { .i = 0 }, .max = { .i = 5 } },
         [LVL_RFPOWER] = { .min = { .i = 3 }, .max = { .i = 0 } },
diff --git a/rigs/kenwood/thf6a.c b/rigs/kenwood/thf6a.c
index 2e309b2d..9fc73e53 100644
--- a/rigs/kenwood/thf6a.c
+++ b/rigs/kenwood/thf6a.c
@@ -147,6 +147,7 @@ const struct rig_caps thf6a_caps =
     .has_get_parm =  THF6_PARMS,
     .has_set_parm =  THF6_PARMS,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_SQL] = { .min = { .i = 0 }, .max = { .i = 5 } },
         [LVL_RFPOWER] = { .min = { .i = 2 }, .max = { .i = 0 } },
     },
diff --git a/rigs/kenwood/thf7.c b/rigs/kenwood/thf7.c
index 821b7753..68a8d5f5 100644
--- a/rigs/kenwood/thf7.c
+++ b/rigs/kenwood/thf7.c
@@ -141,6 +141,7 @@ const struct rig_caps thf7e_caps =
     .has_get_parm =  THF7_PARMS,
     .has_set_parm =  THF7_PARMS,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_SQL] = { .min = { .i = 0 }, .max = { .i = 5 } },
         [LVL_RFPOWER] = { .min = { .i = 2 }, .max = { .i = 0 } },
     },
diff --git a/rigs/kenwood/thg71.c b/rigs/kenwood/thg71.c
index b2a1c46a..39e62446 100644
--- a/rigs/kenwood/thg71.c
+++ b/rigs/kenwood/thg71.c
@@ -112,6 +112,7 @@ const struct rig_caps thg71_caps =
     .has_get_level =  THG71_LEVEL_ALL,
     .has_set_level =  RIG_LEVEL_SET(THG71_LEVEL_ALL),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 5 } },
         [LVL_SQL] = { .min = { .i = 0 }, .max = { .i = 5 } },
         [LVL_RFPOWER] = { .min = { .i = 3 }, .max = { .i = 0 } },
diff --git a/rigs/kenwood/tmd700.c b/rigs/kenwood/tmd700.c
index d01ebaf7..13805a6d 100644
--- a/rigs/kenwood/tmd700.c
+++ b/rigs/kenwood/tmd700.c
@@ -125,6 +125,7 @@ const struct rig_caps tmd700_caps =
     .has_get_parm =  TMD700_PARMS,
     .has_set_parm =  TMD700_PARMS,    /* FIXME: parms */
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 7 } },
         [LVL_SQL] = { .min = { .i = 0 }, .max = { .i = 0x1f }, .step = { .f = 1. / 0x1f } },
         [LVL_RFPOWER] = { .min = { .i = 2 }, .max = { .i = 0 }, .step = { .f = 1. / 3. }  },
diff --git a/rigs/pcr/pcr100.c b/rigs/pcr/pcr100.c
index 5d8e9dd3..74d0409d 100644
--- a/rigs/pcr/pcr100.c
+++ b/rigs/pcr/pcr100.c
@@ -91,6 +91,7 @@ const struct rig_caps pcr100_caps =
     .has_set_parm       = RIG_PARM_NONE,
 
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         /* XXX check this */
         [LVL_IF] = { .min = { .i = -1270 }, .max = { .i = 1270 }, .step = { .i = 10 } },
diff --git a/rigs/pcr/pcr1000.c b/rigs/pcr/pcr1000.c
index 12efd74a..aa0d7042 100644
--- a/rigs/pcr/pcr1000.c
+++ b/rigs/pcr/pcr1000.c
@@ -84,6 +84,7 @@ const struct rig_caps pcr1000_caps =
     .has_set_parm       = RIG_PARM_NONE,
 
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         /* XXX check this */
         [LVL_IF] = { .min = { .i = -1270 }, .max = { .i = 1270 }, .step = { .i = 10 } },
diff --git a/rigs/pcr/pcr1500.c b/rigs/pcr/pcr1500.c
index 5d7edc59..c6bac2b0 100644
--- a/rigs/pcr/pcr1500.c
+++ b/rigs/pcr/pcr1500.c
@@ -87,6 +87,7 @@ const struct rig_caps pcr1500_caps =
     .has_set_parm       = RIG_PARM_NONE,
 
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 }, .step = { .i = 1 } },
         [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 16.0 }, .step = { .f = 1.0 } },
         /* XXX check this */
diff --git a/rigs/pcr/pcr2500.c b/rigs/pcr/pcr2500.c
index d796e6c5..7fd5f857 100644
--- a/rigs/pcr/pcr2500.c
+++ b/rigs/pcr/pcr2500.c
@@ -96,6 +96,7 @@ const struct rig_caps pcr2500_caps =
     .has_set_parm       = RIG_PARM_NONE,
 
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         /* XXX check this */
         [LVL_IF] = { .min = { .i = -1270 }, .max = { .i = 1270 }, .step = { .i = 10 } },
diff --git a/rigs/prm80/prm80.c b/rigs/prm80/prm80.c
index 01424046..1eefa60b 100644
--- a/rigs/prm80/prm80.c
+++ b/rigs/prm80/prm80.c
@@ -321,6 +321,7 @@ int prm80_get_channel(RIG *rig, channel_t *chan, int read_only)
                        (chanstate & 0x04) ? RIG_RPT_SHIFT_PLUS : RIG_RPT_SHIFT_NONE;
     chan->flags = (chanstate & 0x08) ? RIG_CHFLAG_SKIP : 0;
 
+    // cppcheck-suppress *
     chan->levels[LVL_SQL].f = ((float)(hhtoi(statebuf + 6) >> 4)) / 15.;
     chan->levels[LVL_AF].f  = ((float)(hhtoi(statebuf + 8) >> 4)) / 15.;
     /* same as chanstate bit 1 */
diff --git a/rigs/racal/ra3702.c b/rigs/racal/ra3702.c
index 28378979..587e2b66 100644
--- a/rigs/racal/ra3702.c
+++ b/rigs/racal/ra3702.c
@@ -80,6 +80,7 @@ const struct rig_caps ra3702_caps =
     .has_get_parm =  RA3702_PARM_ALL,
     .has_set_parm =  RIG_PARM_SET(RA3702_PARM_ALL),
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .vfo_ops =  RA3702_VFO_OPS,
diff --git a/rigs/tentec/pegasus.c b/rigs/tentec/pegasus.c
index fdedead5..6a98a2cb 100644
--- a/rigs/tentec/pegasus.c
+++ b/rigs/tentec/pegasus.c
@@ -95,6 +95,7 @@ const struct rig_caps tt550_caps =
     .has_get_parm = RIG_PARM_NONE,
     .has_set_parm = RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = {.min = {.i = 0}, .max = {.i = 65535}},
     },
     .parm_gran = {},
diff --git a/rigs/tentec/rx320.c b/rigs/tentec/rx320.c
index 0f4c68d4..f5ea64c3 100644
--- a/rigs/tentec/rx320.c
+++ b/rigs/tentec/rx320.c
@@ -104,6 +104,7 @@ const struct rig_caps rx320_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 10000 } },
         [LVL_AF] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0 / 64 } },
         [LVL_IF] = { .min = { .i = -2000 }, .max = { .i = 2000 }, .step = { .i = 10} },
diff --git a/rigs/tuner/v4l.c b/rigs/tuner/v4l.c
index 9691718a..74ee90b8 100644
--- a/rigs/tuner/v4l.c
+++ b/rigs/tuner/v4l.c
@@ -94,6 +94,7 @@ const struct rig_caps v4l_caps =
     .has_set_parm =  RIG_PARM_SET(V4L_PARM_ALL),
     .vfo_ops =  RIG_OP_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 65535 } },
     },
     .preamp =   { RIG_DBLST_END },
diff --git a/rigs/tuner/v4l2.c b/rigs/tuner/v4l2.c
index 1fb9f99e..4e1dea2a 100644
--- a/rigs/tuner/v4l2.c
+++ b/rigs/tuner/v4l2.c
@@ -94,6 +94,7 @@ const struct rig_caps v4l2_caps =
     .has_set_parm =  RIG_PARM_SET(V4L2_PARM_ALL),
     .vfo_ops =  RIG_OP_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 65535 } },
     },
     .preamp =   { RIG_DBLST_END },
diff --git a/rigs/uniden/uniden.c b/rigs/uniden/uniden.c
index 377e328c..31a1885d 100644
--- a/rigs/uniden/uniden.c
+++ b/rigs/uniden/uniden.c
@@ -637,6 +637,7 @@ int uniden_get_channel(RIG *rig, channel_t *chan, int read_only)
     /* TODO: Trunk, Delay, Recording */
 
     chan->flags = (membuf[22] == 'N') ? RIG_CHFLAG_SKIP : 0;
+    // cppcheck-suppress *
     chan->levels[LVL_ATT].i = (membuf[25] == 'N') ? rig->state.attenuator[0] : 0;
     sscanf(membuf + 41, "%d", &tone);
 
diff --git a/rigs/wj/wj8888.c b/rigs/wj/wj8888.c
index 38423cd8..ea1ce7b1 100644
--- a/rigs/wj/wj8888.c
+++ b/rigs/wj/wj8888.c
@@ -87,6 +87,7 @@ const struct rig_caps wj8888_caps =
     .preamp =   { RIG_DBLST_END },
     .attenuator =   { RIG_DBLST_END },
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 0x7f } },
     },
     .max_rit =  Hz(0),
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 6a37a7aa..2b41b2ca 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -769,8 +769,8 @@ int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     to_bcd(p->p_cmd, freq / 10, 8); /* store bcd format in in p_cmd */
     /* TODO -- fix 10Hz resolution -- FS */
 
-    rig_debug(RIG_DEBUG_TRACE,
-              "%s: requested freq after conversion = %"PRIll" Hz\n", __func__,
+    // cppcheck-suppress *
+    rig_debug(RIG_DEBUG_TRACE, "%s: freq = %"PRIll" Hz\n", __func__,
               (int64_t)from_bcd(p->p_cmd, 8) * 10);
 
     cmd = p->p_cmd;               /* get native sequence */
diff --git a/rigs/yaesu/ft1200.c b/rigs/yaesu/ft1200.c
index 68faac7e..604d55b9 100644
--- a/rigs/yaesu/ft1200.c
+++ b/rigs/yaesu/ft1200.c
@@ -76,6 +76,7 @@ const struct rig_caps ft1200_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 10 } },
     },
diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c
index e52c7819..68ca3398 100644
--- a/rigs/yaesu/ft2000.c
+++ b/rigs/yaesu/ft2000.c
@@ -75,6 +75,7 @@ const struct rig_caps ft2000_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
     },
diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c
index b0c71148..057c86e9 100644
--- a/rigs/yaesu/ft450.c
+++ b/rigs/yaesu/ft450.c
@@ -74,6 +74,7 @@ const struct rig_caps ft450_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 400 }, .max = { .i = 800 }, .step = { .i = 100 } },
     },
diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c
index 8ccef479..7602e647 100644
--- a/rigs/yaesu/ft5000.c
+++ b/rigs/yaesu/ft5000.c
@@ -75,6 +75,7 @@ const struct rig_caps ftdx5000_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
     },
diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c
index 8b3fc5b8..0f958b32 100644
--- a/rigs/yaesu/ft891.c
+++ b/rigs/yaesu/ft891.c
@@ -79,6 +79,7 @@ const struct rig_caps ft891_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
     },
diff --git a/rigs/yaesu/ft9000.c b/rigs/yaesu/ft9000.c
index a5dd7165..b0d626ae 100644
--- a/rigs/yaesu/ft9000.c
+++ b/rigs/yaesu/ft9000.c
@@ -75,6 +75,7 @@ const struct rig_caps ft9000_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
     },
diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c
index 2bdd9d05..6703daa9 100644
--- a/rigs/yaesu/ft950.c
+++ b/rigs/yaesu/ft950.c
@@ -74,6 +74,7 @@ const struct rig_caps ft950_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
     },
diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c
index 82acde25..06e53aef 100644
--- a/rigs/yaesu/ft991.c
+++ b/rigs/yaesu/ft991.c
@@ -80,6 +80,7 @@ const struct rig_caps ft991_caps =
     .has_get_parm =       RIG_PARM_NONE,
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
+        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
     },
diff --git a/rigs/yaesu/vx1700.c b/rigs/yaesu/vx1700.c
index cb59ea9d..4f9e8911 100644
--- a/rigs/yaesu/vx1700.c
+++ b/rigs/yaesu/vx1700.c
@@ -129,6 +129,7 @@ const struct rig_caps vx1700_caps =
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran =  {
+        // cppcheck-suppress *
         [LVL_RFPOWER] = { .min = { .i = 0 }, .max = { .i = 2 } },
     },
     .parm_gran =  {},
diff --git a/tests/rigctl_parse.h b/tests/rigctl_parse.h
index 873f9ada..a741742f 100644
--- a/tests/rigctl_parse.h
+++ b/tests/rigctl_parse.h
@@ -25,7 +25,6 @@
 #ifndef RIGCTL_PARSE_H
 #define RIGCTL_PARSE_H
 
-// cppcheck-suppress *
 #include <stdio.h>
 #include <hamlib/rig.h>
 

commit 7e4b0882fbb28cd11baa9eb1c0ca3d08b422c1ea
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 19 14:38:00 2020 -0500

    Clean up cppcheck warning
    
    (cherry picked from commit 8d60a82f5405fc7e5f5d783058b2bbc773078244)

diff --git a/rigs/tentec/tentec2.c b/rigs/tentec/tentec2.c
index ac59d7a3..88417981 100644
--- a/rigs/tentec/tentec2.c
+++ b/rigs/tentec/tentec2.c
@@ -699,6 +699,7 @@ const char *tentec2_get_info(RIG *rig)
     /*
      * protocol version
      */
+    buf[0] = 0;
     firmware_len = 100;
     retval = tentec_transaction(rig, "?V\r", 3, buf, &firmware_len);
 
@@ -710,14 +711,5 @@ const char *tentec2_get_info(RIG *rig)
         return NULL;
     }
 
-    if (firmware_len < 100)
-    {
-        buf[firmware_len] = 0;
-    }
-    else
-    {
-        buf[0] = 0;
-    }
-
     return buf;
 }

commit 15939de0018eb601e88c85a0cf662a141aae84b3
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 19 14:33:27 2020 -0500

    Clean up cppcheck scope
    
    (cherry picked from commit 2362d2fe1cd332dee85158e00102568987fc44cb)

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index b031f860..63a42451 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -806,6 +806,14 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
     case RIG_LEVEL_MICGAIN:
         n = sscanf(lvlbuf + len, "%f", &val->f);
+
+        if (n != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n",
+                      __func__, lvlbuf);
+            return -RIG_EPROTO;
+        }
+
         // Thetis returns -40 to 10 -- does PowerSDR do the same?
         // Setting
         val->f = (val->f - -40) / (10 - -40);
@@ -814,12 +822,28 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     case RIG_LEVEL_VOXGAIN:
         // return is 0-1000
         n = sscanf(lvlbuf + len, "%f", &val->f);
+
+        if (n != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n",
+                      __func__, lvlbuf);
+            return -RIG_EPROTO;
+        }
+
         val->f /= 1000;
         break;
 
     case RIG_LEVEL_SQL:
         n = sscanf(lvlbuf + len, "%f", &val->f);
 
+        if (n != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n",
+                      __func__, lvlbuf);
+            return -RIG_EPROTO;
+        }
+
+
         powersdr_get_mode(rig, vfo, &mode, &width);
 
         if (mode == RIG_MODE_FM)

commit 31fb3e96d4c8473b2de26af35d42bf3fb70430bf
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 19 14:31:54 2020 -0500

    Clean up cppcheck scope
    
    (cherry picked from commit 88291fed86ecb2e251c8d1b16ce042910f522966)

diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 3602969f..a7dc437d 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -896,12 +896,12 @@ const struct rig_caps ic705_caps =
 
 int ic7300_set_parm(RIG *rig, setting_t parm, value_t val)
 {
-    unsigned char prmbuf[MAXFRAMELEN];
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
     switch (parm)
     {
+    unsigned char prmbuf[MAXFRAMELEN];
+
     case RIG_PARM_ANN:
     {
         int ann_mode = -1;

commit a1fbfafbdd5d39304d65b89be56a6a18306e1ff8
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 19 12:55:47 2020 -0500

    Remove redundant check in ar3030.c
    
    (cherry picked from commit 865fa7d540ccb2765f852cad7b9878615a61464a)

diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c
index edacb729..b1445954 100644
--- a/rigs/aor/ar3030.c
+++ b/rigs/aor/ar3030.c
@@ -266,7 +266,7 @@ static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len,
         *data_len = 0;
 
         /* only set data_len non-zero if not a command response */
-        if (retval > 0 && data[0] != 0x00 && data[0] != 0x0d)
+        if (data[0] != 0x00 && data[0] != 0x0d)
         {
             *data_len = retval;
         }

commit 0f0f71eb4fb777f8d29d340da6193b7925c7fc8b
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Sep 18 16:45:37 2020 -0500

    Add FUNC RIT XIT and LEVEL AGC to PowerSDR
    
    (cherry picked from commit 42b2b1ed69c279dcffa40b293f59200e9d0ad910)

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 5e4021ab..b031f860 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -49,9 +49,9 @@
 #define F6K_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3)
 
 /* PowerSDR differences */
-#define POWERSDR_FUNC_ALL (RIG_FUNC_VOX|RIG_FUNC_SQL|RIG_FUNC_NB|RIG_FUNC_ANF|RIG_FUNC_MUTE)
+#define POWERSDR_FUNC_ALL (RIG_FUNC_VOX|RIG_FUNC_SQL|RIG_FUNC_NB|RIG_FUNC_ANF|RIG_FUNC_MUTE|RIG_FUNC_RIT|RIG_FUNC_XIT)
 
-#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN|RIG_LEVEL_SQL|RIG_LEVEL_AF)
+#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN|RIG_LEVEL_SQL|RIG_LEVEL_AF|RIG_LEVEL_AGC)
 
 
 static rmode_t flex_mode_table[KENWOOD_MODE_TABLE_MAX] =
@@ -660,6 +660,15 @@ int powersdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
         snprintf(cmd, sizeof(cmd) - 1, "ZZMG%03d", ival);
         break;
 
+    case RIG_LEVEL_AGC:
+        if (val.i > 5)
+        {
+            val.i = 5;    /* 0.. 255 */
+        }
+
+        snprintf(cmd, sizeof(cmd), "GT%03d", (int)val.i);
+        break;
+
     case RIG_LEVEL_VOXGAIN:
         ival = val.f * 1000;
         snprintf(cmd, sizeof(cmd) - 1, "ZZVG%04d", ival);
@@ -718,6 +727,12 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
     switch (level)
     {
+    case RIG_LEVEL_AGC:
+        cmd = "GT";
+        len = 2;
+        ans = 3;
+        break;
+
     case RIG_LEVEL_AF:
         cmd = "ZZAG";
         len = 4;
@@ -763,6 +778,18 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
     switch (level)
     {
+    case RIG_LEVEL_AGC:
+        n = sscanf(lvlbuf + len, "%d", &val->i);
+
+        if (n != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n",
+                      __func__, lvlbuf);
+            return -RIG_EPROTO;
+        }
+
+        break;
+
     case RIG_LEVEL_AF:
     case RIG_LEVEL_RFPOWER_METER:
         n = sscanf(lvlbuf + len, "%f", &val->f);

commit f7c24262e97b6b49cf460c4ae623500075a526b7
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Sep 18 16:17:26 2020 -0500

    Add func NB ANF MUTE to PowerSDR
    
    (cherry picked from commit f401d6dd942c5a69f21e16201a7165921f92fc18)

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index f027e698..5e4021ab 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -49,7 +49,7 @@
 #define F6K_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3)
 
 /* PowerSDR differences */
-#define POWERSDR_FUNC_ALL (RIG_FUNC_VOX|RIG_FUNC_SQL)
+#define POWERSDR_FUNC_ALL (RIG_FUNC_VOX|RIG_FUNC_SQL|RIG_FUNC_NB|RIG_FUNC_ANF|RIG_FUNC_MUTE)
 
 #define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN|RIG_LEVEL_SQL|RIG_LEVEL_AF)
 
@@ -654,6 +654,7 @@ int powersdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
         ival = val.f * 100;
         snprintf(cmd, sizeof(cmd) - 1, "ZZAG%03d", ival);
         break;
+
     case RIG_LEVEL_MICGAIN:
         ival = val.f * (10 - -40) - 40;
         snprintf(cmd, sizeof(cmd) - 1, "ZZMG%03d", ival);
@@ -722,6 +723,7 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         len = 4;
         ans = 3;
         break;
+
     case RIG_LEVEL_RFPOWER_METER:
         cmd = "ZZRM5";
         len = 5;
@@ -819,6 +821,10 @@ int powersdr_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 
     switch (func)
     {
+    case RIG_FUNC_MUTE:
+        snprintf(cmd, sizeof(cmd) - 1, "ZZMA%01d", status);
+        break;
+
     case RIG_FUNC_VOX:
         snprintf(cmd, sizeof(cmd) - 1, "ZZVE%01d", status);
         break;
@@ -850,6 +856,12 @@ int powersdr_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 
     switch (func)
     {
+    case RIG_FUNC_MUTE:
+        cmd = "ZZMA";
+        len = 4;
+        ans = 1;
+        break;
+
     case RIG_FUNC_VOX:
         cmd = "ZZVE";
         len = 4;
@@ -875,10 +887,8 @@ int powersdr_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 
     switch (func)
     {
+    case RIG_FUNC_MUTE:
     case RIG_FUNC_VOX:
-        sscanf(lvlbuf + len, "%d", status);
-        break;
-
     case RIG_FUNC_SQL:
         sscanf(lvlbuf + len, "%d", status);
         break;

commit a690a40ababf413522366c01019eccab07bda1ac
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Sep 18 15:50:08 2020 -0500

    Add LEVEL_AF to PowerSDR
    
    (cherry picked from commit 10700186e3f4955a9f77dd50f675ff9ccbd11c38)

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 8364e0f4..f027e698 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -51,7 +51,7 @@
 /* PowerSDR differences */
 #define POWERSDR_FUNC_ALL (RIG_FUNC_VOX|RIG_FUNC_SQL)
 
-#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN|RIG_LEVEL_SQL)
+#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN|RIG_LEVEL_SQL|RIG_LEVEL_AF)
 
 
 static rmode_t flex_mode_table[KENWOOD_MODE_TABLE_MAX] =
@@ -650,6 +650,10 @@ int powersdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
     switch (level)
     {
+    case RIG_LEVEL_AF:
+        ival = val.f * 100;
+        snprintf(cmd, sizeof(cmd) - 1, "ZZAG%03d", ival);
+        break;
     case RIG_LEVEL_MICGAIN:
         ival = val.f * (10 - -40) - 40;
         snprintf(cmd, sizeof(cmd) - 1, "ZZMG%03d", ival);
@@ -713,6 +717,11 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
     switch (level)
     {
+    case RIG_LEVEL_AF:
+        cmd = "ZZAG";
+        len = 4;
+        ans = 3;
+        break;
     case RIG_LEVEL_RFPOWER_METER:
         cmd = "ZZRM5";
         len = 5;
@@ -752,12 +761,13 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
     switch (level)
     {
+    case RIG_LEVEL_AF:
     case RIG_LEVEL_RFPOWER_METER:
         n = sscanf(lvlbuf + len, "%f", &val->f);
 
         if (n != 1)
         {
-            rig_debug(RIG_DEBUG_ERR, "%s: Error parsing RFPOWER from lvlbuf='%s'\n",
+            rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n",
                       __func__, lvlbuf);
             return -RIG_EPROTO;
         }

commit 06f89c7bb7e754eb0996e66ee101bc871eb559ab
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Sep 18 13:07:19 2020 -0500

    Add Thetis/ANAN to PowerSDR description
    
    (cherry picked from commit 3811071f9e80a570a7cbd2ff4d1d5ba6d4708312)

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 2b132cf6..8364e0f4 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -1010,9 +1010,9 @@ const struct rig_caps f6k_caps =
 const struct rig_caps powersdr_caps =
 {
     RIG_MODEL(RIG_MODEL_POWERSDR),
-    .model_name =       "PowerSDR",
-    .mfg_name =     "FlexRadio",
-    .version =      "20200716.0",
+    .model_name =       "PowerSDR/Thetis",
+    .mfg_name =     "FlexRadio/ANAN",
+    .version =      "20200918.0",
     .copyright =        "LGPL",
     .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TRANSCEIVER,

commit 5a8e11ae9d45895a1356ee1029b6f9bb585e2479
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Sep 18 13:04:31 2020 -0500

    Add SQL to PowerSDR
    
    (cherry picked from commit 2a378919dbd8fb39eafaf7089785a96853ea979c)

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index a9b5f6ee..2b132cf6 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -28,6 +28,7 @@
 #endif
 
 #include <stdlib.h>
+#include <math.h>
 
 #include <hamlib/rig.h>
 #include "kenwood.h"
@@ -48,9 +49,9 @@
 #define F6K_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3)
 
 /* PowerSDR differences */
-#define POWERSDR_FUNC_ALL (RIG_FUNC_VOX)
+#define POWERSDR_FUNC_ALL (RIG_FUNC_VOX|RIG_FUNC_SQL)
 
-#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN)
+#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN|RIG_LEVEL_SQL)
 
 
 static rmode_t flex_mode_table[KENWOOD_MODE_TABLE_MAX] =
@@ -642,6 +643,8 @@ int powersdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
     char cmd[KENWOOD_MAX_BUF_LEN];
     int retval;
     int ival;
+    rmode_t mode;
+    pbwidth_t width;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
@@ -650,31 +653,40 @@ int powersdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
     case RIG_LEVEL_MICGAIN:
         ival = val.f * (10 - -40) - 40;
         snprintf(cmd, sizeof(cmd) - 1, "ZZMG%03d", ival);
-        retval = kenwood_transaction(rig, cmd, NULL, 0);
-
-        if (retval != RIG_OK)
-        {
-            return retval;
-      ...
 
[truncated message content]