hamlib-cvs-digest Mailing List for Ham Radio Control Libraries (Page 13)

Library to control radio transceivers and receivers

Brought to you by: n0nb

hamlib-cvs-digest — hamlib commit digest

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (57)	Nov (27)	Dec (25)
2001	Jan (41)	Feb (101)	Mar (60)	Apr (32)	May (32)	Jun (198)	Jul (95)	Aug (60)	Sep (48)	Oct (96)	Nov (27)	Dec (222)
2002	Jan (180)	Feb (46)	Mar (68)	Apr (11)	May (36)	Jun (34)	Jul (113)	Aug (42)	Sep (71)	Oct (65)	Nov (116)	Dec (40)
2003	Jan (32)	Feb (92)	Mar (29)	Apr (102)	May (21)	Jun (34)	Jul (3)	Aug (60)	Sep (30)	Oct (62)	Nov (57)	Dec (33)
2004	Jan (28)	Feb (46)	Mar (16)	Apr (14)	May (31)	Jun (21)	Jul (10)	Aug (80)	Sep (42)	Oct (11)	Nov (28)	Dec (13)
2005	Jan (35)	Feb (26)	Mar (20)	Apr (118)	May (2)	Jun (5)	Jul	Aug	Sep (5)	Oct (1)	Nov (13)	Dec (1)
2006	Jan (9)	Feb (25)	Mar (22)	Apr (6)	May	Jun	Jul (2)	Aug (1)	Sep (3)	Oct (46)	Nov (13)	Dec (7)
2007	Jan (9)	Feb (14)	Mar (3)	Apr	May (6)	Jun (1)	Jul	Aug (11)	Sep (7)	Oct (8)	Nov (41)	Dec (3)
2008	Jan (27)	Feb (16)	Mar (13)	Apr (23)	May (39)	Jun (4)	Jul (7)	Aug (1)	Sep (13)	Oct (52)	Nov (44)	Dec (55)
2009	Jan (72)	Feb (69)	Mar	Apr	May	Jun (13)	Jul (1)	Aug (6)	Sep (15)	Oct (11)	Nov (31)	Dec (20)
2010	Jan (24)	Feb (21)	Mar (22)	Apr (40)	May (38)	Jun (4)	Jul (2)	Aug (22)	Sep (19)	Oct (14)	Nov (5)	Dec (8)
2011	Jan (14)	Feb (36)	Mar (6)	Apr	May	Jun (23)	Jul (13)	Aug (8)	Sep (7)	Oct	Nov (3)	Dec (9)
2012	Jan (17)	Feb (13)	Mar (10)	Apr	May (1)	Jun (14)	Jul (4)	Aug (12)	Sep (2)	Oct (24)	Nov (14)	Dec (2)
2013	Jan (4)	Feb (3)	Mar (3)	Apr (3)	May (10)	Jun (4)	Jul (7)	Aug	Sep (15)	Oct (5)	Nov (1)	Dec (2)
2014	Jan	Feb (8)	Mar (1)	Apr (3)	May (1)	Jun	Jul	Aug (1)	Sep (3)	Oct (7)	Nov (6)	Dec (3)
2015	Jan (4)	Feb (5)	Mar (8)	Apr (8)	May (2)	Jun	Jul (4)	Aug (7)	Sep (8)	Oct	Nov (6)	Dec (4)
2016	Jan (6)	Feb (26)	Mar (3)	Apr (10)	May (6)	Jun (5)	Jul (1)	Aug (4)	Sep (3)	Oct (4)	Nov (3)	Dec (10)
2017	Jan (11)	Feb (11)	Mar (2)	Apr (1)	May (7)	Jun (2)	Jul (11)	Aug (9)	Sep (5)	Oct (5)	Nov (1)	Dec (2)
2018	Jan (5)	Feb (2)	Mar (19)	Apr (7)	May (11)	Jun (3)	Jul (4)	Aug (10)	Sep (2)	Oct (8)	Nov (6)	Dec (9)
2019	Jan (9)	Feb (6)	Mar (2)	Apr (4)	May (6)	Jun (9)	Jul (6)	Aug (3)	Sep (5)	Oct (2)	Nov (8)	Dec (9)
2020	Jan (15)	Feb (1)	Mar (18)	Apr (33)	May (43)	Jun (87)	Jul (45)	Aug (8)	Sep (43)	Oct (3)	Nov (5)	Dec (42)
2021	Jan (116)	Feb (40)	Mar (58)	Apr (48)	May (29)	Jun (2)	Jul	Aug (22)	Sep (18)	Oct (1)	Nov	Dec (3)
2022	Jan (1)	Feb (1)	Mar	Apr (1)	May (2)	Jun (1)	Jul	Aug (1)	Sep	Oct (6)	Nov (2)	Dec (9)
2023	Jan (10)	Feb	Mar	Apr (10)	May (3)	Jun (1)	Jul (2)	Aug (4)	Sep (1)	Oct	Nov (2)	Dec (3)
2024	Jan (4)	Feb (1)	Mar (2)	Apr (2)	May (5)	Jun (3)	Jul (1)	Aug (2)	Sep	Oct (2)	Nov (3)	Dec (9)
2025	Jan (5)	Feb (5)	Mar	Apr (10)	May (20)	Jun (43)	Jul (24)	Aug (47)	Sep (38)	Oct (5)	Nov (3)	Dec (1)

Flat | Threaded

<< < 1 .. 11 12 13 14 15 .. 229 > >> (Page 13 of 229)

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

From: Michael B. <mdb...@us...> - 2021-09-22 15:42:28

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  421c6e7c4e4d6ef552ca39241463c71244b424a2 (commit)
      from  0806896e3be5f2465f52b5352d2ec5bf684616f9 (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 421c6e7c4e4d6ef552ca39241463c71244b424a2
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 22 10:40:56 2021 -0500

    Fix icom.c get_mode to not ask for unselected VFO when VFO_CURR is requested
    https://github.com/Hamlib/Hamlib/issues/806

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 2438fd4e..05d9f7b6 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2196,7 +2196,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         vfo_t vfoask = vfo_fixup(rig, vfo, 0);
         vfo_t vfocurr = vfo_fixup(rig, rig->state.current_vfo, 0);
 
-        if (vfoask != vfocurr) { vfosel = 0x01; }
+        if (vfo != RIG_VFO_CURR && vfoask != vfocurr) { vfosel = 0x01; }
 
         // use cache for the non-selected VFO -- can't get it by VFO
         // this avoids vfo swapping but accurate answers for these rigs
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index acdfeed1..e6459b7f 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210921"
+#define BACKEND_VER "20210922"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

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

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


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

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

From: Michael B. <mdb...@us...> - 2021-09-22 04:34:00

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  0806896e3be5f2465f52b5352d2ec5bf684616f9 (commit)
       via  9671a26858404400b05dd9f47511a2dea9dd28d3 (commit)
       via  a94dcddcf44c5ee1942f5c04a037edfb806f2878 (commit)
       via  4c0633bf6256af2ce64d7f0aff9b8ea9bc674209 (commit)
       via  3fb38741aa0a87fa2fa9a19f4eec433941a8dd92 (commit)
       via  0ad5f4c3dbe07be92b7e76968f1ecd38315cd03a (commit)
       via  8024fba14d364d3ed5f0fb290fa6d801b1853677 (commit)
       via  a3ab4a4312a76e2b8eca9b0e088988bfb0083bc6 (commit)
      from  c0c941a9d0d942fe374b607ff48a827c0d15017e (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 0806896e3be5f2465f52b5352d2ec5bf684616f9
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 21 23:32:12 2021 -0500

    Fix compilation when OS does not have libusb installed
    https://github.com/Hamlib/Hamlib/issues/803

diff --git a/configure.ac b/configure.ac
index 21d98847..03a99f95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,10 +321,11 @@ LIBUSB=""
 AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults])
 AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))])
 
-AS_IF([test x"${cf_with_libusb}" = "xyes"],
-    [AS_IF([test -z $LIBUSB_LIBS],
+AS_IF([test x"${cf_with_libusb}" = "xyes"], [
+    AS_IF([test -z $LIBUSB_LIBS],
 	[AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBUSB_LIBS="-lusb-1.0"],
 	    [AC_MSG_WARN([libusb_init was not found in libusb-1.0--USB backends will be disabled])])
+        [cf_with_libusb="no"]
 	], [cf_with_libusb="yes"])
 
     AS_IF([test x"${cf_with_libusb}" = "xyes"],
diff --git a/tests/rigtestlibusb.c b/tests/rigtestlibusb.c
index 29156cc0..4689ff7e 100644
--- a/tests/rigtestlibusb.c
+++ b/tests/rigtestlibusb.c
@@ -24,12 +24,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#if __has_include("libusb.h")
+#if defined(HAVE_LIBUSB_H)
 #include "libusb.h"
-#else
+#elif defined(HAVE_LIBUSB_1_0_LIBUSB_H)
 #include <libusb-1.0/libusb.h>
 #endif
 
+#if HAVE_LIBUSB
 int verbose = 0;
 
 static void print_endpoint_comp(const struct
@@ -410,3 +411,10 @@ int main(int argc, char *argv[])
     libusb_exit(NULL);
     return r;
 }
+#else
+int main()
+{
+    puts("libusb not installed");
+    return 0;
+}
+#endif

commit 9671a26858404400b05dd9f47511a2dea9dd28d3
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 21 23:30:45 2021 -0500

    Add mutex back to rigctld.  Migrating to mutext locks on all rig functions
    https://github.com/Hamlib/Hamlib/issues/695

diff --git a/tests/rigctld.c b/tests/rigctld.c
index 854227e0..39110629 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -148,9 +148,8 @@ const char *multicast_addr = "0.0.0.0";
 
 #define MAXCONFLEN 1024
 
-extern void sync_callback(int lock);
-#if 0
-void sync_callback(int lock)
+
+void mutex_rigctld(int lock)
 {
 #ifdef HAVE_PTHREAD
     static pthread_mutex_t client_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -168,7 +167,6 @@ void sync_callback(int lock)
 
 #endif
 }
-#endif
 
 #ifdef WIN32
 static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
@@ -999,7 +997,7 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_PTHREAD
     /* allow threads to finish current action */
-    sync_callback(1);
+    mutex_rigctld(1);
 
     if (client_count)
     {
@@ -1007,7 +1005,7 @@ int main(int argc, char *argv[])
     }
 
     rig_close(my_rig);
-    sync_callback(0);
+    mutex_rigctld(0);
 #else
     rig_close(my_rig); /* close port */
 #endif
@@ -1085,7 +1083,7 @@ void *handle_socket(void *arg)
     }
 
 #ifdef HAVE_PTHREAD
-    sync_callback(1);
+    mutex_rigctld(1);
 
 //    ++client_count;
 #if 0
@@ -1104,7 +1102,7 @@ void *handle_socket(void *arg)
 
 #endif
 
-    sync_callback(0);
+    mutex_rigctld(0);
 #else
     retcode = rig_open(my_rig);
 
@@ -1134,7 +1132,7 @@ void *handle_socket(void *arg)
             rig_debug(RIG_DEBUG_TRACE, "%s: doing rigctl_parse vfo_mode=%d\n", __func__,
                       handle_data_arg->vfo_mode);
             retcode = rigctl_parse(handle_data_arg->rig, fsockin, fsockout, NULL, 0,
-                                   sync_callback,
+                                   mutex_rigctld,
                                    1, 0, &handle_data_arg->vfo_mode, send_cmd_term, &ext_resp, &resp_sep);
 
             if (retcode != 0) { rig_debug(RIG_DEBUG_VERBOSE, "%s: rigctl_parse retcode=%d\n", __func__, retcode); }
@@ -1168,7 +1166,7 @@ void *handle_socket(void *arg)
 
 #ifdef HAVE_PTHREAD
 #if 0
-    sync_callback(1);
+    mutex_rigctld(1);
 
     /* Release rig if there are no clients */
     if (!--client_count)
@@ -1183,7 +1181,7 @@ void *handle_socket(void *arg)
         }
     }
 
-    sync_callback(0);
+    mutex_rigctld(0);
 #endif
 #else
     rig_close(my_rig);

commit a94dcddcf44c5ee1942f5c04a037edfb806f2878
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 21 12:17:17 2021 -0500

    Fix ICOM request for VFOB info when VFOB is active vfo
    https://github.com/Hamlib/Hamlib/issues/806

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 60daccfa..2438fd4e 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2193,8 +2193,10 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
             && rig->caps->rig_model != RIG_MODEL_IC7800)
     {
         int vfosel = 0x00;
+        vfo_t vfoask = vfo_fixup(rig, vfo, 0);
+        vfo_t vfocurr = vfo_fixup(rig, rig->state.current_vfo, 0);
 
-        if (vfo & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B)) { vfosel = 0x01; }
+        if (vfoask != vfocurr) { vfosel = 0x01; }
 
         // use cache for the non-selected VFO -- can't get it by VFO
         // this avoids vfo swapping but accurate answers for these rigs
@@ -6947,6 +6949,7 @@ int icom_set_parm(RIG *rig, setting_t parm, value_t val)
                   rig_strparm(parm));
         RETURNFUNC(-RIG_EINVAL);
     }
+
     RETURNFUNC(-RIG_EINVAL);
 }
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 9127b6e2..acdfeed1 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210911"
+#define BACKEND_VER "20210921"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

commit 4c0633bf6256af2ce64d7f0aff9b8ea9bc674209
Merge: 3fb38741 a3ab4a43
Author: Michael Black <mdb...@ya...>
Date:   Tue Sep 21 09:26:11 2021 -0500

    Merge pull request #804 from wutje/improve_rig
    
    Fix rig_cookie: use lock for reads and write.


commit 3fb38741aa0a87fa2fa9a19f4eec433941a8dd92
Merge: c0c941a9 0ad5f4c3
Author: Michael Black <mdb...@ya...>
Date:   Mon Sep 20 16:31:56 2021 -0500

    Merge pull request #805 from wutje/fix_yaesu_detect
    
    Fix Yaesu and Adat detect


commit 0ad5f4c3dbe07be92b7e76968f1ecd38315cd03a
Author: Wouter van Gulik <pa...@gm...>
Date:   Mon Sep 20 23:19:59 2021 +0200

    Drop debug printf

diff --git a/rigs/yaesu/yaesu.c b/rigs/yaesu/yaesu.c
index 9a7b8cb5..ff209154 100644
--- a/rigs/yaesu/yaesu.c
+++ b/rigs/yaesu/yaesu.c
@@ -159,7 +159,6 @@ DECLARE_PROBERIG_BACKEND(yaesu)
         port->parm.serial.rate = rates[rates_idx];
         port->timeout = 2 * 1000 / rates[rates_idx] + 50;
 
-        printf("Yaesu trying rate = %d\n", rates[rates_idx]);
         retval = serial_open(port);
 
         if (retval != RIG_OK)

commit 8024fba14d364d3ed5f0fb290fa6d801b1853677
Author: Wouter van Gulik <pa...@gm...>
Date:   Mon Sep 20 23:06:25 2021 +0200

    Fix bug yaesu and adat probe:
    Yaesu probe code never left the loop, even if it did find something.
    Adat tried stop_bits 0, which serial_setup rightfully refused.
    THIS IS UNTESTED.

diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c
index bab7a946..c1503a52 100644
--- a/rigs/adat/adat.c
+++ b/rigs/adat/adat.c
@@ -3706,7 +3706,7 @@ DECLARE_PROBERIG_BACKEND(adat)
     }
 
     port->write_delay = port->post_write_delay = 10;
-    port->parm.serial.stop_bits = 0;
+    port->parm.serial.stop_bits = 2;
     port->retry = 1;
 
 
diff --git a/rigs/yaesu/yaesu.c b/rigs/yaesu/yaesu.c
index 09296e00..9a7b8cb5 100644
--- a/rigs/yaesu/yaesu.c
+++ b/rigs/yaesu/yaesu.c
@@ -134,7 +134,7 @@ DECLARE_PROBERIG_BACKEND(yaesu)
     static const unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0xfa};
     int id_len = -1, i, id1, id2;
     int retval = -1;
-    int rates[] = { 4800, 57600, 9600, 38400, 0 };  /* possible baud rates */
+    static const int rates[] = { 4800, 57600, 9600, 38400, 0 };  /* possible baud rates */
     int rates_idx;
 
     if (!port)
@@ -159,6 +159,7 @@ DECLARE_PROBERIG_BACKEND(yaesu)
         port->parm.serial.rate = rates[rates_idx];
         port->timeout = 2 * 1000 / rates[rates_idx] + 50;
 
+        printf("Yaesu trying rate = %d\n", rates[rates_idx]);
         retval = serial_open(port);
 
         if (retval != RIG_OK)
@@ -172,9 +173,9 @@ DECLARE_PROBERIG_BACKEND(yaesu)
 
         close(port->fd);
 
-        if (retval != RIG_OK || id_len < 0)
+        if (retval == RIG_OK && id_len > 0)
         {
-            continue;
+            break;
         }
     }
 

commit a3ab4a4312a76e2b8eca9b0e088988bfb0083bc6
Author: Wouter van Gulik <pa...@gm...>
Date:   Mon Sep 20 22:10:55 2021 +0200

    Fix rig_cookie: use lock for reads and write.
    Ensure we never print more then HAMLIB_COOKIE_SIZE otherwise we read
    out-of-bounds.
    Drop stray printf.
    Add tests for invalid input and overly large input.
    Fix test2 to release the cookie.

diff --git a/src/rig.c b/src/rig.c
index 3ef58153..5c4ab9aa 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -6791,16 +6791,16 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
     // only 1 client can have the cookie so these can be static
     // this should also prevent problems with DLLs & shared libraies
     // the debug_msg is another non-thread-safe which this will help fix
-    // 27 char cookie will last until the year 10000
     static char
-    cookie_save[HAMLIB_COOKIE_SIZE];  // only one client can have the 26-char cookie
+    cookie_save[HAMLIB_COOKIE_SIZE];  // only one client can have the cookie
     static double time_last_used;
-    double time_curr;
     struct timespec tp;
+    int ret;
 #ifdef HAVE_PTHREAD
     static pthread_mutex_t cookie_lock = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
+    /* This is not needed for RIG_COOKIE_RELEASE but keep it simple. */
     if (cookie_len < HAMLIB_COOKIE_SIZE)
     {
         rig_debug(RIG_DEBUG_ERR, "%s(%d): cookie_len < %d\n",
@@ -6815,6 +6815,12 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
         return -RIG_EINVAL; // nothing to do
     }
 
+    /* Accesing cookie_save and time_last_used must be done with lock held.
+     * So keep code simple and lock it during the whole operation. */
+#ifdef HAVE_PTHREAD
+    pthread_mutex_lock(&cookie_lock);
+#endif
+
     switch (cookie_cmd)
     {
     case RIG_COOKIE_RELEASE:
@@ -6824,14 +6830,14 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
             rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s cookie released\n",
                       __FILE__, __LINE__, cookie_save);
             memset(cookie_save, 0, sizeof(cookie_save));
-            return RIG_OK;
+            ret = RIG_OK;
         }
         else // not the right cookie!!
         {
             rig_debug(RIG_DEBUG_ERR,
                       "%s(%d): %s can't release cookie as cookie %s is active\n", __FILE__, __LINE__,
                       cookie, cookie_save);
-            return -RIG_BUSBUSY;
+            ret = -RIG_BUSBUSY;
         }
 
         break;
@@ -6847,13 +6853,15 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
                       __LINE__, cookie);
             clock_gettime(CLOCK_REALTIME, &tp);
             time_last_used = tp.tv_sec + tp.tv_nsec / 1e9;
-            return RIG_OK;
+            ret = RIG_OK;
+        }
+        else
+        {
+            rig_debug(RIG_DEBUG_ERR,
+                    "%s(%d): %s renew request refused %s is active\n",
+                    __FILE__, __LINE__, cookie, cookie_save);
+            ret = -RIG_EINVAL; // wrong cookie
         }
-
-        rig_debug(RIG_DEBUG_ERR,
-                  "%s(%d): %s renew request refused %s is active\n",
-                  __FILE__, __LINE__, cookie, cookie_save);
-        return -RIG_EINVAL; // wrong cookie
 
         break;
 
@@ -6864,48 +6872,48 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
         // we are just allow for a crashed client that fails to release:q
 
         clock_gettime(CLOCK_REALTIME, &tp);
-        time_curr = tp.tv_sec + tp.tv_nsec / 1e9;
-
-#ifdef HAVE_PTHREAD
-        pthread_mutex_lock(&cookie_lock);
-#endif
+        double time_curr = tp.tv_sec + tp.tv_nsec / 1e9;
 
         if (cookie_save[0] != 0 && (strcmp(cookie_save, cookie) == 0)
                 && (time_curr - time_last_used < 1))  // then we will deny the request
         {
-            printf("Cookie %s in use\n", cookie_save);
             rig_debug(RIG_DEBUG_ERR, "%s(%d): %s cookie is in use\n", __FILE__, __LINE__,
                       cookie_save);
-#ifdef HAVE_PTHREAD
-            pthread_mutex_unlock(&cookie_lock);
-#endif
-            return -RIG_BUSBUSY;
+            ret = -RIG_BUSBUSY;
         }
-
-
-        if (cookie_save[0] != 0)
+        else
         {
-            rig_debug(RIG_DEBUG_ERR,
+            if (cookie_save[0] != 0)
+            {
+                rig_debug(RIG_DEBUG_ERR,
                       "%s(%d): %s cookie has expired after %.3f seconds....overriding with new cookie\n",
                       __FILE__, __LINE__, cookie_save, time_curr - time_last_used);
+            }
+
+            date_strget(cookie, cookie_len);
+            size_t len = strlen(cookie);
+            // add on our random number to ensure uniqueness
+            // The cookie should never be longer then HAMLIB_COOKIE_SIZE
+            snprintf(cookie + len, HAMLIB_COOKIE_SIZE - len, " %d\n", rand());
+            strcpy(cookie_save, cookie);
+            time_last_used = time_curr;
+            rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s new cookie request granted\n",
+                    __FILE__, __LINE__, cookie_save);
+            ret = RIG_OK;
         }
+        break;
 
-        date_strget(cookie_save, sizeof(cookie_save));
-        // add on our random number to ensure uniqueness
-        snprintf(cookie, cookie_len, "%s %d\n", cookie_save, rand());
-        strcpy(cookie_save, cookie);
-        time_last_used = time_curr;
-        rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s new cookie request granted\n",
-                  __FILE__, __LINE__, cookie_save);
-#ifdef HAVE_PTHREAD
-        pthread_mutex_unlock(&cookie_lock);
-#endif
-        return RIG_OK;
+    default:
+        rig_debug(RIG_DEBUG_ERR, "%s(%d): unknown cmd!!\n'", __FILE__, __LINE__);
+        ret = -RIG_EPROTO;
         break;
     }
 
-    rig_debug(RIG_DEBUG_ERR, "%s(%d): unknown cmd!!\n'", __FILE__, __LINE__);
-    return -RIG_EPROTO;
+#ifdef HAVE_PTHREAD
+    pthread_mutex_unlock(&cookie_lock);
+#endif
+    return ret;
+
 }
 
 HAMLIB_EXPORT(void) sync_callback(int lock)
diff --git a/tests/testcookie.c b/tests/testcookie.c
index bdb22e7b..94c5fa65 100644
--- a/tests/testcookie.c
+++ b/tests/testcookie.c
@@ -1,7 +1,7 @@
 #include <hamlib/rig.h>
 
 // GET tests
-int test1()
+static int test1()
 {
     int retcode;
     // Normal get
@@ -45,7 +45,7 @@ int test1()
 }
 
 // RENEW tests
-int test2()
+static int test2()
 {
     int retcode;
     char cookie[HAMLIB_COOKIE_SIZE];
@@ -72,9 +72,61 @@ int test2()
     if (retcode != RIG_OK) { printf("Test#2d OK\n"); }
     else {printf("Test#2d Failed cookie=%s\n", cookie); return 1;}
 
+// release cookie2 again to clean up test
+    retcode = rig_cookie(NULL, RIG_COOKIE_RELEASE, cookie2, sizeof(cookie2));
+
+    if (retcode == RIG_OK) { printf("Test#2e OK\n"); }
+    else {printf("Test#2e Failed\n"); return 1;}
     return 0;
 }
 
+// Input sanity checks
+static int test3_invalid_input()
+{
+    int retcode;
+    char cookie[HAMLIB_COOKIE_SIZE];
+    /* Make sure any value smaller then HAMLIB_COOKIE_SIZE is rejected */
+    for(unsigned int i = 0; i < HAMLIB_COOKIE_SIZE; i++)
+    {
+        retcode = rig_cookie(NULL, RIG_COOKIE_GET, cookie, i);
+        if (retcode == -RIG_EINVAL) { printf("Test#3a OK\n"); }
+        else {printf("Test#3a Failed\n"); return 1;}
+    }
+
+    /* Make sure a NULL cookie is ignored */
+    retcode = rig_cookie(NULL, RIG_COOKIE_GET, NULL, sizeof(cookie));
+    if (retcode == -RIG_EINVAL) { printf("Test#3b OK\n"); }
+    else {printf("Test#3b Failed\n"); return 1;}
+
+    /* Make sure an invalid command is dropped with proto error */
+    retcode = rig_cookie(NULL, RIG_COOKIE_RENEW + 1, cookie, sizeof(cookie));
+    if (retcode == -RIG_EPROTO) { printf("Test#3c OK\n"); }
+    else {printf("Test#3c Failed\n"); return 1;}
+
+    return 0;
+}
+
+static int test4_large_cookie_size()
+{
+    int retcode;
+    char cookie[HAMLIB_COOKIE_SIZE * 2];
+
+    /* Using a larger cookie should also work */
+    retcode = rig_cookie(NULL, RIG_COOKIE_GET, cookie, sizeof(cookie));
+    if (retcode == RIG_OK) { printf("Test#4a OK\n"); }
+    else {printf("Test#4a Failed\n"); return 1;}
+
+    /* Cookie should be smaller the maximum specified by lib */
+    if (strlen(cookie) < HAMLIB_COOKIE_SIZE) { printf("Test#4b OK\n"); }
+    else {printf("Test#4b Failed\n"); return 1;}
+
+    /* Release the cookie again to clean up */
+    retcode = rig_cookie(NULL, RIG_COOKIE_RELEASE, cookie, sizeof(cookie));
+    if (retcode == RIG_OK) { printf("Test#4c OK\n"); }
+    else {printf("Test#4c Failed\n"); return 1;}
+
+    return 0;
+}
 
 int main()
 {
@@ -84,5 +136,9 @@ int main()
 
     if (test2()) { return 1; }
 
+    if (test3_invalid_input()) { return 1; }
+
+    if (test4_large_cookie_size()) { return 1; }
+
     return 0;
 }

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

Summary of changes:
 configure.ac          |  5 +--
 rigs/adat/adat.c      |  2 +-
 rigs/icom/icom.c      |  5 ++-
 rigs/icom/icom.h      |  2 +-
 rigs/yaesu/yaesu.c    |  6 ++--
 src/rig.c             | 84 ++++++++++++++++++++++++++++-----------------------
 tests/rigctld.c       | 20 ++++++------
 tests/rigtestlibusb.c | 12 ++++++--
 tests/testcookie.c    | 60 ++++++++++++++++++++++++++++++++++--
 9 files changed, 135 insertions(+), 61 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-09-20 16:15:09

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  c0c941a9d0d942fe374b607ff48a827c0d15017e (commit)
      from  f7ca1a90fdde989d91fd3edab737751e04734aa7 (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 c0c941a9d0d942fe374b607ff48a827c0d15017e
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 20 11:14:46 2021 -0500

    Update NEWS

diff --git a/NEWS b/NEWS
index 57f1e974..8d172c9d 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,29 @@ Please send Hamlib bug reports to ham...@li...
 Version 4.4
         * 2021-??-??
         * Icom rigs now default filter 2 when setting PKTUSB but user can override 
+        * Fix FTDX9000 meter readings
+
+Version 4.3.1
+        * 2021-09-14
+        * Bug fix release
+            - Do not do vfo_fixup on satmode rigs
+            - Fix compilation of misc.c with gmtime_r replacement function for
+              mingw
+            - Fix python build.  For some reason casting tp vfo_t in the
+              RIG_VFO_N macro broke the swig parsing
+            - Append the missing information to build hamlib v4.3 for Android
+              NDK
+            - Change set_icom_set_mode_with_data to not change mode unless
+              necessary
+            - Since Icom rigs default to filter 2 if a filter is not selected
+              we will do the same when turning on data mode
+            - Fix segfault in kenwood_set_vfo
+            - scripts: Update example in readme, since 4.0 817 is 1020
+            - Make testlibusb.c compatible with libusb < 1.0.23
+              Note: On systems with libusb < 1.0.23 a warning will be emmitted
+              but compliation should proceed without error.
+            - Update testlibusb.c warning to "may be" instead of "will be"
+            - Change kenwood to only set VFOA default on 1st rig_open call
 
 Version 4.3
         * 2021-09-01

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

Summary of changes:
 NEWS | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)


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

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

From: Michael B. <mdb...@us...> - 2021-09-20 05:03:55

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  f7ca1a90fdde989d91fd3edab737751e04734aa7 (commit)
      from  f8db0b2a367f1233aeaca39820d6bbbdf25e024d (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 f7ca1a90fdde989d91fd3edab737751e04734aa7
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 20 00:03:02 2021 -0500

    Fix FTDX9000 METER reading the right way
    https://github.com/Hamlib/Hamlib/issues/755

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 6d9c6ed6..975247b6 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -3740,7 +3740,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
         switch (val.i)
         {
-        case RIG_METER_ALC: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 7 : 1);
+        case RIG_METER_ALC: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 1);
             break;
 
         case RIG_METER_PO:
@@ -3750,21 +3750,21 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
             }
             else
             {
-                snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 8 : 2);
+                snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 2);
             }
 
             break;
 
-        case RIG_METER_SWR:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 9 : 3);
+        case RIG_METER_SWR:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 3);
             break;
 
-        case RIG_METER_COMP: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 6 : 0);
+        case RIG_METER_COMP: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 0);
             break;
 
-        case RIG_METER_IC:   snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 10: 4);
+        case RIG_METER_IC:   snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 4);
             break;
 
-        case RIG_METER_VDD:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 11 : 5);
+        case RIG_METER_VDD:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 5);
             break;
 
             rig_debug(RIG_DEBUG_ERR, "%s: unknown val.i=%d\n", __func__, val.i);
@@ -4590,8 +4590,14 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         {
             RETURNFUNC(-RIG_ENAVAIL);
         }
-
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM3%c", cat_term);
+        if (is_ftdx9000)
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM06%c", cat_term);
+        }
+        else
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM3%c", cat_term);
+        }
         break;
 
     case RIG_LEVEL_VD_METER:
@@ -4599,8 +4605,14 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         {
             RETURNFUNC(-RIG_ENAVAIL);
         }
-
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM8%c", cat_term);
+        if (is_ftdx9000)
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM11%c", cat_term);
+        }
+        else
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM8%c", cat_term);
+        }
         break;
 
     case RIG_LEVEL_ID_METER:
@@ -4608,8 +4620,14 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         {
             RETURNFUNC(-RIG_ENAVAIL);
         }
-
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM7%c", cat_term);
+        if (is_ftdx9000)
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM10%c", cat_term);
+        }
+        else
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM7%c", cat_term);
+        }
         break;
 
     case RIG_LEVEL_ANTIVOX:

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

Summary of changes:
 rigs/yaesu/newcat.c | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-09-20 04:57:20

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  f8db0b2a367f1233aeaca39820d6bbbdf25e024d (commit)
       via  e5aa78c3960c7a197ee86248aa9f18ae9b4fc6ae (commit)
       via  2a93553e58a3c801d7d7d2f7700b600abbee8516 (commit)
       via  d9e1f5aac479abda13950dfed68f286cd7f4af4a (commit)
       via  82785f81dc0427d4641d6137b73f0a6547c78590 (commit)
       via  f029769fb7e3663dc56817e3fa6bf27956f2e956 (commit)
       via  912bfb4d5b510b08493cb18895dfcd7a0dd78eb5 (commit)
       via  1cdc387bc431edcbe87b9b2fe592e5f20e236d0e (commit)
       via  63240f16713082a933bf9af5f018c3c59ae30e60 (commit)
       via  e49693af0859a55e003177f0a582f4ae81a1997e (commit)
       via  c2117ce140fd1ee37f5a8e040c628dc0c92b4a6e (commit)
       via  be3d79ce19da5a639252c3595dec9f1016110cb2 (commit)
       via  696a55a96866fce2d0456a9877a6d6bf7be3ad97 (commit)
       via  1586a92b63be3de34bd1689e9c565112f8b99e2c (commit)
       via  f01a9647d075561d2ee6468bed052cf2d4b50b5d (commit)
       via  17bbd2f6029e37fc77050d68bdbe7bed1a97f2ae (commit)
       via  e81ad71221de8459dde25eeebef406765ffc0619 (commit)
       via  345729421d2b7a19c8f83ffe1a43f5d79855e671 (commit)
       via  7d605c86bdd9d0bf454ced8ae12cc242add6fa4b (commit)
       via  759cbbed3beda49b4ee2f9591b8240ba724c86cc (commit)
       via  90f27ac7aa7a24eeda2c6ca19297f8ad9544c5fd (commit)
       via  34492271bc21c307a5ffbbeff0fbf016fdf8db83 (commit)
      from  ca43bf50da6e8e50f747865ff1a311496943b6b6 (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 f8db0b2a367f1233aeaca39820d6bbbdf25e024d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sun Sep 19 23:56:38 2021 -0500

    Fix FTDX9000 METER readings
    https://github.com/Hamlib/Hamlib/issues/755

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 1f022cc8..6d9c6ed6 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -3740,7 +3740,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
         switch (val.i)
         {
-        case RIG_METER_ALC: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 1);
+        case RIG_METER_ALC: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 7 : 1);
             break;
 
         case RIG_METER_PO:
@@ -3750,21 +3750,21 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
             }
             else
             {
-                snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 2);
+                snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 8 : 2);
             }
 
             break;
 
-        case RIG_METER_SWR:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 3);
+        case RIG_METER_SWR:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 9 : 3);
             break;
 
-        case RIG_METER_COMP: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 0);
+        case RIG_METER_COMP: snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 6 : 0);
             break;
 
-        case RIG_METER_IC:   snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 4);
+        case RIG_METER_IC:   snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 10: 4);
             break;
 
-        case RIG_METER_VDD:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, 5);
+        case RIG_METER_VDD:  snprintf(priv->cmd_str, sizeof(priv->cmd_str), format, is_ftdx9000? 11 : 5);
             break;
 
             rig_debug(RIG_DEBUG_ERR, "%s: unknown val.i=%d\n", __func__, val.i);

commit e5aa78c3960c7a197ee86248aa9f18ae9b4fc6ae
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sun Sep 19 23:49:06 2021 -0500

    Fix FTDX9000 METER_TEMP
    Change return codes for meters to RIG_ENAVAIL
    https://github.com/Hamlib/Hamlib/issues/755

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index c910ecd1..1f022cc8 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -4647,7 +4647,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         }
         else
         {
-            RETURNFUNC(-RIG_EINVAL);
+            RETURNFUNC(-RIG_ENAVAIL);
         }
 
         break;
@@ -4691,7 +4691,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     case RIG_LEVEL_TEMP_METER:
         if (is_ftdx9000)
         {
-            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM11%c", cat_term);
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM14%c", cat_term);
         }
         else if (is_ftdx101d || is_ftdx101mp)
         {
@@ -4699,7 +4699,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         }
         else
         {
-            RETURNFUNC(-RIG_EINVAL);
+            RETURNFUNC(-RIG_ENAVAIL);
         }
 
         break;
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index e71f9ba7..e4c12664 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20210805"
+#define NEWCAT_VER "20210919"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129

commit 2a93553e58a3c801d7d7d2f7700b600abbee8516
Merge: 912bfb4d d9e1f5aa
Author: Michael Black <mdb...@ya...>
Date:   Sun Sep 19 16:15:06 2021 -0500

    Merge pull request #801 from wutje/improve_rig
    
    Improve rig.c checks and documentation


commit d9e1f5aac479abda13950dfed68f286cd7f4af4a
Author: Wouter van Gulik <pa...@gm...>
Date:   Sun Sep 19 22:52:41 2021 +0200

    Fix and document rig_cookie;
    Example in doxygen was wrong.
    Description of parameters was wrong; we return an int so we cannot return
    a NULL.
    NULL check for cookies is needed for all 3 commands so move it up, fixing the
    missing one.
    Length check was wrong; cookie needs to be at least as large as
    HAMLIB_COOKIE_SIZE otherwise subsequent checks will always faila
    Document the 3 cookie commands a bit.

diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 4ab36850..a649a448 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -98,7 +98,7 @@
    constant from a constant number literal using ull */
 // #define CONSTANT_64BIT_FLAG(BIT) (1 << (BIT))
 // #define SWIGLUAHIDE
-/* But this appears to have been fixed so we'll use the correct one now 
+/* But this appears to have been fixed so we'll use the correct one now
    If you have the older version of SWIG comment out this line and use
    the two above */
 // This 1ul definition works on swig 4.0.1 and lua 5.3.5
@@ -774,7 +774,7 @@ typedef enum {
 /**
  * \brief Antenna number
  * \def RIG_ANT_NONE
- * No antenna set yet or unknown 
+ * No antenna set yet or unknown
  */
 /**
  * \brief Antenna conversion macro
@@ -1000,9 +1000,9 @@ enum rig_parm_e {
  *
  */
 enum cookie_e {
-    RIG_COOKIE_GET,
-    RIG_COOKIE_RELEASE,
-    RIG_COOKIE_RENEW,
+    RIG_COOKIE_GET,     /*!< Setup a cookie */
+    RIG_COOKIE_RELEASE, /*!< Release a cookie */
+    RIG_COOKIE_RENEW,   /*!< Renew a cookie */
 };
 
 /**
@@ -1769,7 +1769,7 @@ struct rig_caps {
     // As of 2020-02-12 we know of 5 models from Icom USA, EUR, ITR, TPE, KOR for the IC-9700
     // So we currently have 5 ranges we need to deal with
     // The backend for the model should fill in the label field to explain what model it is
-    // The the IC-9700 in ic7300.c for an example 
+    // The the IC-9700 in ic7300.c for an example
     freq_range_t rx_range_list1[HAMLIB_FRQRANGESIZ];   /*!< Receive frequency range list #1 */
     freq_range_t tx_range_list1[HAMLIB_FRQRANGESIZ];   /*!< Transmit frequency range list #1 */
     freq_range_t rx_range_list2[HAMLIB_FRQRANGESIZ];   /*!< Receive frequency range list #2 */
@@ -2210,7 +2210,7 @@ typedef enum {
 
 /**
  * \brief Rig cache data
- * 
+ *
  * This struct contains all the items we cache at the highest level
  */
 struct rig_cache {
@@ -2230,7 +2230,7 @@ struct rig_cache {
     freq_t freqSubA;  // VFO_SUBA -- only for rigs with dual Sub VFOs
     freq_t freqSubB;  // VFO_SUBB -- only for rigs with dual Sub VFOs
     freq_t freqSubC;  // VFO_SUBC -- only for rigs with 3 Sub VFOs
-    freq_t freqMem;   // VFO_MEM -- last MEM channel 
+    freq_t freqMem;   // VFO_MEM -- last MEM channel
     rmode_t modeMainA;
     rmode_t modeMainB;
     rmode_t modeMainC;
@@ -2347,7 +2347,7 @@ struct rig_state {
     pbwidth_t current_width;    /*!< Passband width currently set */
     vfo_t tx_vfo;               /*!< Tx VFO currently set */
     rmode_t mode_list;              /*!< Complete list of modes for this rig */
-    // mode_list is used by some 
+    // mode_list is used by some
     // so anything added to this structure must be below here
     int transmit;               /*!< rig should be transmitting i.e. hard
                                      wired PTT asserted - used by rigs that
@@ -2501,10 +2501,10 @@ rig_get_vfo HAMLIB_PARAMS((RIG *rig,
 
 extern HAMLIB_EXPORT(int)
 rig_get_vfo_info HAMLIB_PARAMS((RIG *rig,
-                           vfo_t vfo, 
-                           freq_t *freq, 
-                           rmode_t *mode, 
-                           pbwidth_t *width, 
+                           vfo_t vfo,
+                           freq_t *freq,
+                           rmode_t *mode,
+                           pbwidth_t *width,
                            split_t *split,
                            int *satmode));
 
@@ -2904,30 +2904,30 @@ rig_has_scan HAMLIB_PARAMS((RIG *rig,
                             scan_t scan));
 
 extern HAMLIB_EXPORT(int)
-rig_set_channel HAMLIB_PARAMS((RIG *rig, 
+rig_set_channel HAMLIB_PARAMS((RIG *rig,
                                vfo_t vfo,
                                const channel_t *chan)); /* mem */
 extern HAMLIB_EXPORT(int)
-rig_get_channel HAMLIB_PARAMS((RIG *rig, 
+rig_get_channel HAMLIB_PARAMS((RIG *rig,
                                vfo_t vfo,
                                channel_t *chan, int read_only));
 
 extern HAMLIB_EXPORT(int)
-rig_set_chan_all HAMLIB_PARAMS((RIG *rig, 
+rig_set_chan_all HAMLIB_PARAMS((RIG *rig,
                                 vfo_t vfo,
                                 const channel_t chans[]));
 extern HAMLIB_EXPORT(int)
-rig_get_chan_all HAMLIB_PARAMS((RIG *rig, 
+rig_get_chan_all HAMLIB_PARAMS((RIG *rig,
                                 vfo_t vfo,
                                 channel_t chans[]));
 
 extern HAMLIB_EXPORT(int)
-rig_set_chan_all_cb HAMLIB_PARAMS((RIG *rig, 
+rig_set_chan_all_cb HAMLIB_PARAMS((RIG *rig,
                                    vfo_t vfo,
                                    chan_cb_t chan_cb,
                                    rig_ptr_t));
 extern HAMLIB_EXPORT(int)
-rig_get_chan_all_cb HAMLIB_PARAMS((RIG *rig, 
+rig_get_chan_all_cb HAMLIB_PARAMS((RIG *rig,
                                    vfo_t vfo,
                                    chan_cb_t chan_cb,
                                    rig_ptr_t));
@@ -2939,7 +2939,7 @@ rig_set_mem_all_cb HAMLIB_PARAMS((RIG *rig,
                                   confval_cb_t parm_cb,
                                   rig_ptr_t));
 extern HAMLIB_EXPORT(int)
-rig_get_mem_all_cb HAMLIB_PARAMS((RIG *rig, 
+rig_get_mem_all_cb HAMLIB_PARAMS((RIG *rig,
                                   vfo_t vfo,
                                   chan_cb_t chan_cb,
                                   confval_cb_t parm_cb,
diff --git a/src/rig.c b/src/rig.c
index 2763a839..3ef58153 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -6763,17 +6763,27 @@ const char *HAMLIB_API rig_copyright()
 
 /**
  * \brief get a cookie to grab rig control
+ * \param rig   Not used
+ * \param cookie_cmd The command to execute on \a cookie.
+ * \param cookie     The cookie to operate on, cannot be NULL or RIG_EINVAL will be returned.
+ * \param cookie_len The length of the cookie, must be #HAMLIB_COOKIE_SIZE or larger.
+ *
+ * #RIG_COOKIE_GET will set \a cookie with a cookie.
+ * #RIG_COOKIE_RENEW will update the timeout with 1 second.
+ * #RIG_COOKIE_RELEASE will release the cookie and allow a new one to be grabbed.
  *
- * RIG_COOKIE_GET must have cookie=NULL or NULL returned
- * RIG_COOKIE_RENEW must have cookie!=NULL or NULL returned
- * RIG_COOKIE_RELEASE must have cookie!=NULL or NULL returned;
  * Cookies should only be used when needed to keep commands sequenced correctly
  * For example, when setting both VFOA and VFOB frequency and mode
  * Example to wait for cookie, do rig commands, and release
- * while((cookie=rig_cookie(NULL, RIG_COOKIE_GET)) == NULL) hl_usleep(10*1000);
- * set_freq A;set mode A;set freq B;set modeB;
- * rig_cookie(cookie,RIG_COOKIE_RELEASE);
- * if wait!=0 rig_cookie with RIG_COOKIE_GET will wait for the cookie to become available
+ * \code
+ *  while((rig_cookie(NULL, RIG_COOKIE_GET, cookie, sizeof(cookie))) != RIG_OK)
+ *      hl_usleep(10*1000);
+ *
+ *  //Pseudo code
+ *  set_freq A;set mode A;set freq B;set modeB;
+ *
+ *  rig_cookie(NULL, RIG_COOKIE_RELEASE, cookie, sizeof(cookie)));
+ * \endcode
  */
 int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
                           int cookie_len)
@@ -6791,27 +6801,27 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
     static pthread_mutex_t cookie_lock = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
-    if (cookie_len < 27)
+    if (cookie_len < HAMLIB_COOKIE_SIZE)
     {
-        rig_debug(RIG_DEBUG_ERR, "%s(%d): cookie_len < 32 so returning NULL!!\n",
-                  __FILE__, __LINE__);
-        return -RIG_EINTERNAL;
+        rig_debug(RIG_DEBUG_ERR, "%s(%d): cookie_len < %d\n",
+                  __FILE__, __LINE__, HAMLIB_COOKIE_SIZE);
+        return -RIG_EINVAL;
+    }
+
+    if (!cookie)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s(%d): cookie == NULL\n",
+                __FILE__, __LINE__);
+        return -RIG_EINVAL; // nothing to do
     }
 
     switch (cookie_cmd)
     {
     case RIG_COOKIE_RELEASE:
-        if (cookie == NULL)
-        {
-            rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): coookie NULL so nothing to do\n",
-                      __FILE__, __LINE__);
-            return -RIG_EINVAL; // nothing to do
-        }
-
         if (cookie_save[0] != 0
                 && strcmp(cookie, cookie_save) == 0) // matching cookie so we'll clear it
         {
-            rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s coookie released\n",
+            rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s cookie released\n",
                       __FILE__, __LINE__, cookie_save);
             memset(cookie_save, 0, sizeof(cookie_save));
             return RIG_OK;
@@ -6894,7 +6904,7 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
         break;
     }
 
-    rig_debug(RIG_DEBUG_ERR, "%s(%d): unknown condition!!\n'", __FILE__, __LINE__);
+    rig_debug(RIG_DEBUG_ERR, "%s(%d): unknown cmd!!\n'", __FILE__, __LINE__);
     return -RIG_EPROTO;
 }
 

commit 82785f81dc0427d4641d6137b73f0a6547c78590
Author: Wouter van Gulik <pa...@gm...>
Date:   Sun Sep 19 22:18:03 2021 +0200

    Replace RIG_EIO with RIG_EINVAL when checking arguments. RIG == NULL is
    an argument error. A rig not properly inited (caps == NULL) is also an
    invalid argument.

diff --git a/src/rig.c b/src/rig.c
index 36907309..2763a839 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1344,7 +1344,7 @@ int HAMLIB_API rig_set_twiddle(RIG *rig, int seconds)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     rig->state.twiddle_timeout = seconds;
@@ -1369,7 +1369,7 @@ int HAMLIB_API rig_set_uplink(RIG *rig, int val)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     rig->state.uplink = val;
@@ -1395,7 +1395,7 @@ int HAMLIB_API rig_get_twiddle(RIG *rig, int *seconds)
 
     if (CHECK_RIG_ARG(rig) || !seconds)
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     *seconds = rig->state.twiddle_timeout;
@@ -1809,7 +1809,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (rig->state.twiddle_state == TWIDDLE_ON)
@@ -2008,7 +2008,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!freq)
@@ -2252,7 +2252,7 @@ int HAMLIB_API rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     // do not mess with mode while PTT is on
@@ -2354,7 +2354,7 @@ int HAMLIB_API rig_get_mode(RIG *rig,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!mode || !width)
@@ -2654,7 +2654,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     vfo = vfo_fixup(rig, vfo, rig->state.cache.split);
@@ -2779,7 +2779,7 @@ int HAMLIB_API rig_get_vfo(RIG *rig, vfo_t *vfo)
 
     if (CHECK_RIG_ARG(rig) || !vfo)
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!vfo)
@@ -2859,7 +2859,7 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -3149,7 +3149,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!ptt)
@@ -3415,7 +3415,7 @@ int HAMLIB_API rig_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!dcd)
@@ -3530,7 +3530,7 @@ int HAMLIB_API rig_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -3601,7 +3601,7 @@ int HAMLIB_API rig_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!rptr_shift)
@@ -3677,7 +3677,7 @@ int HAMLIB_API rig_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -3747,7 +3747,7 @@ int HAMLIB_API rig_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!rptr_offs)
@@ -3820,7 +3820,7 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
 
@@ -3973,7 +3973,7 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!tx_freq)
@@ -4125,7 +4125,7 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     // do not mess with mode while PTT is on
@@ -4253,7 +4253,7 @@ int HAMLIB_API rig_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!tx_mode || !tx_width)
@@ -4389,7 +4389,7 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -4504,7 +4504,7 @@ int HAMLIB_API rig_get_split_freq_mode(RIG *rig,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!tx_freq || !tx_mode || !tx_width)
@@ -4564,7 +4564,7 @@ int HAMLIB_API rig_set_split_vfo(RIG *rig,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -4694,7 +4694,7 @@ int HAMLIB_API rig_get_split_vfo(RIG *rig,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!split || !tx_vfo)
@@ -4816,7 +4816,7 @@ int HAMLIB_API rig_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -4887,7 +4887,7 @@ int HAMLIB_API rig_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!rit)
@@ -4964,7 +4964,7 @@ int HAMLIB_API rig_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -5035,7 +5035,7 @@ int HAMLIB_API rig_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!xit)
@@ -5112,7 +5112,7 @@ int HAMLIB_API rig_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -5183,7 +5183,7 @@ int HAMLIB_API rig_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!ts)
@@ -5264,7 +5264,7 @@ int HAMLIB_API rig_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -5344,7 +5344,7 @@ int HAMLIB_API rig_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (ant_curr == NULL || ant_tx == NULL || ant_rx == NULL)
@@ -5586,7 +5586,7 @@ int HAMLIB_API rig_set_powerstat(RIG *rig, powerstat_t status)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (rig->caps->set_powerstat == NULL)
@@ -5623,7 +5623,7 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!status)
@@ -5664,7 +5664,7 @@ int HAMLIB_API rig_reset(RIG *rig, reset_t reset)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (rig->caps->reset == NULL)
@@ -5802,7 +5802,7 @@ int HAMLIB_API rig_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -5906,7 +5906,7 @@ int HAMLIB_API rig_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -5977,7 +5977,7 @@ int HAMLIB_API rig_send_dtmf(RIG *rig, vfo_t vfo, const char *digits)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!digits)
@@ -6053,7 +6053,7 @@ int HAMLIB_API rig_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!digits || !length)
@@ -6128,7 +6128,7 @@ int HAMLIB_API rig_send_morse(RIG *rig, vfo_t vfo, const char *msg)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     if (!msg)
@@ -6366,7 +6366,7 @@ int HAMLIB_API rig_send_voice_mem(RIG *rig, vfo_t vfo, int ch)
 
     if CHECK_RIG_ARG(rig)
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     caps = rig->caps;
@@ -6663,7 +6663,7 @@ int HAMLIB_API rig_get_vfo_info(RIG *rig, vfo_t vfo, freq_t *freq,
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     //if (vfo == RIG_VFO_CURR) { vfo = rig->state.current_vfo; }
@@ -6724,7 +6724,7 @@ int HAMLIB_API rig_get_vfo_list(RIG *rig, char *buf, int buflen)
 
     if (CHECK_RIG_ARG(rig))
     {
-        RETURNFUNC(-RIG_EIO);
+        RETURNFUNC(-RIG_EINVAL);
     }
 
     rig_sprintf_vfo(buf, buflen - 1, rig->state.vfo_list);

commit f029769fb7e3663dc56817e3fa6bf27956f2e956
Author: Wouter van Gulik <pa...@gm...>
Date:   Sun Sep 19 22:12:21 2021 +0200

    Add arguments check for rig_get_cache, rig_stop_morse, rig_wait_morse,
    rig_get_range, rig_set_vfo_opt, rig_get_infget_info.

diff --git a/src/rig.c b/src/rig.c
index d85dceb5..36907309 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1596,12 +1596,20 @@ static int set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq)
  *
  * \note All pointers must be given. No pointer can be left at NULL
  *
- * \return RIG_OK
+ * \return RIG_OK if the operation has been successful, otherwise
+ * a negative value if an error occurred (in which case, cause is
+ * set appropriately).
  *
  */
 int rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms_freq,
                   rmode_t *mode, int *cache_ms_mode, pbwidth_t *width, int *cache_ms_width)
 {
+    if (CHECK_RIG_ARG(rig) || !freq || !cache_ms_freq ||
+            !mode || !cache_ms_mode || !width || !cache_ms_width)
+    {
+        RETURNFUNC(-RIG_EINVAL);
+    }
+
     if (rig_need_debug(RIG_DEBUG_CACHE))
     {
         ENTERFUNC;
@@ -6189,6 +6197,11 @@ int HAMLIB_API rig_stop_morse(RIG *rig, vfo_t vfo)
     vfo_t curr_vfo;
 
     ENTERFUNC;
+    if (CHECK_RIG_ARG(rig))
+    {
+        RETURNFUNC(-RIG_EINVAL);
+    }
+
     caps = rig->caps;
 
     if (caps->stop_morse == NULL)
@@ -6287,6 +6300,11 @@ int HAMLIB_API rig_wait_morse(RIG *rig, vfo_t vfo)
     vfo_t curr_vfo;
 
     ENTERFUNC;
+    if (CHECK_RIG_ARG(rig))
+    {
+        RETURNFUNC(-RIG_EINVAL);
+    }
+
     caps = rig->caps;
 
     if (vfo == RIG_VFO_CURR
@@ -6413,6 +6431,11 @@ const freq_range_t *HAMLIB_API rig_get_range(const freq_range_t *range_list,
 {
     int i;
 
+    if (!range_list)
+    {
+        return NULL;
+    }
+
     for (i = 0; i < HAMLIB_FRQRANGESIZ; i++)
     {
         if (range_list[i].startf == 0 && range_list[i].endf == 0)
@@ -6444,6 +6467,11 @@ int HAMLIB_API rig_set_vfo_opt(RIG *rig, int status)
 
     ENTERFUNC;
 
+    if CHECK_RIG_ARG(rig)
+    {
+        RETURNFUNC(-RIG_EINVAL);
+    }
+
     if (rig->caps->set_vfo_opt == NULL)
     {
         RETURNFUNC(-RIG_ENAVAIL);
@@ -6547,6 +6575,11 @@ int HAMLIB_API rig_get_rig_info(RIG *rig, char *response, int max_response_len)
     int rxa, txa, rxb, txb;
     response[0] = 0;
 
+    if (CHECK_RIG_ARG(rig) || !response)
+    {
+        RETURNFUNC(-RIG_EINVAL);
+    }
+
     vfoA = vfo_fixup(rig, RIG_VFO_A, rig->state.cache.split);
     vfoB = vfo_fixup(rig, RIG_VFO_B, rig->state.cache.split);
     ret = rig_get_vfo_info(rig, vfoA, &freqA, &modeA, &widthA, &split, &satmode);

commit 912bfb4d5b510b08493cb18895dfcd7a0dd78eb5
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 18 09:36:29 2021 -0500

    Promote IC781 to stable

diff --git a/rigs/icom/ic781.c b/rigs/icom/ic781.c
index 8350ecbb..78359d8a 100644
--- a/rigs/icom/ic781.c
+++ b/rigs/icom/ic781.c
@@ -66,7 +66,7 @@ const struct rig_caps ic781_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_UNTESTED,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,

commit 1cdc387bc431edcbe87b9b2fe592e5f20e236d0e
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 18 08:45:55 2021 -0500

    Promote Orion Tentec 599 Eagle to stable

diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h
index b6a09186..baa7dc5e 100644
--- a/rigs/tentec/orion.h
+++ b/rigs/tentec/orion.h
@@ -415,7 +415,7 @@ RIG_MODEL(RIG_MODEL_TT599),
 .mfg_name =  "Ten-Tec",
 .version =  BACKEND_VER ".0",
 .copyright =  "LGPL",
-.status =  RIG_STATUS_UNTESTED,
+.status =  RIG_STATUS_STABLE,
 .rig_type =  RIG_TYPE_TRANSCEIVER,
 .ptt_type =  RIG_PTT_RIG,
 .dcd_type =  RIG_DCD_NONE,

commit 63240f16713082a933bf9af5f018c3c59ae30e60
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 18 06:08:16 2021 -0500

    Fix rigtestlibusb test_wrapped_device for libusb-1.0.22 or less

diff --git a/tests/rigtestlibusb.c b/tests/rigtestlibusb.c
index 2dd9d18a..29156cc0 100644
--- a/tests/rigtestlibusb.c
+++ b/tests/rigtestlibusb.c
@@ -312,13 +312,6 @@ static void print_device(libusb_device *dev, libusb_device_handle *handle)
 
 #if defined(ANDROID) && defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION < 0x01000107)
 #warning LIBUSB-1.0.23 or greater is required for Android devices
-static int test_wrapped_device(const char *device_name)
-{
-    (void)device_name;
-    printf("Testing wrapped devices is not supported on your platform\n");
-    return 1;
-}
-#else
 
 #include <errno.h>
 #include <fcntl.h>
@@ -350,6 +343,13 @@ static int test_wrapped_device(const char *device_name)
     close(fd);
     return 0;
 }
+#else
+static int test_wrapped_device(const char *device_name)
+{
+    (void)device_name;
+    printf("Testing wrapped devices is not supported on your platform\n");
+    return 1;
+}
 #endif
 
 int main(int argc, char *argv[])

commit e49693af0859a55e003177f0a582f4ae81a1997e
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 18 06:00:35 2021 -0500

    Update version in flrig.c to match format of all others

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 9d65fe78..cfcf776e 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -144,7 +144,7 @@ const struct rig_caps flrig_caps =
     RIG_MODEL(RIG_MODEL_FLRIG),
     .model_name = "FLRig",
     .mfg_name = "FLRig",
-    .version = "202100914",
+    .version = "202100914.0",
     .copyright = "LGPL",
     .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,

commit c2117ce140fd1ee37f5a8e040c628dc0c92b4a6e
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 17 22:16:10 2021 -0500

    Fix Xiegu spelling in x108g.c

diff --git a/rigs/icom/x108g.c b/rigs/icom/x108g.c
index f8f64208..77b0da69 100644
--- a/rigs/icom/x108g.c
+++ b/rigs/icom/x108g.c
@@ -8,7 +8,7 @@
  *  If they do the functions below can go back to the icom routines
  *  #1 the response to PTT
  *  #2 the inability to set_dsp_mode
- *  #3 setting splie which impacts 3 routines
+ *  #3 setting split which impacts 3 routines
  *
  *  Copyright (c) 2004-2010 by Stephane Fillod
  *

commit be3d79ce19da5a639252c3595dec9f1016110cb2
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 17 10:09:39 2021 -0500

    Change libusb warning in rigtestlibusb.c to Android-only
    Doesn't appear wrapped usb devices are needed elsewhere

diff --git a/tests/rigtestlibusb.c b/tests/rigtestlibusb.c
index 660420ec..2dd9d18a 100644
--- a/tests/rigtestlibusb.c
+++ b/tests/rigtestlibusb.c
@@ -310,7 +310,15 @@ static void print_device(libusb_device *dev, libusb_device_handle *handle)
     }
 }
 
-#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000107)
+#if defined(ANDROID) && defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION < 0x01000107)
+#warning LIBUSB-1.0.23 or greater is required for Android devices
+static int test_wrapped_device(const char *device_name)
+{
+    (void)device_name;
+    printf("Testing wrapped devices is not supported on your platform\n");
+    return 1;
+}
+#else
 
 #include <errno.h>
 #include <fcntl.h>
@@ -342,14 +350,6 @@ static int test_wrapped_device(const char *device_name)
     close(fd);
     return 0;
 }
-#else
-#warning LIBUSB-1.0.23 may be required in Hamlib > 4.3
-static int test_wrapped_device(const char *device_name)
-{
-    (void)device_name;
-    printf("Testing wrapped devices is not supported on your platform\n");
-    return 1;
-}
 #endif
 
 int main(int argc, char *argv[])

commit 696a55a96866fce2d0456a9877a6d6bf7be3ad97
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 17 09:25:50 2021 -0500

    Promote FTDX10 to stable

diff --git a/rigs/yaesu/ftdx10.c b/rigs/yaesu/ftdx10.c
index 4a911768..7d8d3eed 100644
--- a/rigs/yaesu/ftdx10.c
+++ b/rigs/yaesu/ftdx10.c
@@ -78,7 +78,7 @@ const struct rig_caps ftdx10_caps =
     .mfg_name =           "Yaesu",
     .version =            NEWCAT_VER ".0",
     .copyright =          "LGPL",
-    .status =             RIG_STATUS_ALPHA,
+    .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
     .ptt_type =           RIG_PTT_RIG,
     .dcd_type =           RIG_DCD_NONE,

commit 1586a92b63be3de34bd1689e9c565112f8b99e2c
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 17 09:01:53 2021 -0500

    Prompt FT980 to stable

diff --git a/rigs/yaesu/ft980.h b/rigs/yaesu/ft980.h
index 181f9e43..09605a52 100644
--- a/rigs/yaesu/ft980.h
+++ b/rigs/yaesu/ft980.h
@@ -148,7 +148,7 @@ const struct rig_caps ft980_caps =
     .mfg_name =           "Yaesu",
     .version =            "20200114.0",
     .copyright =          "LGPL",
-    .status =             RIG_STATUS_BETA,
+    .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
     .ptt_type =           RIG_PTT_SERIAL_RTS,
     .dcd_type =           RIG_DCD_NONE,

commit f01a9647d075561d2ee6468bed052cf2d4b50b5d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 17 09:00:23 2021 -0500

    Prompt TenTec Orion to stable

diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h
index 5d2cfb2b..b6a09186 100644
--- a/rigs/tentec/orion.h
+++ b/rigs/tentec/orion.h
@@ -198,7 +198,7 @@ RIG_MODEL(RIG_MODEL_TT565),
 .mfg_name =  "Ten-Tec",
 .version =  BACKEND_VER ".0",
 .copyright =  "LGPL",
-.status =  RIG_STATUS_BETA,
+.status =  RIG_STATUS_STABLE,
 .rig_type =  RIG_TYPE_TRANSCEIVER,
 .ptt_type =  RIG_PTT_RIG,
 .dcd_type =  RIG_DCD_NONE,

commit 17bbd2f6029e37fc77050d68bdbe7bed1a97f2ae
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Thu Sep 16 15:57:37 2021 -0500

    Update version date in ft817.c

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 03070e48..fbf75c5f 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -300,7 +300,7 @@ const struct rig_caps ft817_caps =
     RIG_MODEL(RIG_MODEL_FT817),
     .model_name =          "FT-817",
     .mfg_name =            "Yaesu",
-    .version =             "20210911.0",
+    .version =             "20210916.0",
     .copyright =           "LGPL",
     .status =              RIG_STATUS_STABLE,
     .rig_type =            RIG_TYPE_TRANSCEIVER,

commit e81ad71221de8459dde25eeebef406765ffc0619
Merge: ca43bf50 34572942
Author: Michael Black <mdb...@ya...>
Date:   Thu Sep 16 15:55:58 2021 -0500

    Merge pull request #799 from wutje/ft817_improvements2
    
    FT817 improve reading of mode/freq.


commit 345729421d2b7a19c8f83ffe1a43f5d79855e671
Author: Wouter van Gulik <pa...@gm...>
Date:   Mon Sep 6 21:49:09 2021 +0200

    ft817: Only set the VFO after a successful read.

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 21b059fe..03070e48 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -1370,7 +1370,6 @@ static int ft817_send_icmd(RIG *rig, int index, unsigned char *data)
 static int ft817_get_vfo(RIG *rig, vfo_t *vfo)
 {
     unsigned char c;
-    *vfo = RIG_VFO_B;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__);
 
@@ -1379,7 +1378,14 @@ static int ft817_get_vfo(RIG *rig, vfo_t *vfo)
         return -RIG_EPROTO;
     }
 
-    if ((c & 0x1) == 0) { *vfo = RIG_VFO_A; }
+    if ((c & 0x1) == 0)
+    {
+        *vfo = RIG_VFO_A;
+    }
+    else
+    {
+        *vfo = RIG_VFO_B;
+    }
 
     return RIG_OK;
 }

commit 7d605c86bdd9d0bf454ced8ae12cc242add6fa4b
Author: Wouter van Gulik <pa...@gm...>
Date:   Sun Sep 12 22:16:28 2021 +0200

    Split on/off is used so drop comment saying it is not yet

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index e45f4d9e..21b059fe 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -39,9 +39,6 @@
  *      - received ctcss/dcs matched (yes/no flag)                     TBC
  *
  *   - TX status command returns info that is not used:
- *      - split on/off flag; actually this could have been used
- *        for get_split_vfo, but the flag is valid only when
- *        PTT is ON.
  *      - high swr flag
  *
  * Todo / tocheck list (oz9aec):

commit 759cbbed3beda49b4ee2f9591b8240ba724c86cc
Author: Wouter van Gulik <pa...@gm...>
Date:   Wed Sep 8 22:14:34 2021 +0200

    ft817.c: Improve get_ptt by fetching TX_STATUS explicitly, instead of
    doing a manual cache timeout.
    Also be consistent: if we allow set_ptt to be rejected then also allow
    get_tx_status en get_ptt to be rejected without failing.
    Stop settings ptt_response to -1; it is only set when we got a reply so
    it is a sane value or the default, no need set it again.

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index f53eb299..e45f4d9e 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -1514,22 +1514,33 @@ static int ft817_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
     {
         int n;
         n = ft817_send_cmd(rig, index);
+        if (n < 0 && n != -RIG_ERJCTED)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s: send ptt cmd failed\n", __func__);
+            return n;
+        }
 
-        rig_force_cache_timeout(
-            &((struct ft817_priv_data *)rig->state.priv)->tx_status_tv);
-
+        /* Read TX status it contains the PTT flag.
+         * Use TX_STATUS instead of ft817_get_ptt to skip the cache. */
+        n = ft817_get_status(rig, FT817_NATIVE_CAT_GET_TX_STATUS);
         if (n < 0 && n != -RIG_ERJCTED)
         {
+            rig_debug(RIG_DEBUG_ERR, "%s: get ptt cmd failed\n", __func__);
             return n;
         }
 
-        if (ft817_get_ptt(rig, vfo, &ptt_response) != RIG_OK)
+        /* Should be in cache now! But if above command was rejected
+         * we will still try again here. */
+        n = ft817_get_ptt(rig, vfo, &ptt_response);
+        if (n < 0 && n != -RIG_ERJCTED)
         {
-            ptt_response = -1;
+            rig_debug(RIG_DEBUG_ERR, "%s: get ptt cmd failed\n", __func__);
+            return n;
         }
 
         if (ptt_response != ptt)
         {
+            rig_debug(RIG_DEBUG_TRACE, "%s: ptt not requested level, retry\n", __func__);
             hl_usleep(1000l *
                       FT817_RETRY_DELAY); // Wait before next try. Helps with slower rigs cloning FT817 protocol (e.g. MCHF)
         }

commit 90f27ac7aa7a24eeda2c6ca19297f8ad9544c5fd
Author: Wouter van Gulik <pa...@gm...>
Date:   Wed Sep 8 21:36:24 2021 +0200

    ft817.c: Use ft817_get_ptt instead of open coding it.

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 90ca60cf..f53eb299 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -951,22 +951,26 @@ static int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 static int ft817_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
 {
     struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv;
+    ptt_t ptt;
     int n;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
 
-    if (check_cache_timeout(&p->tx_status_tv))
-        if ((n = ft817_get_status(rig, FT817_NATIVE_CAT_GET_TX_STATUS)) < 0)
-        {
-            return n;
-        }
+    n = ft817_get_ptt(rig, 0, &ptt);
+    if (n != RIG_OK)
+    {
+        return n;
+    }
 
-    if (p->tx_status & 0x80)
+    /* Check if rig is in TX mode */
+    if (ptt == RIG_PTT_OFF)
     {
         // TX status not valid when in RX
         unsigned char c;
 
-        if ((n = ft817_read_eeprom(rig, 0x007a, &c)) < 0) /* get split status */
+        /* Get split status from EEPROM */
+        n = ft817_read_eeprom(rig, 0x7a, &c);
+        if (n != RIG_OK)
         {
             return n;
         }

commit 34492271bc21c307a5ffbbeff0fbf016fdf8db83
Author: Wouter van Gulik <pa...@gm...>
Date:   Wed Sep 8 21:33:02 2021 +0200

    ft817.c: Only get dig mode when needed.
    This improves getting frequency and mode because we can skip reading EEPROM
     if not needed.

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index eda35747..90ca60cf 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -773,14 +773,25 @@ static int ft817_get_status(RIG *rig, int status)
     {
     case FT817_NATIVE_CAT_GET_FREQ_MODE_STATUS:
         {
-            unsigned char dig_mode;
-            if ((n = ft817_read_eeprom(rig, 0x0065, &dig_mode)) < 0)
+            /* Only in digimode we need fetch to extra bits from EEPROM.
+             * This save communication cycle for all other modes.
+             * Because mode and frequency are shared this saves also when
+             * getting the frequency. */
+            switch (p->fm_status[4] & 0x7f)
             {
-                return n;
+                unsigned char dig_mode;
+                case 0x0a:
+                    if ((n = ft817_read_eeprom(rig, 0x0065, &dig_mode)) < 0)
+                    {
+                        return n;
+                    }
+
+                    /* Top 3 bit define the digi mode */
+                    p->dig_mode = dig_mode >> 5;
+
+                default:
+                    break;
             }
-
-            /* Top 3 bit define the digi mode */
-            p->dig_mode = dig_mode >> 5;
         }
         break;
 

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

Summary of changes:
 include/hamlib/rig.h  |  40 ++++++------
 rigs/dummy/flrig.c    |   2 +-
 rigs/icom/ic781.c     |   2 +-
 rigs/icom/x108g.c     |   2 +-
 rigs/tentec/orion.h   |   4 +-
 rigs/yaesu/ft817.c    |  77 ++++++++++++++++-------
 rigs/yaesu/ft980.h    |   2 +-
 rigs/yaesu/ftdx10.c   |   2 +-
 rigs/yaesu/newcat.c   |  18 +++---
 rigs/yaesu/newcat.h   |   2 +-
 src/rig.c             | 171 +++++++++++++++++++++++++++++++-------------------
 tests/rigtestlibusb.c |   4 +-
 12 files changed, 199 insertions(+), 127 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-09-16 12:40:39

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  ca43bf50da6e8e50f747865ff1a311496943b6b6 (commit)
      from  be03885101827781761f3df2537c9283bd630648 (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 ca43bf50da6e8e50f747865ff1a311496943b6b6
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Thu Sep 16 00:03:52 2021 -0500

    Add Makefile.am to simulators

diff --git a/simulators/Makefile.am b/simulators/Makefile.am
new file mode 100644
index 00000000..3e9036cf
--- /dev/null
+++ b/simulators/Makefile.am
@@ -0,0 +1,48 @@
+# Current Autotools documentation suggests that DejaGNU is obsolete
+# and replaced by Autotest.  TODO: implement Autotest
+
+# AUTOMAKE_OPTIONS = dejagnu
+# DEJATOOL = testfreq testbcd testloc rigctl
+
+DISTCLEANFILES = 
+
+bin_PROGRAMS = 
+
+check_PROGRAMS = simelecraft simicom simkenwood simyaesu
+
+simelecraft_SOURCES = simelecraft.c 
+simicom_SOURCES = simicom.c 
+simkenwood_SOURCES = simkenwood.c 
+simyaesu_SOURCES = simyaesu.c 
+
+# include generated include files ahead of any in sources
+#rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) $(AM_CPPFLAGS)
+
+# all the programs need this
+LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS)
+
+simelecraft_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_builddir)/src
+simicom_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
+simkenwood_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
+simyaesu_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
+
+simelecraft_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
+simicom_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
+simkenwood_LDADD = $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
+simyaesu_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
+
+# Linker options
+simelecraft_LDFLAGS = $(WINEXELDFLAGS)
+simicom_LDFLAGS = $(WINEXELDFLAGS)
+simkenwood_LDFLAGS = $(WINEXELDFLAGS)
+simyaesu_LDFLAGS = $(WINEXELDFLAGS)
+
+EXTRA_DIST = 
+
+# Support 'make check' target for simple tests
+#check_SCRIPTS = 
+
+#TESTS = $(check_SCRIPTS)
+
+
+CLEANFILES = simelelecraft simicom simkenwood simyaesu

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

Summary of changes:
 simulators/Makefile.am | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 simulators/Makefile.am


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

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

From: Michael B. <mdb...@us...> - 2021-09-16 05:00:00

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  be03885101827781761f3df2537c9283bd630648 (commit)
       via  12e184a0e8b34a0f76173d49a35d9a88d3ac259d (commit)
       via  388294c3d64095c78dd86901728f76f46e6a3471 (commit)
       via  8cc59cca3b53a923bb450cf97ff948bcaa162a9b (commit)
      from  7561642898e81e72c1a6a2292fec7e35f87bdbee (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 be03885101827781761f3df2537c9283bd630648
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 23:59:31 2021 -0500

    Add Makefile to simulators

diff --git a/Makefile.am b/Makefile.am
index 57e711b7..520d758e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = macros include lib \
 	tests doc
 
 ## Static list of distributed directories.
-DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts rotators/indi \
+DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts rotators/indi simulators\
 	$(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)
 
 # Install any third party macros into our tree for distribution
diff --git a/configure.ac b/configure.ac
index 6aa937e1..21d98847 100644
--- a/configure.ac
+++ b/configure.ac
@@ -870,6 +870,7 @@ tests/Makefile
 scripts/Makefile
 android/Makefile
 amplifiers/elecraft/Makefile
+simulators/Makefile
 hamlib.pc
 ])
 

commit 12e184a0e8b34a0f76173d49a35d9a88d3ac259d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 23:45:16 2021 -0500

    Rename testlibusb to rigtestlibusb to avoid name collisions with other testlibusb.exe files

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 654478e1..7778a378 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@
 # DEJATOOL = testfreq testbcd testloc rigctl
 
 if HAVE_LIBUSB
-    TESTLIBUSB = testlibusb
+    TESTLIBUSB = rigtestlibusb
 else
     TESTLIBUSB =
 endif
@@ -31,7 +31,7 @@ rigswr_SOURCES = rigswr.c
 rigsmtr_SOURCES = rigsmtr.c
 rigmem_SOURCES = rigmem.c memsave.c memload.c memcsv.c
 if HAVE_LIBUSB
-    testlibusb_SOURCES = testlibusb.c
+    rigtestlibusb_SOURCES = rigtestlibusb.c
 endif
 
 # include generated include files ahead of any in sources
@@ -48,7 +48,7 @@ ampctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
 ampctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
 rigctlcom_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 if HAVE_LIBUSB
-    testlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
+    rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
 endif
 
 rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
@@ -60,7 +60,7 @@ ampctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
 rigmem_LDADD = $(LIBXML2_LIBS) $(LDADD)
 rigctlcom_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
 if HAVE_LIBUSB
-    testlibusb_LDADD = $(LIBUSB_LIBS)
+    rigtestlibusb_LDADD = $(LIBUSB_LIBS)
 endif
 
 # Linker options
@@ -75,7 +75,7 @@ rotctld_LDFLAGS = $(WINEXELDFLAGS)
 ampctld_LDFLAGS = $(WINEXELDFLAGS)
 rigctlcom_LDFLAGS = $(WINEXELDFLAGS)
 if HAVE_LIBUSB
-    testlibusb_LDFLAGS = $(WINEXELDFLAGS)
+    rigtestlibusb_LDFLAGS = $(WINEXELDFLAGS)
 endif
 
 
@@ -127,4 +127,4 @@ testcookie.sh:
 	echo './testcookie 1' > testcookie.sh
 	chmod +x ./testcookie.sh
 
-CLEANFILES = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh testlibusb build-w32.sh build-w64.sh build-w64-jtsdk.sh
+CLEANFILES = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh rigtestlibusb build-w32.sh build-w64.sh build-w64-jtsdk.sh
diff --git a/tests/testlibusb.c b/tests/rigtestlibusb.c
similarity index 100%
rename from tests/testlibusb.c
rename to tests/rigtestlibusb.c

commit 388294c3d64095c78dd86901728f76f46e6a3471
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 13:50:31 2021 -0500

    Fix RIG_STATUS_STABLE misspelling

diff --git a/rigs/adat/adt_200a.c b/rigs/adat/adt_200a.c
index 4df5f62e..d8de1f09 100644
--- a/rigs/adat/adt_200a.c
+++ b/rigs/adat/adt_200a.c
@@ -60,7 +60,7 @@ const struct rig_caps adt_200a_caps =
     .mfg_name           =  "ADAT www.adat.ch",
     .version            =  BACKEND_VER ".0",
     .copyright          =  "Frank Goenninger, DG1SBG. License: Creative Commons",
-    .status             =  RIG_STATUS_STAB,
+    .status             =  RIG_STATUS_STABLE,
     .rig_type           =  RIG_TYPE_TRANSCEIVER,
     .ptt_type           =  RIG_PTT_RIG,
     .dcd_type           =  RIG_DCD_NONE,
diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c
index b596edb0..6a14038a 100644
--- a/rigs/alinco/dx77.c
+++ b/rigs/alinco/dx77.c
@@ -163,7 +163,7 @@ const struct rig_caps dx77_caps =
     .mfg_name =         "Alinco",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_STAB,
+    .status =           RIG_STATUS_STABLE,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .ptt_type =         RIG_PTT_NONE,
     .dcd_type =         RIG_DCD_RIG,
diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c
index c64b8083..fa18d8a7 100644
--- a/rigs/alinco/dxsr8.c
+++ b/rigs/alinco/dxsr8.c
@@ -85,7 +85,7 @@ const struct rig_caps dxsr8_caps =
     .mfg_name =         "Alinco",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_STAB,
+    .status =           RIG_STATUS_STABLE,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .ptt_type =         RIG_PTT_RIG,
     .dcd_type =         RIG_DCD_RIG,
diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c
index 08b4300c..f18df2d8 100644
--- a/rigs/aor/ar3000.c
+++ b/rigs/aor/ar3000.c
@@ -76,7 +76,7 @@ const struct rig_caps ar3000a_caps =
     .mfg_name =  "AOR",
     .version =  "20061007.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/aor/ar5000.c b/rigs/aor/ar5000.c
index 63c8e825..93b9493f 100644
--- a/rigs/aor/ar5000.c
+++ b/rigs/aor/ar5000.c
@@ -109,7 +109,7 @@ const struct rig_caps ar5000_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c
index a7cc49a6..6ecaafd7 100644
--- a/rigs/aor/ar7030.c
+++ b/rigs/aor/ar7030.c
@@ -786,7 +786,7 @@ const struct rig_caps ar7030_caps =
     .mfg_name =  "AOR",
     .version =  "20200324.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index 9c0c1e9b..2b5eaa25 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -1776,7 +1776,7 @@ const struct rig_caps ar7030p_caps =
     .mfg_name = "AOR",
     .version = "20200319.0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_STAB,
+    .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_RECEIVER,
 
     .dcd_type = RIG_DCD_RIG,
diff --git a/rigs/aor/ar8000.c b/rigs/aor/ar8000.c
index b105df5c..2a26fb37 100644
--- a/rigs/aor/ar8000.c
+++ b/rigs/aor/ar8000.c
@@ -71,7 +71,7 @@ const struct rig_caps ar8000_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/aor/ar8600.c b/rigs/aor/ar8600.c
index b63d06e1..63c91fc2 100644
--- a/rigs/aor/ar8600.c
+++ b/rigs/aor/ar8600.c
@@ -97,7 +97,7 @@ const struct rig_caps ar8600_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c
index dd00e585..27bc55b8 100644
--- a/rigs/aor/sr2200.c
+++ b/rigs/aor/sr2200.c
@@ -132,7 +132,7 @@ const struct rig_caps sr2200_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c
index 07ea0dc3..942613be 100644
--- a/rigs/barrett/950.c
+++ b/rigs/barrett/950.c
@@ -84,7 +84,7 @@ const struct rig_caps barrett950_caps =
     .mfg_name =         "Barrett",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_STAB,
+    .status =           RIG_STATUS_STABLE,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .targetable_vfo =   RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
     .ptt_type =         RIG_PTT_RIG,
diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c
index 963bd94b..790facd2 100644
--- a/rigs/barrett/barrett.c
+++ b/rigs/barrett/barrett.c
@@ -76,7 +76,7 @@ const struct rig_caps barrett_caps =
     .mfg_name =         "Barrett",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_STAB,
+    .status =           RIG_STATUS_STABLE,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .targetable_vfo =   RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
     .ptt_type =         RIG_PTT_RIG,
diff --git a/rigs/drake/r8a.c b/rigs/drake/r8a.c
index e5a1eb75..aa173514 100644
--- a/rigs/drake/r8a.c
+++ b/rigs/drake/r8a.c
@@ -89,7 +89,7 @@ const struct rig_caps r8a_caps =
     .mfg_name =  "Drake",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic1275.c b/rigs/icom/ic1275.c
index eab89ccb..9d57ee3d 100644
--- a/rigs/icom/ic1275.c
+++ b/rigs/icom/ic1275.c
@@ -51,7 +51,7 @@ const struct rig_caps ic1275_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic275.c b/rigs/icom/ic275.c
index 2e30d3fb..364eaef6 100644
--- a/rigs/icom/ic275.c
+++ b/rigs/icom/ic275.c
@@ -55,7 +55,7 @@ const struct rig_caps ic275_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic475.c b/rigs/icom/ic475.c
index 409946be..209b8551 100644
--- a/rigs/icom/ic475.c
+++ b/rigs/icom/ic475.c
@@ -55,7 +55,7 @@ const struct rig_caps ic475_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
@@ -160,7 +160,7 @@ const struct rig_caps ic575_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c
index 869254a6..8ce54d8a 100644
--- a/rigs/icom/ic7200.c
+++ b/rigs/icom/ic7200.c
@@ -132,7 +132,7 @@ const struct rig_caps ic7200_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/ic735.c b/rigs/icom/ic735.c
index 8085bac6..7266987c 100644
--- a/rigs/icom/ic735.c
+++ b/rigs/icom/ic735.c
@@ -62,7 +62,7 @@ const struct rig_caps ic735_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c
index b7f309b0..3510194e 100644
--- a/rigs/icom/ic751.c
+++ b/rigs/icom/ic751.c
@@ -91,7 +91,7 @@ const struct rig_caps ic751_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG, /* Piexx UX-14px has a PTT option */
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c
index fa537ba5..a1774997 100644
--- a/rigs/icom/ic785x.c
+++ b/rigs/icom/ic785x.c
@@ -244,7 +244,7 @@ const struct rig_caps ic785x_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".1",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr10.c b/rigs/icom/icr10.c
index 4ef52ac5..1fa62a62 100644
--- a/rigs/icom/icr10.c
+++ b/rigs/icom/icr10.c
@@ -62,7 +62,7 @@ const struct rig_caps icr10_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr20.c b/rigs/icom/icr20.c
index cafeee35..d7bbf2b6 100644
--- a/rigs/icom/icr20.c
+++ b/rigs/icom/icr20.c
@@ -62,7 +62,7 @@ const struct rig_caps icr20_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c
index fa2aee99..f3efe570 100644
--- a/rigs/icom/icr6.c
+++ b/rigs/icom/icr6.c
@@ -63,7 +63,7 @@ const struct rig_caps icr6_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c
index 8fec8745..57764ade 100644
--- a/rigs/icom/icr75.c
+++ b/rigs/icom/icr75.c
@@ -114,7 +114,7 @@ const struct rig_caps icr75_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr8500.c b/rigs/icom/icr8500.c
index 39a1d0c6..b819b5e0 100644
--- a/rigs/icom/icr8500.c
+++ b/rigs/icom/icr8500.c
@@ -81,7 +81,7 @@ const struct rig_caps icr8500_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c
index 23c9d5f7..319b7e1a 100644
--- a/rigs/icom/icr9500.c
+++ b/rigs/icom/icr9500.c
@@ -93,7 +93,7 @@ const struct rig_caps icr9500_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/omni.c b/rigs/icom/omni.c
index 6efd3f6d..94a3af05 100644
--- a/rigs/icom/omni.c
+++ b/rigs/icom/omni.c
@@ -70,7 +70,7 @@ const struct rig_caps omnivip_caps =
     .mfg_name =  "Ten-Tec",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,           // Allow program controlled PTT
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/os456.c b/rigs/icom/os456.c
index b7d1b1fc..0bb2f019 100644
--- a/rigs/icom/os456.c
+++ b/rigs/icom/os456.c
@@ -80,7 +80,7 @@ const struct rig_caps os456_caps =
     .mfg_name =  "Optoelectronics",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_SERIAL_CAR,
diff --git a/rigs/icom/os535.c b/rigs/icom/os535.c
index 85680eb1..e8365c2d 100644
--- a/rigs/icom/os535.c
+++ b/rigs/icom/os535.c
@@ -72,7 +72,7 @@ const struct rig_caps os535_caps =
     .mfg_name =  "Optoelectronics",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_SERIAL_CAR,
diff --git a/rigs/jrc/nrd545.c b/rigs/jrc/nrd545.c
index 8b4aa611..f2f54604 100644
--- a/rigs/jrc/nrd545.c
+++ b/rigs/jrc/nrd545.c
@@ -98,7 +98,7 @@ const struct rig_caps nrd545_caps =
     .mfg_name =  "JRC",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/tmd700.c b/rigs/kenwood/tmd700.c
index 5cc79123..0596ae29 100644
--- a/rigs/kenwood/tmd700.c
+++ b/rigs/kenwood/tmd700.c
@@ -102,7 +102,7 @@ const struct rig_caps tmd700_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_MOBILE | RIG_FLAG_APRS | RIG_FLAG_TNC,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c
index ff3c9294..8012f654 100644
--- a/rigs/kenwood/tmd710.c
+++ b/rigs/kenwood/tmd710.c
@@ -253,7 +253,7 @@ const struct rig_caps tmd710_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_MOBILE | RIG_FLAG_APRS | RIG_FLAG_TNC,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/tmv7.c b/rigs/kenwood/tmv7.c
index 12d329ed..718b4bfb 100644
--- a/rigs/kenwood/tmv7.c
+++ b/rigs/kenwood/tmv7.c
@@ -101,7 +101,7 @@ const struct rig_caps tmv7_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_MOBILE,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts140.c b/rigs/kenwood/ts140.c
index c269609d..03ef18e8 100644
--- a/rigs/kenwood/ts140.c
+++ b/rigs/kenwood/ts140.c
@@ -88,7 +88,7 @@ const struct rig_caps ts140_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .port_type =  RIG_PORT_SERIAL,
diff --git a/rigs/kenwood/ts450s.c b/rigs/kenwood/ts450s.c
index fc1683ba..0142763f 100644
--- a/rigs/kenwood/ts450s.c
+++ b/rigs/kenwood/ts450s.c
@@ -129,7 +129,7 @@ const struct rig_caps ts450s_caps =
     .mfg_name   = "Kenwood",
     .version    = BACKEND_VER ".0",
     .copyright  = "LGPL",
-    .status     = RIG_STATUS_STAB,
+    .status     = RIG_STATUS_STABLE,
     .rig_type   = RIG_TYPE_TRANSCEIVER,
     .ptt_type   = RIG_PTT_RIG,
     .dcd_type   = RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index 42385bf4..3fd67cc2 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -1449,7 +1449,7 @@ const struct rig_caps pt8000a_caps =
     .mfg_name = "Hilberling",
     .version = BACKEND_VER ".0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_STAB,
+    .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,
     .ptt_type = RIG_PTT_RIG_MICDATA,
     .dcd_type = RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index 1cb5b633..ed6bc87e 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -264,7 +264,7 @@ const struct rig_caps ts590sg_caps =
     .mfg_name = "Kenwood",
     .version = BACKEND_VER ".0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_STAB,
+    .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,
     .ptt_type = RIG_PTT_RIG_MICDATA,
     .dcd_type = RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts680.c b/rigs/kenwood/ts680.c
index 8a5ebcc9..97545a64 100644
--- a/rigs/kenwood/ts680.c
+++ b/rigs/kenwood/ts680.c
@@ -88,7 +88,7 @@ const struct rig_caps ts680s_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .port_type =  RIG_PORT_SERIAL,
diff --git a/rigs/kenwood/ts850.c b/rigs/kenwood/ts850.c
index 0d53e04b..dbbf53d6 100644
--- a/rigs/kenwood/ts850.c
+++ b/rigs/kenwood/ts850.c
@@ -108,7 +108,7 @@ const struct rig_caps ts850_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c
index 60384058..10d16c93 100644
--- a/rigs/kenwood/ts990s.c
+++ b/rigs/kenwood/ts990s.c
@@ -127,7 +127,7 @@ const struct rig_caps ts990s_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".1",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG_MICDATA,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kit/drt1.c b/rigs/kit/drt1.c
index 468ef509..71d77fd3 100644
--- a/rigs/kit/drt1.c
+++ b/rigs/kit/drt1.c
@@ -100,7 +100,7 @@ const struct rig_caps drt1_caps =
     .mfg_name =  "SAT-Schneider",
     .version =  "20200112.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TUNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/kit/fifisdr.c b/rigs/kit/fifisdr.c
index 614ff868..a223e68c 100644
--- a/rigs/kit/fifisdr.c
+++ b/rigs/kit/fifisdr.c
@@ -133,7 +133,7 @@ const struct rig_caps fifisdr_caps =
     .mfg_name = "FiFi",
     .version = "20200112.0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_STAB,
+    .status = RIG_STATUS_STABLE,
 
     .rig_type = RIG_TYPE_RECEIVER,
     .ptt_type = RIG_PTT_NONE,
diff --git a/rigs/kit/si570avrusb.c b/rigs/kit/si570avrusb.c
index 8f43ce62..d52edd60 100644
--- a/rigs/kit/si570avrusb.c
+++ b/rigs/kit/si570avrusb.c
@@ -162,7 +162,7 @@ const struct rig_caps si570avrusb_caps =
     .mfg_name =     "SoftRock",
     .version =      BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =       RIG_STATUS_STAB,
+    .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TUNER,
     .ptt_type =     RIG_PTT_RIG,
     .dcd_type =     RIG_DCD_NONE,
@@ -239,7 +239,7 @@ const struct rig_caps si570peaberry1_caps =
     .mfg_name =     "AE9RB",
     .version =      BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =       RIG_STATUS_STAB,
+    .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TUNER,
     .ptt_type =     RIG_PTT_RIG,
     .dcd_type =     RIG_DCD_NONE,
@@ -316,7 +316,7 @@ const struct rig_caps si570peaberry2_caps =
     .mfg_name =     "AE9RB",
     .version =      BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =       RIG_STATUS_STAB,
+    .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TUNER,
     .ptt_type =     RIG_PTT_RIG,
     .dcd_type =     RIG_DCD_NONE,
@@ -398,7 +398,7 @@ const struct rig_caps si570picusb_caps =
     .mfg_name =     "KTH-SDR kit",
     .version =      BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =       RIG_STATUS_STAB,
+    .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TUNER,
     .ptt_type =     RIG_PTT_NONE,
     .dcd_type =     RIG_DCD_NONE,
diff --git a/rigs/pcr/pcr100.c b/rigs/pcr/pcr100.c
index 617be1ad..ab5a7faf 100644
--- a/rigs/pcr/pcr100.c
+++ b/rigs/pcr/pcr100.c
@@ -64,7 +64,7 @@ const struct rig_caps pcr100_caps =
     .mfg_name       = "Icom",
     .version        = BACKEND_VER ".0",
     .copyright      = "LGPL",
-    .status         = RIG_STATUS_STAB,
+    .status         = RIG_STATUS_STABLE,
 
     .rig_type       = RIG_TYPE_PCRECEIVER,
     .ptt_type       = RIG_PTT_NONE,
diff --git a/rigs/pcr/pcr1000.c b/rigs/pcr/pcr1000.c
index 4ce2bb65..1b7d7559 100644
--- a/rigs/pcr/pcr1000.c
+++ b/rigs/pcr/pcr1000.c
@@ -57,7 +57,7 @@ const struct rig_caps pcr1000_caps =
     .mfg_name       = "Icom",
     .version        = BACKEND_VER ".0",
     .copyright      = "LGPL",
-    .status         = RIG_STATUS_STAB,
+    .status         = RIG_STATUS_STABLE,
 
     .rig_type       = RIG_TYPE_PCRECEIVER,
     .ptt_type       = RIG_PTT_NONE,
diff --git a/rigs/pcr/pcr1500.c b/rigs/pcr/pcr1500.c
index 308db8fd..f15c2617 100644
--- a/rigs/pcr/pcr1500.c
+++ b/rigs/pcr/pcr1500.c
@@ -60,7 +60,7 @@ const struct rig_caps pcr1500_caps =
     .mfg_name       = "Icom",
     .version        = BACKEND_VER ".0",
     .copyright      = "LGPL",
-    .status         = RIG_STATUS_STAB,
+    .status         = RIG_STATUS_STABLE,
 
     .rig_type       = RIG_TYPE_PCRECEIVER,
     .ptt_type       = RIG_PTT_NONE,
diff --git a/rigs/pcr/pcr2500.c b/rigs/pcr/pcr2500.c
index 2d5cd0de..00b19964 100644
--- a/rigs/pcr/pcr2500.c
+++ b/rigs/pcr/pcr2500.c
@@ -69,7 +69,7 @@ const struct rig_caps pcr2500_caps =
     .mfg_name       = "Icom",
     .version        = BACKEND_VER ".0",
     .copyright      = "LGPL",
-    .status         = RIG_STATUS_STAB,
+    .status         = RIG_STATUS_STABLE,
 
     .rig_type       = RIG_TYPE_PCRECEIVER,
     .ptt_type       = RIG_PTT_NONE,
diff --git a/rigs/prm80/prm8060.c b/rigs/prm80/prm8060.c
index d7c37c53..93812960 100644
--- a/rigs/prm80/prm8060.c
+++ b/rigs/prm80/prm8060.c
@@ -76,7 +76,7 @@ const struct rig_caps prm8060_caps =
     .mfg_name =  "Philips/Simoco",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/rs/xk2100.c b/rigs/rs/xk2100.c
index 35449d09..6d384d9c 100644
--- a/rigs/rs/xk2100.c
+++ b/rigs/rs/xk2100.c
@@ -77,7 +77,7 @@ const struct rig_caps xk2100_caps =
     .mfg_name = "Rohde&Schwarz",
     .version = BACKEND_VER ".0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_STAB,
+    .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,
     .ptt_type = RIG_PTT_RIG,
     // Need to set RTS on for some reason
diff --git a/rigs/tentec/paragon.c b/rigs/tentec/paragon.c
index 7ce7b036..81ca063f 100644
--- a/rigs/tentec/paragon.c
+++ b/rigs/tentec/paragon.c
@@ -104,7 +104,7 @@ const struct rig_caps tt585_caps =
     .mfg_name =  "Ten-Tec",
     .version =  "20200305.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c
index 200b877b..3b32841e 100644
--- a/rigs/tentec/rx331.c
+++ b/rigs/tentec/rx331.c
@@ -101,7 +101,7 @@ const struct rig_caps rx331_caps =
     .mfg_name =  "Ten-Tec",
     .version =  "20200911.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/tuner/v4l.c b/rigs/tuner/v4l.c
index 8757f4c6..7f67d295 100644
--- a/rigs/tuner/v4l.c
+++ b/rigs/tuner/v4l.c
@@ -76,7 +76,7 @@ const struct rig_caps v4l_caps =
     .mfg_name =  "Video4Linux",
     .version =  "20120107.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_STAB,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_PCRECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/winradio/g303.c b/rigs/winradio/g303.c
index 9fc3c29b..d615fb44 100644
--- a/rigs/winradio/g303.c
+++ b/rigs/winradio/g303.c
@@ -127,7 +127,7 @@ const struct rig_caps g303_caps =
     .mfg_name =       "Winradio",
     .version =        "0.2.1",
     .copyright =      "LGPL", /* This wrapper, not the G3 DLL */
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_PCRECEIVER,
     .port_type =      RIG_PORT_NONE,
     .targetable_vfo =      0,
diff --git a/rigs/winradio/g313-win.c b/rigs/winradio/g313-win.c
index 0ad42ec4..0288825b 100644
--- a/rigs/winradio/g313-win.c
+++ b/rigs/winradio/g313-win.c
@@ -166,7 +166,7 @@ const struct rig_caps g313_caps =
     .mfg_name =       "Winradio",
     .version =        "20191204.0",
     .copyright =        "LGPL", /* This wrapper, not the G313 DLL */
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_PCRECEIVER,
     .port_type =      RIG_PORT_NONE,
     .targetable_vfo =    0,
diff --git a/rigs/yaesu/frg100.c b/rigs/yaesu/frg100.c
index b8b76984..1f459dd2 100644
--- a/rigs/yaesu/frg100.c
+++ b/rigs/yaesu/frg100.c
@@ -159,7 +159,7 @@ const struct rig_caps frg100_caps =
     .mfg_name =           "Yaesu",
     .version =            "20160409.0",
     .copyright =          "LGPL",
-    .status =             RIG_STATUS_STAB,
+    .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_RECEIVER,
     .ptt_type =           RIG_PTT_NONE,
     .dcd_type =           RIG_DCD_NONE,
diff --git a/rigs/yaesu/ft600.c b/rigs/yaesu/ft600.c
index aed57c2c..6cba615a 100644
--- a/rigs/yaesu/ft600.c
+++ b/rigs/yaesu/ft600.c
@@ -241,7 +241,7 @@ const struct rig_caps ft600_caps =
     .mfg_name =       "Yaesu",
     .version =        "20201009.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
     .ptt_type =       RIG_PTT_RIG,
     .dcd_type =       RIG_DCD_NONE,
diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c
index 5cb2a44d..2ecd94d0 100644
--- a/rigs/yaesu/ft747.c
+++ b/rigs/yaesu/ft747.c
@@ -305,7 +305,7 @@ const struct rig_caps ft747_caps =
     .mfg_name =         "Yaesu",
     .version =           "20200323.0",
     .copyright =         "LGPL",
-    .status =            RIG_STATUS_STAB,
+    .status =            RIG_STATUS_STABLE,
     .rig_type =          RIG_TYPE_MOBILE,
     .ptt_type =          RIG_PTT_RIG,
     .dcd_type =          RIG_DCD_NONE,
diff --git a/rigs/yaesu/ft757gx.c b/rigs/yaesu/ft757gx.c
index 846ce4bc..caaec140 100644
--- a/rigs/yaesu/ft757gx.c
+++ b/rigs/yaesu/ft757gx.c
@@ -118,7 +118,7 @@ const struct rig_caps ft757gx_caps =
     .mfg_name =     "Yaesu",
     .version =      "20200325.0",
     .copyright =        "LGPL",
-    .status =       RIG_STATUS_STAB,
+    .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_MOBILE,
     .ptt_type =     RIG_PTT_NONE,
     .dcd_type =     RIG_DCD_NONE,
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index c3f05044..c1577cc7 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -394,7 +394,7 @@ const struct rig_caps ft897d_caps =
     .mfg_name =       "Yaesu",
     .version =        "20210103.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
     .ptt_type =       RIG_PTT_RIG,
     .dcd_type =       RIG_DCD_RIG,
diff --git a/rotators/ars/ars.c b/rotators/ars/ars.c
index c7a85e94..14b78dcf 100644
--- a/rotators/ars/ars.c
+++ b/rotators/ars/ars.c
@@ -716,7 +716,7 @@ const struct rot_caps rci_azel_rot_caps =
     .mfg_name =       "EA4TX",
     .version =        "20200112.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_AZEL,  /* AZ&EL units */
     .port_type =      RIG_PORT_PARALLEL,
     .write_delay =    0,
@@ -750,7 +750,7 @@ const struct rot_caps rci_az_rot_caps =
     .mfg_name =       "EA4TX",
     .version =        "20200112.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_AZIMUTH,    /* AZ-only unit */
     .port_type =      RIG_PORT_PARALLEL,
     .write_delay =    0,
diff --git a/rotators/easycomm/easycomm.c b/rotators/easycomm/easycomm.c
index 7db6e356..7ed80c7f 100644
--- a/rotators/easycomm/easycomm.c
+++ b/rotators/easycomm/easycomm.c
@@ -527,7 +527,7 @@ const struct rot_caps easycomm1_rot_caps =
     .mfg_name =       "Hamlib",
     .version =        "20191206.0",
     .copyright =   "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_OTHER,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =  9600,
@@ -563,7 +563,7 @@ const struct rot_caps easycomm2_rot_caps =
     .mfg_name =       "Hamlib",
     .version =        "20191206.0",
     .copyright =   "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_OTHER,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =  9600,
diff --git a/rotators/ether6/ether6.c b/rotators/ether6/ether6.c
index 3540048c..32eb26e5 100644
--- a/rotators/ether6/ether6.c
+++ b/rotators/ether6/ether6.c
@@ -399,7 +399,7 @@ const struct rot_caps ether6_rot_caps =
     .mfg_name =       "DG9OAA",
     .version =        "20201203.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_FLAG_AZIMUTH,
     .port_type =      RIG_PORT_NETWORK,
     .timeout = 5000,
diff --git a/rotators/gs232a/gs232.c b/rotators/gs232a/gs232.c
index f056f930..acdab916 100644
--- a/rotators/gs232a/gs232.c
+++ b/rotators/gs232a/gs232.c
@@ -245,7 +245,7 @@ const struct rot_caps gs232_generic_rot_caps =
     .mfg_name =       "Various",
     .version =        "20200424.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_AZEL,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =   150,
@@ -356,7 +356,7 @@ const struct rot_caps f1tetracker_rot_caps =
     .mfg_name =       "F1TE",
     .version =        "20200424.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_AZEL,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =   150,
diff --git a/rotators/gs232a/gs232a.c b/rotators/gs232a/gs232a.c
index f8270c46..48e9a6ff 100644
--- a/rotators/gs232a/gs232a.c
+++ b/rotators/gs232a/gs232a.c
@@ -480,7 +480,7 @@ const struct rot_caps gs232a_rot_caps =
     .mfg_name =       "Yaesu",
     .version =        "20201203.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_AZEL,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =   150,
@@ -526,7 +526,7 @@ const struct rot_caps gs232a_az_rot_caps =
     .mfg_name =       "Yaesu",
     .version =        "20201203.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_AZIMUTH,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =   150,
@@ -572,7 +572,7 @@ const struct rot_caps gs232a_el_rot_caps =
     .mfg_name =       "Yaesu",
     .version =        "20201203.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_ELEVATION,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =   150,
diff --git a/rotators/heathkit/hd1780.c b/rotators/heathkit/hd1780.c
index 879ccbc9..4b66337e 100644
--- a/rotators/heathkit/hd1780.c
+++ b/rotators/heathkit/hd1780.c
@@ -69,7 +69,7 @@ const struct rot_caps hd1780_rot_caps =
     .mfg_name =           "Heathkit",
     .version =            "20200112.0",
     .copyright =          "LGPL",
-    .status =             RIG_STATUS_STAB,
+    .status =             RIG_STATUS_STABLE,
     .rot_type =           ROT_TYPE_OTHER,
     .port_type =          RIG_PORT_SERIAL,
     .serial_rate_min =    300,
diff --git a/rotators/radant/radant.c b/rotators/radant/radant.c
index 8b8f4cc1..93db4650 100644
--- a/rotators/radant/radant.c
+++ b/rotators/radant/radant.c
@@ -184,7 +184,7 @@ const struct rot_caps radant_rot_caps =
     .mfg_name =       "Radant",
     .version =        "20210508.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_OTHER,
     .port_type =      RIG_PORT_SERIAL,
     .serial_rate_min =  9600,
diff --git a/rotators/rotorez/rotorez.c b/rotators/rotorez/rotorez.c
index 2a38a5ee..7a3b8e24 100644
--- a/rotators/rotorez/rotorez.c
+++ b/rotators/rotorez/rotorez.c
@@ -137,7 +137,7 @@ const struct rot_caps rotorez_rot_caps =
     .mfg_name =         "Idiom Press",
     .version =          "20100214.0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_STAB,
+    .status =           RIG_STATUS_STABLE,
     .rot_type =         ROT_TYPE_OTHER,
     .port_type =        RIG_PORT_SERIAL,
     .serial_rate_min =  4800,
diff --git a/rotators/ts7400/ts7400.c b/rotators/ts7400/ts7400.c
index d27ce7b4..744cd178 100644
--- a/rotators/ts7400/ts7400.c
+++ b/rotators/ts7400/ts7400.c
@@ -277,7 +277,7 @@ const struct rot_caps ts7400_rot_caps =
     .mfg_name =       "LA7LKA",
     .version =        "20200113.0",
     .copyright =      "LGPL",
-    .status =         RIG_STATUS_STAB,
+    .status =         RIG_STATUS_STABLE,
     .rot_type =       ROT_TYPE_AZEL,
     .port_type =      RIG_PORT_NONE,
 
diff --git a/src/misc.c b/src/misc.c
index 5d969bf0..c4a6e0c0 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -399,7 +399,7 @@ const char *HAMLIB_API rig_strstatus(enum rig_status_e status)
     case RIG_STATUS_UNTESTED:
         return "Untested";
 
-    case RIG_STATUS_STAB:
+    case RIG_STATUS_BETA:
         return "Beta";
 
     case RIG_STATUS_STABLE:

commit 8cc59cca3b53a923bb450cf97ff948bcaa162a9b
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 13:44:42 2021 -0500

    Rigs have been at BETA status forever so promoting all to STABLE

diff --git a/rigs/adat/adt_200a.c b/rigs/adat/adt_200a.c
index c312960e..4df5f62e 100644
--- a/rigs/adat/adt_200a.c
+++ b/rigs/adat/adt_200a.c
@@ -60,7 +60,7 @@ const struct rig_caps adt_200a_caps =
     .mfg_name           =  "ADAT www.adat.ch",
     .version            =  BACKEND_VER ".0",
     .copyright          =  "Frank Goenninger, DG1SBG. License: Creative Commons",
-    .status             =  RIG_STATUS_BETA,
+    .status             =  RIG_STATUS_STAB,
     .rig_type           =  RIG_TYPE_TRANSCEIVER,
     .ptt_type           =  RIG_PTT_RIG,
     .dcd_type           =  RIG_DCD_NONE,
diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c
index 97ab9bac..b596edb0 100644
--- a/rigs/alinco/dx77.c
+++ b/rigs/alinco/dx77.c
@@ -163,7 +163,7 @@ const struct rig_caps dx77_caps =
     .mfg_name =         "Alinco",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_BETA,
+    .status =           RIG_STATUS_STAB,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .ptt_type =         RIG_PTT_NONE,
     .dcd_type =         RIG_DCD_RIG,
diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c
index 82eab0ea..c64b8083 100644
--- a/rigs/alinco/dxsr8.c
+++ b/rigs/alinco/dxsr8.c
@@ -85,7 +85,7 @@ const struct rig_caps dxsr8_caps =
     .mfg_name =         "Alinco",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_BETA,
+    .status =           RIG_STATUS_STAB,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .ptt_type =         RIG_PTT_RIG,
     .dcd_type =         RIG_DCD_RIG,
diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c
index b962ada0..08b4300c 100644
--- a/rigs/aor/ar3000.c
+++ b/rigs/aor/ar3000.c
@@ -76,7 +76,7 @@ const struct rig_caps ar3000a_caps =
     .mfg_name =  "AOR",
     .version =  "20061007.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/aor/ar5000.c b/rigs/aor/ar5000.c
index e9dd1992..63c8e825 100644
--- a/rigs/aor/ar5000.c
+++ b/rigs/aor/ar5000.c
@@ -109,7 +109,7 @@ const struct rig_caps ar5000_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c
index 2a932479..a7cc49a6 100644
--- a/rigs/aor/ar7030.c
+++ b/rigs/aor/ar7030.c
@@ -786,7 +786,7 @@ const struct rig_caps ar7030_caps =
     .mfg_name =  "AOR",
     .version =  "20200324.0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index 8ae78cf9..9c0c1e9b 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -1776,7 +1776,7 @@ const struct rig_caps ar7030p_caps =
     .mfg_name = "AOR",
     .version = "20200319.0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_BETA,
+    .status = RIG_STATUS_STAB,
     .rig_type = RIG_TYPE_RECEIVER,
 
     .dcd_type = RIG_DCD_RIG,
diff --git a/rigs/aor/ar8000.c b/rigs/aor/ar8000.c
index 7f066fc1..b105df5c 100644
--- a/rigs/aor/ar8000.c
+++ b/rigs/aor/ar8000.c
@@ -71,7 +71,7 @@ const struct rig_caps ar8000_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/aor/ar8600.c b/rigs/aor/ar8600.c
index c4237c59..b63d06e1 100644
--- a/rigs/aor/ar8600.c
+++ b/rigs/aor/ar8600.c
@@ -97,7 +97,7 @@ const struct rig_caps ar8600_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c
index 63033e05..dd00e585 100644
--- a/rigs/aor/sr2200.c
+++ b/rigs/aor/sr2200.c
@@ -132,7 +132,7 @@ const struct rig_caps sr2200_caps =
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c
index 62e5ee90..07ea0dc3 100644
--- a/rigs/barrett/950.c
+++ b/rigs/barrett/950.c
@@ -84,7 +84,7 @@ const struct rig_caps barrett950_caps =
     .mfg_name =         "Barrett",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_BETA,
+    .status =           RIG_STATUS_STAB,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .targetable_vfo =   RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
     .ptt_type =         RIG_PTT_RIG,
diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c
index 1494c80e..963bd94b 100644
--- a/rigs/barrett/barrett.c
+++ b/rigs/barrett/barrett.c
@@ -76,7 +76,7 @@ const struct rig_caps barrett_caps =
     .mfg_name =         "Barrett",
     .version =          BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =           RIG_STATUS_BETA,
+    .status =           RIG_STATUS_STAB,
     .rig_type =         RIG_TYPE_TRANSCEIVER,
     .targetable_vfo =   RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
     .ptt_type =         RIG_PTT_RIG,
diff --git a/rigs/drake/r8a.c b/rigs/drake/r8a.c
index 56a65060..e5a1eb75 100644
--- a/rigs/drake/r8a.c
+++ b/rigs/drake/r8a.c
@@ -89,7 +89,7 @@ const struct rig_caps r8a_caps =
     .mfg_name =  "Drake",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic1275.c b/rigs/icom/ic1275.c
index b13bb346..eab89ccb 100644
--- a/rigs/icom/ic1275.c
+++ b/rigs/icom/ic1275.c
@@ -51,7 +51,7 @@ const struct rig_caps ic1275_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic275.c b/rigs/icom/ic275.c
index 661641b7..2e30d3fb 100644
--- a/rigs/icom/ic275.c
+++ b/rigs/icom/ic275.c
@@ -55,7 +55,7 @@ const struct rig_caps ic275_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic475.c b/rigs/icom/ic475.c
index 77e48884..409946be 100644
--- a/rigs/icom/ic475.c
+++ b/rigs/icom/ic475.c
@@ -55,7 +55,7 @@ const struct rig_caps ic475_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
@@ -160,7 +160,7 @@ const struct rig_caps ic575_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c
index ee48205e..869254a6 100644
--- a/rigs/icom/ic7200.c
+++ b/rigs/icom/ic7200.c
@@ -132,7 +132,7 @@ const struct rig_caps ic7200_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/ic735.c b/rigs/icom/ic735.c
index ea88032f..8085bac6 100644
--- a/rigs/icom/ic735.c
+++ b/rigs/icom/ic735.c
@@ -62,7 +62,7 @@ const struct rig_caps ic735_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c
index 707e1d84..b7f309b0 100644
--- a/rigs/icom/ic751.c
+++ b/rigs/icom/ic751.c
@@ -91,7 +91,7 @@ const struct rig_caps ic751_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG, /* Piexx UX-14px has a PTT option */
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c
index f33fc691..fa537ba5 100644
--- a/rigs/icom/ic785x.c
+++ b/rigs/icom/ic785x.c
@@ -244,7 +244,7 @@ const struct rig_caps ic785x_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".1",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr10.c b/rigs/icom/icr10.c
index be9cd16f..4ef52ac5 100644
--- a/rigs/icom/icr10.c
+++ b/rigs/icom/icr10.c
@@ -62,7 +62,7 @@ const struct rig_caps icr10_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr20.c b/rigs/icom/icr20.c
index b79fed5e..cafeee35 100644
--- a/rigs/icom/icr20.c
+++ b/rigs/icom/icr20.c
@@ -62,7 +62,7 @@ const struct rig_caps icr20_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c
index 60ba0e1d..fa2aee99 100644
--- a/rigs/icom/icr6.c
+++ b/rigs/icom/icr6.c
@@ -63,7 +63,7 @@ const struct rig_caps icr6_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c
index 4bc8c3a6..8fec8745 100644
--- a/rigs/icom/icr75.c
+++ b/rigs/icom/icr75.c
@@ -114,7 +114,7 @@ const struct rig_caps icr75_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr8500.c b/rigs/icom/icr8500.c
index ae6d1abe..39a1d0c6 100644
--- a/rigs/icom/icr8500.c
+++ b/rigs/icom/icr8500.c
@@ -81,7 +81,7 @@ const struct rig_caps icr8500_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/icr8600.c b/rigs/icom/icr8600.c
index 5cd0cf18..b98a1451 100644
--- a/rigs/icom/icr8600.c
+++ b/rigs/icom/icr8600.c
@@ -156,9 +156,8 @@ 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 } },
+        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 }, .step = {.i = 0}},
         [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}},
         [LVL_SPECTRUM_REF] = {.min = {.f = -20.0f}, .max = {.f = 20.0f}, .step = {.f = 0.5f}},
         [LVL_SPECTRUM_AVG] = {.min = {.i = 0}, .max = {.i = 3}, .step = {.i = 1}},
diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c
index 74b42336..23c9d5f7 100644
--- a/rigs/icom/icr9500.c
+++ b/rigs/icom/icr9500.c
@@ -93,7 +93,7 @@ const struct rig_caps icr9500_caps =
     .mfg_name =  "Icom",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/icom/omni.c b/rigs/icom/omni.c
index 4b782e5e..6efd3f6d 100644
--- a/rigs/icom/omni.c
+++ b/rigs/icom/omni.c
@@ -70,7 +70,7 @@ const struct rig_caps omnivip_caps =
     .mfg_name =  "Ten-Tec",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,           // Allow program controlled PTT
     .dcd_type =  RIG_DCD_NONE,
diff --git a/rigs/icom/os456.c b/rigs/icom/os456.c
index c7152817..b7d1b1fc 100644
--- a/rigs/icom/os456.c
+++ b/rigs/icom/os456.c
@@ -80,7 +80,7 @@ const struct rig_caps os456_caps =
     .mfg_name =  "Optoelectronics",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_SERIAL_CAR,
diff --git a/rigs/icom/os535.c b/rigs/icom/os535.c
index 26df5afe..85680eb1 100644
--- a/rigs/icom/os535.c
+++ b/rigs/icom/os535.c
@@ -72,7 +72,7 @@ const struct rig_caps os535_caps =
     .mfg_name =  "Optoelectronics",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_SERIAL_CAR,
diff --git a/rigs/jrc/nrd545.c b/rigs/jrc/nrd545.c
index ed4ba980..8b4aa611 100644
--- a/rigs/jrc/nrd545.c
+++ b/rigs/jrc/nrd545.c
@@ -98,7 +98,7 @@ const struct rig_caps nrd545_caps =
     .mfg_name =  "JRC",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_RECEIVER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/k2.c b/rigs/kenwood/k2.c
index 331c386d..b7832e6f 100644
--- a/rigs/kenwood/k2.c
+++ b/rigs/kenwood/k2.c
@@ -124,7 +124,7 @@ const struct rig_caps k2_caps =
     .mfg_name =     "Elecraft",
     .version =      BACKEND_VER ".0",
     .copyright =        "LGPL",
-    .status =       RIG_STATUS_BETA,
+    .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TRANSCEIVER,
     .ptt_type =     RIG_PTT_RIG,
     .dcd_type =     RIG_DCD_RIG,
diff --git a/rigs/kenwood/tmd700.c b/rigs/kenwood/tmd700.c
index 13805a6d..5cc79123 100644
--- a/rigs/kenwood/tmd700.c
+++ b/rigs/kenwood/tmd700.c
@@ -102,7 +102,7 @@ const struct rig_caps tmd700_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_MOBILE | RIG_FLAG_APRS | RIG_FLAG_TNC,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c
index 40187b08..ff3c9294 100644
--- a/rigs/kenwood/tmd710.c
+++ b/rigs/kenwood/tmd710.c
@@ -253,7 +253,7 @@ const struct rig_caps tmd710_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_MOBILE | RIG_FLAG_APRS | RIG_FLAG_TNC,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/tmv7.c b/rigs/kenwood/tmv7.c
index 373d6ad5..12d329ed 100644
--- a/rigs/kenwood/tmv7.c
+++ b/rigs/kenwood/tmv7.c
@@ -101,7 +101,7 @@ const struct rig_caps tmv7_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_MOBILE,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts140.c b/rigs/kenwood/ts140.c
index f27b2560..c269609d 100644
--- a/rigs/kenwood/ts140.c
+++ b/rigs/kenwood/ts140.c
@@ -88,7 +88,7 @@ const struct rig_caps ts140_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .port_type =  RIG_PORT_SERIAL,
diff --git a/rigs/kenwood/ts450s.c b/rigs/kenwood/ts450s.c
index 4b6bc4ea..fc1683ba 100644
--- a/rigs/kenwood/ts450s.c
+++ b/rigs/kenwood/ts450s.c
@@ -129,7 +129,7 @@ const struct rig_caps ts450s_caps =
     .mfg_name   = "Kenwood",
     .version    = BACKEND_VER ".0",
     .copyright  = "LGPL",
-    .status     = RIG_STATUS_BETA,
+    .status     = RIG_STATUS_STAB,
     .rig_type   = RIG_TYPE_TRANSCEIVER,
     .ptt_type   = RIG_PTT_RIG,
     .dcd_type   = RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index 112bce34..42385bf4 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -1449,7 +1449,7 @@ const struct rig_caps pt8000a_caps =
     .mfg_name = "Hilberling",
     .version = BACKEND_VER ".0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_BETA,
+    .status = RIG_STATUS_STAB,
     .rig_type = RIG_TYPE_TRANSCEIVER,
     .ptt_type = RIG_PTT_RIG_MICDATA,
     .dcd_type = RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index 61b9be1d..1cb5b633 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -264,7 +264,7 @@ const struct rig_caps ts590sg_caps =
     .mfg_name = "Kenwood",
     .version = BACKEND_VER ".0",
     .copyright = "LGPL",
-    .status = RIG_STATUS_BETA,
+    .status = RIG_STATUS_STAB,
     .rig_type = RIG_TYPE_TRANSCEIVER,
     .ptt_type = RIG_PTT_RIG_MICDATA,
     .dcd_type = RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts680.c b/rigs/kenwood/ts680.c
index b0c64a5c..8a5ebcc9 100644
--- a/rigs/kenwood/ts680.c
+++ b/rigs/kenwood/ts680.c
@@ -88,7 +88,7 @@ const struct rig_caps ts680s_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .port_type =  RIG_PORT_SERIAL,
diff --git a/rigs/kenwood/ts850.c b/rigs/kenwood/ts850.c
index 307de101..0d53e04b 100644
--- a/rigs/kenwood/ts850.c
+++ b/rigs/kenwood/ts850.c
@@ -108,7 +108,7 @@ const struct rig_caps ts850_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c
index 9acc8a96..60384058 100644
--- a/rigs/kenwood/ts990s.c
+++ b/rigs/kenwood/ts990s.c
@@ -127,7 +127,7 @@ const struct rig_caps ts990s_caps =
     .mfg_name =  "Kenwood",
     .version =  BACKEND_VER ".1",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STAB,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
     .ptt_type =  RIG_PTT_RIG_MICDATA,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kit/drt1.c b/rigs/kit/drt1.c
index 5c59ea70..468ef509 100644
--- a/rigs/kit/drt1.c
+++ b/rigs/kit/drt1.c
@@ -100,7 +100,7 @@ const struct rig_caps drt1_caps =
     .mfg_name =  "SAT-Schneider",
     .version =  "20200112.0",
     .copyright =  "LGPL",
-    .status =  RIG_...
 
[truncated message content]

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

From: Michael B. <mdb...@us...> - 2021-09-15 18:42:13

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  7561642898e81e72c1a6a2292fec7e35f87bdbee (commit)
       via  b49d2b6c05881583f9b5d700dcb4a21fc621bd91 (commit)
       via  61785075d3e3dd98da8e8a3d642a513fe47c6b68 (commit)
       via  25318f6e16a19ccd0360afff1ba6911b0bd59fbb (commit)
       via  efb57f9a108d4754544a8d918e8bb196089bf206 (commit)
       via  9b618b6f477b16a913beea47b5f358f30f7cca15 (commit)
       via  1a7a7a5ae7e5bfae4027016f62a7ee82ed900eae (commit)
       via  8ab0f0167d9ba6f84dafbd82c85f2f7374224c31 (commit)
       via  d60e82c222ce7ee8a1d072c1f8bfbdab494ededc (commit)
       via  c008f2aa5929c8cfc731bdb5f18c604b6c0c25c5 (commit)
       via  16263e83382645a75e29a5a442ac5712bd54a3b2 (commit)
      from  0f2a92b2de7118f303215cccd1188199711a4b4d (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 7561642898e81e72c1a6a2292fec7e35f87bdbee
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 13:36:45 2021 -0500

    Turns out thd72 has a mini USB so may take hardware flow control

diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c
index 7b1577b3..76016bfb 100644
--- a/rigs/kenwood/thd72.c
+++ b/rigs/kenwood/thd72.c
@@ -1642,7 +1642,7 @@ const struct rig_caps thd72a_caps =
     .serial_data_bits =  8,
     .serial_stop_bits =  1,
     .serial_parity =  RIG_PARITY_NONE,
-    .serial_handshake =  RIG_HANDSHAKE_XONXOFF,
+    .serial_handshake =  RIG_HANDSHAKE_HARDWARE,
     .write_delay =  0,
     .post_write_delay =  0,
     .timeout =  300,

commit b49d2b6c05881583f9b5d700dcb4a21fc621bd91
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 10:27:34 2021 -0500

    Add CLOCK_REALTIME flag to cppcheck.sh

diff --git a/cppcheck.sh b/cppcheck.sh
index bba1f980..d71b45ba 100755
--- a/cppcheck.sh
+++ b/cppcheck.sh
@@ -73,6 +73,7 @@ CHECK="\
 -U IPV6_V6ONLY \
 -D SIGINT \
 -D WIN32 \
+-D CLOCK_REALTIME \
 -D HAVE_SIGNAL"
 
 # If no directory or file name provided, scan the entire project.

commit 61785075d3e3dd98da8e8a3d642a513fe47c6b68
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 10:24:42 2021 -0500

    Reduce scope of some vars in sprintflst.c

diff --git a/src/sprintflst.c b/src/sprintflst.c
index 3e3e8ad1..83fbac1f 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -731,13 +731,14 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status)
 int rig_sprintf_spectrum_modes(char *str, int nlen,
                                const enum rig_spectrum_mode_e *modes)
 {
-    int i, len = 0, lentmp;
+    int i, len = 0;
 
     *str = '\0';
 
     for (i = 0; i < HAMLIB_MAX_SPECTRUM_MODES; i++)
     {
         const char *sm;
+        int lentmp;
 
         if (modes[i] == RIG_SPECTRUM_MODE_NONE)
         {
@@ -768,12 +769,14 @@ int rig_sprintf_spectrum_modes(char *str, int nlen,
 
 int rig_sprintf_spectrum_spans(char *str, int nlen, const freq_t *spans)
 {
-    int i, len = 0, lentmp;
+    int i, len = 0;
 
     *str = '\0';
 
     for (i = 0; i < HAMLIB_MAX_SPECTRUM_SPANS; i++)
     {
+        int lentmp;
+
         if (spans[i] == 0)
         {
             break;
@@ -796,12 +799,14 @@ int rig_sprintf_spectrum_spans(char *str, int nlen, const freq_t *spans)
 int rig_sprintf_spectrum_avg_modes(char *str, int nlen,
                                    const struct rig_spectrum_avg_mode *avg_modes)
 {
-    int i, len = 0, lentmp;
+    int i, len = 0;
 
     *str = '\0';
 
     for (i = 0; i < HAMLIB_MAX_SPECTRUM_MODES; i++)
     {
+        int lentmp;
+
         if (avg_modes[i].name == NULL || avg_modes[i].id < 0)
         {
             break;

commit 25318f6e16a19ccd0360afff1ba6911b0bd59fbb
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 10:21:56 2021 -0500

    Remove mandatory libusb requirement in gr_pwin32.m4

diff --git a/macros/gr_pwin32.m4 b/macros/gr_pwin32.m4
index 87920f90..df37e12a 100644
--- a/macros/gr_pwin32.m4
+++ b/macros/gr_pwin32.m4
@@ -22,7 +22,7 @@
 
 AC_DEFUN([GR_PWIN32],
 [
-AC_SEARCH_LIBS([nanosleep], [pthread], [], [AC_MSG_ERROR([unable to find nanosleep])])
+AC_SEARCH_LIBS([nanosleep], [pthread])
 AC_CHECK_HEADERS([pthread.h])
 AC_CHECK_HEADERS([sys/types.h])
 AC_CHECK_HEADERS([windows.h])

commit efb57f9a108d4754544a8d918e8bb196089bf206
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 15 08:57:34 2021 -0500

    Change hardware flow back to xonxoff for THD72
    Promote all TH rigs to stable

diff --git a/rigs/kenwood/thd7.c b/rigs/kenwood/thd7.c
index ccfdf9ff..61e96995 100644
--- a/rigs/kenwood/thd7.c
+++ b/rigs/kenwood/thd7.c
@@ -88,7 +88,7 @@ const struct rig_caps thd7a_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_HANDHELD | RIG_FLAG_APRS | RIG_FLAG_TNC | RIG_FLAG_DXCLUSTER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c
index 76016bfb..7b1577b3 100644
--- a/rigs/kenwood/thd72.c
+++ b/rigs/kenwood/thd72.c
@@ -1642,7 +1642,7 @@ const struct rig_caps thd72a_caps =
     .serial_data_bits =  8,
     .serial_stop_bits =  1,
     .serial_parity =  RIG_PARITY_NONE,
-    .serial_handshake =  RIG_HANDSHAKE_HARDWARE,
+    .serial_handshake =  RIG_HANDSHAKE_XONXOFF,
     .write_delay =  0,
     .post_write_delay =  0,
     .timeout =  300,
diff --git a/rigs/kenwood/thf6a.c b/rigs/kenwood/thf6a.c
index d7eb1513..d3ac49dd 100644
--- a/rigs/kenwood/thf6a.c
+++ b/rigs/kenwood/thf6a.c
@@ -124,7 +124,7 @@ const struct rig_caps thf6a_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_HANDHELD,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/thf7.c b/rigs/kenwood/thf7.c
index eda15a8d..f1d395d7 100644
--- a/rigs/kenwood/thf7.c
+++ b/rigs/kenwood/thf7.c
@@ -118,7 +118,7 @@ const struct rig_caps thf7e_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_HANDHELD,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
diff --git a/rigs/kenwood/thg71.c b/rigs/kenwood/thg71.c
index 332b09de..0cf46337 100644
--- a/rigs/kenwood/thg71.c
+++ b/rigs/kenwood/thg71.c
@@ -92,7 +92,7 @@ const struct rig_caps thg71_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_HANDHELD,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,

commit 9b618b6f477b16a913beea47b5f358f30f7cca15
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 14 22:18:35 2021 -0500

    Patch from Stephen McCallum for THD72 change to hardware flow

diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c
index 03948ed8..76016bfb 100644
--- a/rigs/kenwood/thd72.c
+++ b/rigs/kenwood/thd72.c
@@ -1632,7 +1632,7 @@ const struct rig_caps thd72a_caps =
     .mfg_name =  "Kenwood",
     .version =  TH_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_HANDHELD | RIG_FLAG_APRS | RIG_FLAG_TNC | RIG_FLAG_DXCLUSTER,
     .ptt_type =  RIG_PTT_RIG,
     .dcd_type =  RIG_DCD_RIG,
@@ -1642,7 +1642,7 @@ const struct rig_caps thd72a_caps =
     .serial_data_bits =  8,
     .serial_stop_bits =  1,
     .serial_parity =  RIG_PARITY_NONE,
-    .serial_handshake =  RIG_HANDSHAKE_XONXOFF,
+    .serial_handshake =  RIG_HANDSHAKE_HARDWARE,
     .write_delay =  0,
     .post_write_delay =  0,
     .timeout =  300,

commit 1a7a7a5ae7e5bfae4027016f62a7ee82ed900eae
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 14 11:29:07 2021 -0500

    Fix flrig modeMap loop to ignore NULL entries
    https://github.com/Hamlib/Hamlib/issues/798

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 96b226f2..9d65fe78 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -673,6 +673,7 @@ static const char *modeMapGetFLRig(rmode_t modeHamlib)
 
     for (i = 0; modeMap[i].mode_hamlib != 0; ++i)
     {
+        if (modeMap[i].mode_flrig == NULL) continue;
         rig_debug(RIG_DEBUG_TRACE,
                   "%s: checking modeMap[%d]=%.0f to modeHamlib=%.0f, mode_flrig='%s'\n", __func__,
                   i, (double)modeMap[i].mode_hamlib, (double)modeHamlib, modeMap[i].mode_flrig);

commit 8ab0f0167d9ba6f84dafbd82c85f2f7374224c31
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 14 10:02:21 2021 -0500

    Make flrig compatible with older versions e.g. 1.3.42 on RPi
    https://github.com/Hamlib/Hamlib/issues/798

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index d5864d92..96b226f2 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -144,7 +144,7 @@ const struct rig_caps flrig_caps =
     RIG_MODEL(RIG_MODEL_FLRIG),
     .model_name = "FLRig",
     .mfg_name = "FLRig",
-    .version = "202100911",
+    .version = "202100914",
     .copyright = "LGPL",
     .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,
@@ -796,12 +796,12 @@ static int flrig_open(RIG *rig)
 
     if (retval != RIG_OK)
     {
-        rig_debug(RIG_DEBUG_ERR, "%s: get_version failed: %s\n", __func__,
+        rig_debug(RIG_DEBUG_ERR, "%s: get_version failed: %s\nAssuming version < 1.3.54", __func__,
                   rigerror(retval));
-        RETURNFUNC(retval);
+        // we fall through and assume old version
     }
 
-    int v1, v2, v3, v4;
+    int v1=0, v2=0, v3=0, v4=0;
     sscanf(value, "%d.%d.%d.%d", &v1, &v2, &v3, &v4);
 
     if (v1 >= 1 && v2 >= 3 && v3 >= 54)

commit d60e82c222ce7ee8a1d072c1f8bfbdab494ededc
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 13 17:41:53 2021 -0500

    Reduce scope of vars in rig.c

diff --git a/src/rig.c b/src/rig.c
index 0f750690..d85dceb5 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3131,7 +3131,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
     const struct rig_caps *caps;
     struct rig_state *rs = &rig->state;
     int retcode = RIG_OK;
-    int rc2, status;
+    int status;
     vfo_t curr_vfo;
     int cache_ms;
     int targetable_ptt = 0;
@@ -3226,7 +3226,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
         /* try and revert even if we had an error above */
         if (!targetable_ptt)
         {
-            rc2 = caps->set_vfo(rig, curr_vfo);
+            int rc2 = caps->set_vfo(rig, curr_vfo);
 
             if (RIG_OK == retcode)
             {
@@ -6485,13 +6485,12 @@ const char *HAMLIB_API rig_get_info(RIG *rig)
 static void make_crc_table(unsigned long crcTable[])
 {
     unsigned long POLYNOMIAL = 0xEDB88320;
-    unsigned long remainder;
     unsigned char b = 0;
 
     do
     {
         // Start with the data byte
-        remainder = b;
+        unsigned long remainder = b;
 
         unsigned long bit;
 

commit c008f2aa5929c8cfc731bdb5f18c604b6c0c25c5
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 13 17:39:20 2021 -0500

    Make remove_opened_rig arg in rotator.c const

diff --git a/src/rotator.c b/src/rotator.c
index 8f72ad39..f556f79c 100644
--- a/src/rotator.c
+++ b/src/rotator.c
@@ -124,7 +124,7 @@ static int add_opened_rot(ROT *rot)
 }
 
 
-static int remove_opened_rot(ROT *rot)
+static int remove_opened_rot(const ROT *rot)
 {
     struct opened_rot_l *p, *q;
     q = NULL;

commit 16263e83382645a75e29a5a442ac5712bd54a3b2
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 13 17:38:37 2021 -0500

    Remove shadow var from rig.c

diff --git a/src/rig.c b/src/rig.c
index aeae9f2a..0f750690 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -2117,8 +2117,6 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
         // so we'll just reuse the cache for that condition
         if (*freq == 0)
         {
-            rmode_t mode;
-            pbwidth_t width;
             int freq_ms, mode_ms, width_ms;
             rig_get_cache(rig, vfo, freq, &freq_ms, &mode, &mode_ms, &width, &width_ms);
         }

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

Summary of changes:
 cppcheck.sh          |  1 +
 macros/gr_pwin32.m4  |  2 +-
 rigs/dummy/flrig.c   |  9 +++++----
 rigs/kenwood/thd7.c  |  2 +-
 rigs/kenwood/thd72.c |  4 ++--
 rigs/kenwood/thf6a.c |  2 +-
 rigs/kenwood/thf7.c  |  2 +-
 rigs/kenwood/thg71.c |  2 +-
 src/rig.c            |  9 +++------
 src/rotator.c        |  2 +-
 src/sprintflst.c     | 11 ++++++++---
 11 files changed, 25 insertions(+), 21 deletions(-)


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

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

From: Nate B. <n0...@us...> - 2021-09-13 23:41:27

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  0f2a92b2de7118f303215cccd1188199711a4b4d (commit)
       via  ad2418577a21f9b0f5f422c9113390fdb34e68cf (commit)
       via  e26afead852ce03b5cfd9220ac963e5505cf6f39 (commit)
       via  5f8be97e267e8e527f106c901c147b7fa7e10f6b (commit)
       via  846e12ce6145877a06dc3ba8fb0b42d90df46d49 (commit)
       via  6a13d40b9a4ef253cc7c4b80180f3e6d82737901 (commit)
       via  cc886b46f599d49d32d0da0c6aff639467da075e (commit)
       via  6216d8a2b8692ddced2c0b85389e694f97c51c39 (commit)
       via  e88ef72003fa875cfe827b966fffcb3010f5055d (commit)
       via  b02ea818de7fd6f9f93fbab15ab261140862a871 (commit)
       via  6a79eb3d9a1856a8118a6064a15223ca88ec50cc (commit)
       via  ebc3a592236e5dc48c33d522d565c5a4b22acd80 (commit)
       via  bee3548df23d4635b83d35b897990c34017c9c0d (commit)
       via  699151851f7ba8ec8b34b0328fb3a7ff9aced8fd (commit)
       via  dcb85aa52aec2db2d9e031267882b7f813f224f1 (commit)
       via  90cb1239d17f99368719f1742b8de34727b60dd3 (commit)
       via  86a8e6baf5456185ae642e8becf36838d52c78e2 (commit)
       via  d9db709963bf70706f469b32160c8f3ad0cb613b (commit)
       via  7bae5bbd3d78cd057c45a7e69095cd274fc49032 (commit)
       via  9b15316bd1c5c3cffe908019fc00c11400e4cb39 (commit)
       via  f852b1c6458ba8d8ab1580e1683d7214583bdcc8 (commit)
       via  a7ac90e76e6cf54049d559bb0692de4107b3bd0f (commit)
       via  1b3b5b70c15e75f20e3b12765bcd870dbc9457aa (commit)
       via  c3f9f20aa8b278dbd69991b74d9ec90aff9d01fa (commit)
       via  ecea9da84727d2054f3ada057b047a6ff9724663 (commit)
       via  ec2d5387a745e6eb94210faed12afb55cdeb8d88 (commit)
       via  02f0ae986f97c3ad1fbd5e82229d106a0383bd77 (commit)
       via  644c640da41ee177d2132eaa340d2a48c60d511c (commit)
       via  a85d6891c7fd1ca90d581284131ea0a546619b49 (commit)
       via  6e5bc09b2750025885a24d008da8e8ec8fbc0de9 (commit)
       via  2706cca64982330322d527544dc9ded95439f32f (commit)
       via  a5064bc5d98cabe6b3384df988e0e19ca996b596 (commit)
       via  e21e9b3304c2f5748e83f8beb9005168df8c4a60 (commit)
       via  d39daab0df7416dfc3928666f78aab11c302a7ad (commit)
       via  04b0e6e40c1d71d84b04ff38585317eb504dff37 (commit)
       via  196884e3b1674ca323af0eb6b1d3d416bba001ce (commit)
       via  e911471eae1eb348a4ecd774c30531eff32b6380 (commit)
       via  b5bd1f4036bb42ae8b5c05900f51cec60bf2502e (commit)
       via  84807bc95e3b1e46c3b14ebe49ab3ceb3e24ab59 (commit)
      from  2b3ec3f4bd7d7c80a16cfc5aa2bedf7340fd21a9 (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 0f2a92b2de7118f303215cccd1188199711a4b4d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 13 13:13:12 2021 -0500

    Change kenwood to only set VFOA default on 1st rig_open call
    https://github.com/Hamlib/Hamlib/issues/797

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 7b5ef5ec..b4e981f8 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -962,10 +962,11 @@ int kenwood_open(RIG *rig)
 
             rig->state.rigport.retry = retry_save;
 
-            // Default to 1st VFO and split off
-            if (rig->caps->set_vfo)
+            // Default to 1st VFO and split off -- but only 1 time
+            if (rig->caps->set_vfo && priv->opened == 0)
             {
                 rig_set_vfo(rig, vfo_fixup(rig, RIG_VFO_A, 0));
+                priv->opened = 1;
             }
 
             RETURNFUNC(RIG_OK);
diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h
index e0973afc..801fdb1b 100644
--- a/rigs/kenwood/kenwood.h
+++ b/rigs/kenwood/kenwood.h
@@ -28,7 +28,7 @@
 #include "token.h"
 #include "misc.h"
 
-#define BACKEND_VER "20210829"
+#define BACKEND_VER "20210911"
 
 #define EOM_KEN ';'
 #define EOM_TH '\r'
@@ -165,6 +165,7 @@ struct kenwood_priv_data
     int is_k4d;
     int is_k4hd;
     int no_id;  // if true will not send ID; with every set command
+    int opened; // true once rig_open is called to avoid setting VFOA every open call
 };
 
 

commit ad2418577a21f9b0f5f422c9113390fdb34e68cf
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 13 08:54:27 2021 -0500

    Fix compile warning in ft1000mp.c

diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index cf861651..4460867a 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -310,7 +310,7 @@ const struct rig_caps ft1000mp_caps =
     RIG_MODEL(RIG_MODEL_FT1000MP),
     .model_name =         "FT-1000MP",
     .mfg_name =           "Yaesu",
-    .version =            "20210318.0",
+    .version =            "20210913.0",
     .copyright =          "LGPL",
     .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
@@ -1320,8 +1320,8 @@ static int ft1000mp_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
     default:
         rig_debug(RIG_DEBUG_ERR, "%s: Unsupported set_func %s", __func__,
                   rig_strfunc(func));
-        RETURNFUNC(-RIG_EINVAL);
     }
+    RETURNFUNC(-RIG_EINVAL);
 }
 
 static int ft1000mp_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)

commit e26afead852ce03b5cfd9220ac963e5505cf6f39
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sun Sep 12 23:27:32 2021 -0500

    Add testlibusb to .gitignore

diff --git a/.gitignore b/.gitignore
index f0c6221a..040f0708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ tests/rigsmtr
 tests/rigswr
 tests/rotctl
 tests/rotctld
+tests/testlibusb
 src/hamlibdatetime.h
 .gdbinit
 build/

commit 5f8be97e267e8e527f106c901c147b7fa7e10f6b
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 11:38:44 2021 -0500

    Fix rot_strstatus to use ulong instead of int in sprintflst.c

diff --git a/src/sprintflst.c b/src/sprintflst.c
index faa5dea6..3e3e8ad1 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -702,7 +702,8 @@ int rig_sprintf_scan(char *str, int nlen, scan_t rscan)
 
 int rot_sprintf_status(char *str, int nlen, rot_status_t status)
 {
-    int i, len = 0;
+    int len = 0;
+    unsigned long i;
 
     rig_debug(RIG_DEBUG_TRACE, "%s: status=%08x\n", __func__, status);
     *str = '\0';

commit 846e12ce6145877a06dc3ba8fb0b42d90df46d49
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 11:29:00 2021 -0500

    Fix debug statement in register.c

diff --git a/src/register.c b/src/register.c
index 6d56b130..cbe08764 100644
--- a/src/register.c
+++ b/src/register.c
@@ -302,7 +302,7 @@ int HAMLIB_API rig_check_backend(rig_model_t rig_model)
 
     if (n > 1)
     {
-        rig_debug(RIG_DEBUG_ERR, "%s: rig model %d not found and rig count=%d\n",
+        rig_debug(RIG_DEBUG_ERR, "%s: rig model %u not found and rig count=%d\n",
                   __func__, rig_model, n);
         return -RIG_ENAVAIL;
     }

commit 6a13d40b9a4ef253cc7c4b80180f3e6d82737901
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 11:24:12 2021 -0500

    Reduce scope of var in network.c

diff --git a/src/network.c b/src/network.c
index 591dd635..e6432ea5 100644
--- a/src/network.c
+++ b/src/network.c
@@ -126,10 +126,10 @@ int network_init()
 {
 #ifdef __MINGW32__
     WSADATA wsadata;
-    int ret;
 
     if (wsstarted == 0)
     {
+        int ret;
         ret = WSAStartup(MAKEWORD(1, 1), &wsadata);
 
         if (ret == 0)

commit cc886b46f599d49d32d0da0c6aff639467da075e
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 11:13:23 2021 -0500

    Make parse_hoststr delcaration match implementation

diff --git a/src/misc.h b/src/misc.h
index 4b8f5fc4..a685384a 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -108,7 +108,7 @@ extern HAMLIB_EXPORT(double) elapsed_ms(struct timespec *start, int start_flag);
 
 extern HAMLIB_EXPORT(vfo_t) vfo_fixup(RIG *rig, vfo_t vfo, split_t split);
 
-extern HAMLIB_EXPORT(int) parse_hoststr(char *host, char hoststr[256], char port[6]);
+extern HAMLIB_EXPORT(int) parse_hoststr(char *hoststr, char host[256], char port[6]);
 
 extern HAMLIB_EXPORT(uint32_t) CRC32_function(uint8_t *buf, uint32_t len);
 

commit 6216d8a2b8692ddced2c0b85389e694f97c51c39
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 11:10:30 2021 -0500

    Add some const declarations to microham.c

diff --git a/src/microham.c b/src/microham.c
index d393e488..e757f685 100644
--- a/src/microham.c
+++ b/src/microham.c
@@ -404,7 +404,7 @@ static int incontrol = 0;
 static unsigned char controlstring[256];
 static int numcontrolbytes = 0;
 
-static void parseFrame(unsigned char *frame)
+static void parseFrame(const unsigned char *frame)
 {
     unsigned char byte;
     FRAME("RCV frame %02x %02x %02x %02x\n", frame[0], frame[1], frame[2],
@@ -519,7 +519,7 @@ static void parseFrame(unsigned char *frame)
 //
 // Send radio bytes to microHam device
 //
-static void writeRadio(unsigned char *bytes, int len)
+static void writeRadio(const unsigned char *bytes, int len)
 {
     unsigned char seq[4];
     int i;
@@ -606,7 +606,7 @@ static void writeFlags()
 //
 // Send bytes to the WinKeyer within microHam device
 //
-static void writeWkey(unsigned char *bytes, int len)
+static void writeWkey(const unsigned char *bytes, int len)
 {
     unsigned char seq[12];
     int i;
@@ -665,7 +665,7 @@ static void writeWkey(unsigned char *bytes, int len)
 //
 // Write a control string to the microHam device
 //
-static void writeControl(unsigned char *data, int len)
+static void writeControl(const unsigned char *data, int len)
 {
     int i;
     unsigned char seq[8];
@@ -1078,7 +1078,7 @@ static void start_thread()
         return;
     }
 
-    TRACE("Started daemonized thread reading microHam\n");
+    //TRACE("Started daemonized thread reading microHam\n");
 #endif
 // if we do not have pthreads, this function does nothing.
 }

commit e88ef72003fa875cfe827b966fffcb3010f5055d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 11:04:13 2021 -0500

    Reduce scope of var in misc.c

diff --git a/src/misc.c b/src/misc.c
index 76121037..c4a6e0c0 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -2326,13 +2326,14 @@ void errmsg(int err, char *s, const char *func, const char *file, int line)
 uint32_t CRC32_function(uint8_t *buf, uint32_t len)
 {
 
-    uint32_t val, crc;
+    uint32_t crc;
     uint8_t i;
 
     crc = 0xFFFFFFFF;
 
     while (len--)
     {
+        uint32_t val;
         val = (crc^*buf++) & 0xFF;
 
         for (i = 0; i < 8; i++)

commit b02ea818de7fd6f9f93fbab15ab261140862a871
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:44:28 2021 -0500

    Add const declaration to amplifier.c

diff --git a/src/amplifier.c b/src/amplifier.c
index c56364e0..c6e05694 100644
--- a/src/amplifier.c
+++ b/src/amplifier.c
@@ -103,7 +103,7 @@ static int add_opened_amp(AMP *amp)
 }
 
 
-static int remove_opened_amp(AMP *amp)
+static int remove_opened_amp(const AMP *amp)
 {
     struct opened_amp_l *p, *q;
     q = NULL;

commit 6a79eb3d9a1856a8118a6064a15223ca88ec50cc
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:43:36 2021 -0500

    Remove duplicate line from simyaesu.c

diff --git a/simulators/simyaesu.c b/simulators/simyaesu.c
index ed0080c6..1e24d0fe 100644
--- a/simulators/simyaesu.c
+++ b/simulators/simyaesu.c
@@ -142,7 +142,6 @@ int main(int argc, char *argv[])
             usleep(50 * 1000);
             int id = NC_RIGID_FTDX3000;
             snprintf(buf, sizeof(buf), "ID%03d;", id);
-            n = snprintf(buf, sizeof(buf), "ID%03d;", id);
             n = write(fd, buf, strlen(buf));
             printf("n=%d\n", n);
 

commit ebc3a592236e5dc48c33d522d565c5a4b22acd80
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:42:48 2021 -0500

    Remove unused vars from simkenwood.c

diff --git a/simulators/simkenwood.c b/simulators/simkenwood.c
index e90360c1..1879bfb0 100644
--- a/simulators/simkenwood.c
+++ b/simulators/simkenwood.c
@@ -97,7 +97,6 @@ int main(int argc, char *argv[])
     int n;
     int fd = openPort(argv[1]);
     int freqa = 14074000, freqb = 140735000;
-    int modea = 0, modeb = 0;
 
     while (1)
     {

commit bee3548df23d4635b83d35b897990c34017c9c0d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:41:44 2021 -0500

    Remove duplicate line in simkenwood.c

diff --git a/simulators/simkenwood.c b/simulators/simkenwood.c
index 9343bb6e..e90360c1 100644
--- a/simulators/simkenwood.c
+++ b/simulators/simkenwood.c
@@ -143,7 +143,6 @@ int main(int argc, char *argv[])
             usleep(50 * 1000);
             int id = 24;
             snprintf(buf, sizeof(buf), "ID%03d;", id);
-            n = snprintf(buf, sizeof(buf), "ID%03d;", id);
             n = write(fd, buf, strlen(buf));
             printf("n=%d\n", n);
 

commit 699151851f7ba8ec8b34b0328fb3a7ff9aced8fd
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:41:01 2021 -0500

    Remove duplicate line in simelecraft.c

diff --git a/simulators/simelecraft.c b/simulators/simelecraft.c
index 2762c4ee..3b0d859c 100644
--- a/simulators/simelecraft.c
+++ b/simulators/simelecraft.c
@@ -143,7 +143,6 @@ int main(int argc, char *argv[])
             usleep(50 * 1000);
             int id = 24;
             snprintf(buf, sizeof(buf), "ID%03d;", id);
-            n = snprintf(buf, sizeof(buf), "ID%03d;", id);
             n = write(fd, buf, strlen(buf));
             printf("n=%d\n", n);
 

commit dcb85aa52aec2db2d9e031267882b7f813f224f1
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:39:51 2021 -0500

    Fix debug print in ft817.c

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 6fc58d71..eda35747 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -303,7 +303,7 @@ const struct rig_caps ft817_caps =
     RIG_MODEL(RIG_MODEL_FT817),
     .model_name =          "FT-817",
     .mfg_name =            "Yaesu",
-    .version =             "20201015.0",
+    .version =             "20210911.0",
     .copyright =           "LGPL",
     .status =              RIG_STATUS_STABLE,
     .rig_type =            RIG_TYPE_TRANSCEIVER,
@@ -1197,7 +1197,7 @@ static int ft818_817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
         break;
 
         default:
-            rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO %d!\n",
+            rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO %0x!\n",
                 __func__, vfo);
             return -RIG_EINTERNAL;
     }

commit 90cb1239d17f99368719f1742b8de34727b60dd3
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:36:32 2021 -0500

    Remove unneeded RETURNFUNC in ft1000mp.c

diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 2f5b1390..cf861651 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -834,7 +834,7 @@ static int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         RETURNFUNC(-RIG_ENIMPL);
 
     default:
-        rig_debug(RIG_DEBUG_WARN, "%s: unknown VFO %d\n", __func__, vfo);
+        rig_debug(RIG_DEBUG_WARN, "%s: unknown VFO %0x\n", __func__, vfo);
         RETURNFUNC(-RIG_EINVAL);
     }
 
@@ -1322,9 +1322,8 @@ static int ft1000mp_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
                   rig_strfunc(func));
         RETURNFUNC(-RIG_EINVAL);
     }
-
-    RETURNFUNC(-RIG_EINVAL);
 }
+
 static int ft1000mp_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 {
     int retval;

commit 86a8e6baf5456185ae642e8becf36838d52c78e2
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:24:42 2021 -0500

    Bump version in rx331.c

diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c
index e9aa8b6f..b476696c 100644
--- a/rigs/tentec/rx331.c
+++ b/rigs/tentec/rx331.c
@@ -99,7 +99,7 @@ const struct rig_caps rx331_caps =
     RIG_MODEL(RIG_MODEL_RX331),
     .model_name = "RX-331",
     .mfg_name =  "Ten-Tec",
-    .version =  "20200323.0",
+    .version =  "20200911.0",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_BETA,
     .rig_type =  RIG_TYPE_RECEIVER,

commit d9db709963bf70706f469b32160c8f3ad0cb613b
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:24:07 2021 -0500

    Remove overlapping union references in rx331.c

diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c
index 3161ad71..e9aa8b6f 100644
--- a/rigs/tentec/rx331.c
+++ b/rigs/tentec/rx331.c
@@ -646,6 +646,7 @@ int rx331_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
     int retval, lvl_len;
+    double f;
     char lvlbuf[BUFSZ];
 
     switch (level)
@@ -779,8 +780,8 @@ int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         {
             return -RIG_EPROTO;
         }
-
-        val->f = 1.0 - (float)(val->i / 120.0);
+        f = val->i / 120.0;
+        val->f = 1.0 - f;
 
         break;
 
@@ -805,7 +806,8 @@ int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             return -RIG_EPROTO;
         }
 
-        val->i = (int)(val->f * 1000.0);
+        f = val->f * 1000.0;
+        val->i = (int)f;
 
         break;
 
@@ -830,7 +832,8 @@ int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             return -RIG_EPROTO;
         }
 
-        val->f = 1.0 - (val->i / 120.0);
+        f = val->i / 120.0;
+        val->f = 1.0 - f;
 
         break;
 
@@ -855,7 +858,8 @@ int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             return -RIG_EPROTO;
         }
 
-        val->i = (val->f *  1000.0);
+        f = val->f * 1000.0;
+        val->i = f;
 
         break;
 
@@ -880,7 +884,8 @@ int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             return -RIG_EPROTO;
         }
 
-        val->i = (val->f *  1000.0);
+        f = val->f * 1000.0;
+        val->i = f;
 
         break;
 

commit 7bae5bbd3d78cd057c45a7e69095cd274fc49032
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:15:44 2021 -0500

    Add const declaration to omnivii.c

diff --git a/rigs/tentec/omnivii.c b/rigs/tentec/omnivii.c
index ec877faf..7a9902ba 100644
--- a/rigs/tentec/omnivii.c
+++ b/rigs/tentec/omnivii.c
@@ -129,7 +129,7 @@ const struct rig_caps tt588_caps =
     RIG_MODEL(RIG_MODEL_TT588),
     .model_name = "TT-588 Omni VII",
     .mfg_name =  "Ten-Tec",
-    .version =  "20200113.0",
+    .version =  "20200911.0",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -258,7 +258,7 @@ static int tt588_rxFilter[] =
    sometimes get things going again, hence this hack, er, function. */
 /* Note: data should be at least data_len+1 long for null byte insertion */
 static int tt588_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
-                             int *data_len)
+                             const int *data_len)
 {
     int i, retval = -RIG_EINTERNAL;
     struct  rig_state *rs = &rig->state;

commit 9b15316bd1c5c3cffe908019fc00c11400e4cb39
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:11:54 2021 -0500

    Remove unneeded clause and add const declaration in jupiter.c

diff --git a/rigs/tentec/jupiter.c b/rigs/tentec/jupiter.c
index 43808be3..a69fe382 100644
--- a/rigs/tentec/jupiter.c
+++ b/rigs/tentec/jupiter.c
@@ -512,7 +512,7 @@ int tt538_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
     unsigned char cmdbuf[16], respbuf[32];
     char ttmode;
     /* Find bandwidth according to response from table. */
-    static int pbwidth[39] =
+    const static int pbwidth[39] =
     {
         8000, 6000, 5700, 5400, 5100, 4800, 4500, 4200,
         3900, 3600, 3300, 3000, 2850, 2700, 2550, 2400,
@@ -594,7 +594,7 @@ int tt538_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 
     rpb = respbuf[1];
 
-    if (rpb >= 0 && rpb <= 38)
+    if (rpb <= 38)
     {
         *width = pbwidth[rpb];
     }

commit f852b1c6458ba8d8ab1580e1683d7214583bdcc8
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 10:09:17 2021 -0500

    Remove unneeded clause from ra37xx.c

diff --git a/rigs/racal/ra37xx.c b/rigs/racal/ra37xx.c
index 6d186621..caca6701 100644
--- a/rigs/racal/ra37xx.c
+++ b/rigs/racal/ra37xx.c
@@ -143,8 +143,7 @@ static int ra37xx_one_transaction(RIG *rig, const char *cmd, char *data,
         }
 
         /* drop other receiver id, and "pause" (empty) packets */
-        if ((priv->receiver_id != -1 && (respbuf[1] - '0') != priv->receiver_id) ||
-                retval == pkt_header_len + 1)
+        if ((priv->receiver_id != -1 && (respbuf[1] - '0') != priv->receiver_id))
         {
             if (!rig_check_cache_timeout(&tv, rs->rigport.timeout))
             {
diff --git a/rigs/racal/ra37xx.h b/rigs/racal/ra37xx.h
index e62ab35e..217e22b8 100644
--- a/rigs/racal/ra37xx.h
+++ b/rigs/racal/ra37xx.h
@@ -26,7 +26,7 @@
 
 
 #undef BACKEND_VER
-#define BACKEND_VER "20200114"
+#define BACKEND_VER "20210911"
 
 extern const struct confparams ra37xx_cfg_params[];
 

commit a7ac90e76e6cf54049d559bb0692de4107b3bd0f
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 09:59:39 2021 -0500

    Add needed return in ts890s.c

diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index 1ee86627..09ea0410 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -224,6 +224,7 @@ int kenwood_ts890_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     default:
         return kenwood_get_level(rig, vfo, level, val);
     }
+    return -RIG_EINTERNAL;
 }
 
 static struct kenwood_priv_caps ts890s_priv_caps =

commit 1b3b5b70c15e75f20e3b12765bcd870dbc9457aa
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 09:58:24 2021 -0500

    Remove overlapping union reference in flex6xxx.c

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 231ee1f9..1938821c 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -919,8 +919,8 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
                       __func__, lvlbuf);
             return -RIG_EPROTO;
         }
-
-        val->f = (val->i + 20.0) / (120.0 - -20.0);
+        n = val->i;
+        val->f = (n + 20.0) / (120.0 - -20.0);
 
         break;
 
@@ -1083,7 +1083,7 @@ const struct rig_caps f6k_caps =
     RIG_MODEL(RIG_MODEL_F6K),
     .model_name =       "6xxx",
     .mfg_name =     "FlexRadio",
-    .version =      "20210527.0",
+    .version =      "20210911.0",
     .copyright =        "LGPL",
     .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TRANSCEIVER,

commit c3f9f20aa8b278dbd69991b74d9ec90aff9d01fa
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 09:56:52 2021 -0500

    Make var const in optoscan.c

diff --git a/rigs/icom/optoscan.c b/rigs/icom/optoscan.c
index 5d844044..85f40852 100644
--- a/rigs/icom/optoscan.c
+++ b/rigs/icom/optoscan.c
@@ -244,7 +244,7 @@ int optoscan_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
 {
     unsigned char dtmfbuf[MAXFRAMELEN], digit;
     int len, digitpos;
-    unsigned char xlate[] = {'0', '1', '2', '3', '4', '5', '6',
+    const unsigned char xlate[] = {'0', '1', '2', '3', '4', '5', '6',
                              '7', '8', '9', 'A', 'B', 'C', 'D',
                              '*', '#'
                             };

commit ecea9da84727d2054f3ada057b047a6ff9724663
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 09:54:19 2021 -0500

    Remove unused value set in icom.c

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 86cda0bc..60daccfa 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -859,7 +859,7 @@ icom_rig_open(RIG *rig)
 int
 icom_rig_close(RIG *rig)
 {
-    int retval = RIG_OK;
+    int retval;
     // Nothing to do yet
     struct rig_state *rs = &rig->state;
     struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;

commit ec2d5387a745e6eb94210faed12afb55cdeb8d88
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 09:53:17 2021 -0500

    Remove shadowed declaration from icom.c

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index eb437f46..86cda0bc 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -751,7 +751,6 @@ int icom_get_usb_echo_off(RIG *rig)
 
     if (ack_len == 1) // then we got an echo of the cmd
     {
-        struct rig_state *rs = &rig->state;
         unsigned char buf[16];
         priv->serial_USB_echo_off = 0;
         rig_debug(RIG_DEBUG_VERBOSE, "%s: USB echo on detected\n", __func__);

commit 02f0ae986f97c3ad1fbd5e82229d106a0383bd77
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 09:48:36 2021 -0500

    Remove always true clause from icom.c

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 0b95757b..eb437f46 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -8247,7 +8247,7 @@ static int icom_parse_spectrum_frame(RIG *rig, int length,
     // The first byte indicates spectrum scope ID/VFO: 0 = Main, 1 = Sub
     int spectrum_id = frame_data[0];
 
-    if (spectrum_id < 0 || spectrum_id >= priv->spectrum_scope_count)
+    if (spectrum_id >= priv->spectrum_scope_count)
     {
         rig_debug(RIG_DEBUG_ERR, "%s: invalid spectrum scope ID from CI-V frame: %d\n",
                   __func__, spectrum_id);

commit 644c640da41ee177d2132eaa340d2a48c60d511c
Merge: a85d6891 196884e3
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 08:14:41 2021 -0500

    Merge branch 'master' of https://github.com/Hamlib/Hamlib


commit a85d6891c7fd1ca90d581284131ea0a546619b49
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 05:43:19 2021 -0500

    Fix return path in icom.c

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 733a7910..0b95757b 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -6948,6 +6948,7 @@ int icom_set_parm(RIG *rig, setting_t parm, value_t val)
                   rig_strparm(parm));
         RETURNFUNC(-RIG_EINVAL);
     }
+    RETURNFUNC(-RIG_EINVAL);
 }
 
 /*

commit 6e5bc09b2750025885a24d008da8e8ec8fbc0de9
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 05:41:25 2021 -0500

    Fix potential buffer underflow in icom.c

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index d889ca57..733a7910 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1824,6 +1824,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
         rig_debug(RIG_DEBUG_TRACE, "%s: mode/width not changing\n", __func__);
         RETURNFUNC(RIG_OK);
     }
+
     // looks like we need to change it
 
     switch (mode)
@@ -8494,6 +8495,13 @@ int icom_decode_event(RIG *rig)
 
     frm_len = retval;
 
+    if (frm_len < 1)
+    {
+        rig_debug(RIG_DEBUG_ERR, "Unexpected frame len=%d\n", frm_len);
+        RETURNFUNC(-RIG_EPROTO);
+    }
+
+
     switch (buf[frm_len - 1])
     {
     case COL:
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 96637003..9127b6e2 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210907"
+#define BACKEND_VER "20210911"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

commit 2706cca64982330322d527544dc9ded95439f32f
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 05:38:25 2021 -0500

    Fix potential buffer underflow in icom frame.c

diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index 6880df8a..79c67c7c 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -294,6 +294,12 @@ read_another_frame:
 
     frm_len = retval;
 
+    if (frm_len < 1)
+    {
+        rig_debug(RIG_DEBUG_ERR, "Unexpected frame len=%d\n", frm_len);
+        RETURNFUNC(-RIG_EPROTO);
+    }
+
     switch (buf[frm_len - 1])
     {
     case COL:

commit a5064bc5d98cabe6b3384df988e0e19ca996b596
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 05:35:05 2021 -0500

    Fix shadow variable in flrig.c

diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index 672c5f7b..af065b60 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -756,7 +756,6 @@ static int netrigctl_open(RIG *rig)
             }
             else if (strcmp(setting, "ctcss_list") == 0)
             {
-                int i;
                 int n;
                 double ctcss[CTCSS_LIST_SIZE];
                 rig->caps->ctcss_list = calloc(CTCSS_LIST_SIZE, sizeof(tone_t));
@@ -768,7 +767,6 @@ static int netrigctl_open(RIG *rig)
             }
             else if (strcmp(setting, "dcs_list") == 0)
             {
-                int i;
                 int n;
                 int dcs[DCS_LIST_SIZE + 1];
                 rig->caps->dcs_list = calloc(DCS_LIST_SIZE, sizeof(tone_t));

commit e21e9b3304c2f5748e83f8beb9005168df8c4a60
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 05:33:22 2021 -0500

    Reduce if clause in flrig.c

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 49cd998f..d5864d92 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -144,7 +144,7 @@ const struct rig_caps flrig_caps =
     RIG_MODEL(RIG_MODEL_FLRIG),
     .model_name = "FLRig",
     .mfg_name = "FLRig",
-    .version = "202100814",
+    .version = "202100911",
     .copyright = "LGPL",
     .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,
@@ -804,7 +804,7 @@ static int flrig_open(RIG *rig)
     int v1, v2, v3, v4;
     sscanf(value, "%d.%d.%d.%d", &v1, &v2, &v3, &v4);
 
-    if (v1 >= 1 || (v1 >= 1 && v2 >= 3) || (v1 >= 1 && v2 >= 3 && v3 >= 54))
+    if (v1 >= 1 && v2 >= 3 && v3 >= 54)
     {
         priv->has_verify_cmds = 1;
         rig_debug(RIG_DEBUG_VERBOSE, "%s: verify set_vfoA/ptt is available\n",

commit d39daab0df7416dfc3928666f78aab11c302a7ad
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 05:13:40 2021 -0500

    Remove unused function in ar7030p_utils.c

diff --git a/rigs/aor/ar7030p_utils.c b/rigs/aor/ar7030p_utils.c
index 47249152..ba44b277 100644
--- a/rigs/aor/ar7030p_utils.c
+++ b/rigs/aor/ar7030p_utils.c
@@ -947,39 +947,6 @@ int bcd2Int(const unsigned char bcd)
     return (rc);
 }
 
-#ifdef XXREMOVEDXX
-// this function is not referenced anywhere
-/*
- * \brief Convert int into 2 digit BCD number
- *
- * \param int Integer value (0-99)
- *
- * \return 2 digit BCD equivalent (0-99), 0xff on failure
- */
-unsigned char int2BCD(const unsigned int val)
-{
-    unsigned char rc = (unsigned char) 0xff;
-    unsigned char tens = (unsigned char)(val / 10);
-    unsigned char ones = (unsigned char)(val % 10);
-
-    if ((unsigned char) 10 > tens)
-    {
-        rc = (tens << 4);
-
-        if ((unsigned char) 10 > ones)
-        {
-            rc = rc | ones;
-        }
-        else
-        {
-            rc = (unsigned char) 0xff;
-        }
-    }
-
-    return (rc);
-}
-#endif
-
 /*
  * \brief Convert raw AGC value to calibrated level in dBm
  *

commit 04b0e6e40c1d71d84b04ff38585317eb504dff37
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 11 05:10:07 2021 -0500

    Fix responsebuf usage in kpa.c

diff --git a/amplifiers/elecraft/kpa.c b/amplifiers/elecraft/kpa.c
index fa0ed55a..ac14ef0a 100644
--- a/amplifiers/elecraft/kpa.c
+++ b/amplifiers/elecraft/kpa.c
@@ -106,7 +106,6 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
     struct amp_state *rs;
     int err;
     int len = 0;
-    char responsebuf[KPABUFSZ];
     int loop;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%s\n", __func__, cmd);
@@ -127,11 +126,11 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
 
         if (err != RIG_OK) { return err; }
 
-        len = read_string(&rs->ampport, responsebuf, KPABUFSZ, ";", 1);
+        len = read_string(&rs->ampport, response, response_len, ";", 1);
 
         if (len < 0) { return len; }
     }
-    while (--loop > 0 && (len != 1 || responsebuf[0] != ';'));
+    while (--loop > 0 && (len != 1 || response[0] != ';'));
 
     // Now send our command
     err = write_block(&rs->ampport, cmd, strlen(cmd));
@@ -140,8 +139,8 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
 
     if (response) // if response expected get it
     {
-        responsebuf[0] = 0;
-        len = read_string(&rs->ampport, responsebuf, KPABUFSZ, ";", 1);
+        response[0] = 0;
+        len = read_string(&rs->ampport, response, response_len, ";", 1);
 
         if (len < 0)
         {
@@ -151,10 +150,12 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
         }
 
         rig_debug(RIG_DEBUG_VERBOSE, "%s called, response='%s'\n", __func__,
-                  responsebuf);
+                  response);
     }
     else   // if no response expected try to get one
     {
+        char responsebuf[KPABUFSZ];
+        responsebuf[0] = 0;
         loop = 3;
 
         do

commit 196884e3b1674ca323af0eb6b1d3d416bba001ce
Merge: 6d3046e0 e911471e
Author: Michael Black <mdb...@ya...>
Date:   Fri Sep 10 23:31:51 2021 -0500

    Merge pull request #790 from AuroraRAS/keepgoingndk
    
    Fix compile-time errors in Android NDK environment


commit e911471eae1eb348a4ecd774c30531eff32b6380
Author: 小光 <ch...@gm...>
Date:   Tue Sep 7 23:07:41 2021 +0800

    Update README.android

diff --git a/android/README.android b/android/README.android
index 3c6a6228..5d7c94c7 100644
--- a/android/README.android
+++ b/android/README.android
@@ -1,3 +1,6 @@
+Update Note:
+These Android NDK scripts can compile the 4.3 version of hamlib normally, but they may be corrupted as the master branch code is updated. If you encounter compile-time errors, please try to fix them, or choose to recompile with version 4.3.
+
 This is android port of hamlib
 (C) 2012 Ladislav Vaiz <ok...@na...>
 

commit b5bd1f4036bb42ae8b5c05900f51cec60bf2502e
Author: AuroraRAS <ch...@gm...>
Date:   Tue Sep 7 21:30:09 2021 +0800

    Append the missing information to build hamlib v4.3 for Android NDK
    
    The following errors were fixed in this commit:
    error: undefined symbol: rig_sprintf_vfo
    error: undefined symbol: initrots2_radant
    error: undefined symbol: ts890s_caps

diff --git a/Android.mk b/Android.mk
index 8b507a90..e59ea0b8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,3 +48,4 @@ include $(TOP_PATH)/rotators/sartek/Android.mk
 include $(TOP_PATH)/rotators/satel/Android.mk
 include $(TOP_PATH)/rotators/spid/Android.mk
 include $(TOP_PATH)/rotators/ts7400/Android.mk
+include $(TOP_PATH)/rotators/radant/Android.mk
diff --git a/rigs/kenwood/Android.mk b/rigs/kenwood/Android.mk
index 80d20a12..9a7d39c9 100644
--- a/rigs/kenwood/Android.mk
+++ b/rigs/kenwood/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \
 		ts440.c ts940.c ts711.c ts811.c r5000.c \
 		thd7.c thf7.c thg71.c tmd700.c tmv7.c thf6a.c thd72.c tmd710.c \
 		kenwood.c th.c ic10.c elecraft.c transfox.c flex6xxx.c ts990s.c \
-		xg3.c thd74.c flex.c pihpsdr.c
+		xg3.c thd74.c flex.c pihpsdr.c ts890s.c
 LOCAL_MODULE := kenwood
 
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
diff --git a/rotators/radant/Android.mk b/rotators/radant/Android.mk
new file mode 100644
index 00000000..f66b69e9
--- /dev/null
+++ b/rotators/radant/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := radant.c
+LOCAL_MODULE := radant
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H
+LOCAL_C_INCLUDES := android include src
+LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/Android.mk b/src/Android.mk
index 21102426..d4a1f315 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -23,11 +23,12 @@ LOCAL_SRC_FILES := \
         parallel.c \
         debug.c \
         network.c \
-	sleep.c \
-	gpio.c \
-	microham.c \
-	rot_ext.c \
-        cm108.c
+        sleep.c \
+        gpio.c \
+        microham.c \
+        rot_ext.c \
+        cm108.c \
+        sprintflst.c
 
 
 LOCAL_MODULE := libhamlib
@@ -38,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := adat alinco amsat aor ars barrett celestron cnctrk \
         gs232a heathkit icmarine icom ioptron jrc kachina kenwood kit \
         lowe m2 meade pcr prm80 prosistel racal rft \
         rotorez rs sartek satel skanti spid tapr tentec ts7400 tuner \
-        uniden wj yaesu
+        uniden wj yaesu radant
 
 LOCAL_LDLIBS := -llog
 

commit 84807bc95e3b1e46c3b14ebe49ab3ceb3e24ab59
Author: AuroraRAS <ch...@gm...>
Date:   Tue Sep 7 21:12:49 2021 +0800

    Prepare .gitignore file for NDK build

diff --git a/.gitignore b/.gitignore
index 3a47008c..f0c6221a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@ tests/rotctld
 src/hamlibdatetime.h
 .gdbinit
 build/
+libs/
+obj/

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

Summary of changes:
 .gitignore                            |  3 +++
 Android.mk                            |  1 +
 amplifiers/elecraft/kpa.c             | 13 +++++++------
 android/README.android                |  3 +++
 rigs/aor/ar7030p_utils.c              | 33 ---------------------------------
 rigs/dummy/flrig.c                    |  4 ++--
 rigs/dummy/netrigctl.c                |  2 --
 rigs/icom/frame.c                     |  6 ++++++
 rigs/icom/icom.c                      | 14 +++++++++++---
 rigs/icom/icom.h                      |  2 +-
 rigs/icom/optoscan.c                  |  2 +-
 rigs/kenwood/Android.mk               |  2 +-
 rigs/kenwood/flex6xxx.c               |  6 +++---
 rigs/kenwood/kenwood.c                |  5 +++--
 rigs/kenwood/kenwood.h                |  3 ++-
 rigs/kenwood/ts890s.c                 |  1 +
 rigs/racal/ra37xx.c                   |  3 +--
 rigs/racal/ra37xx.h                   |  2 +-
 rigs/tentec/jupiter.c                 |  4 ++--
 rigs/tentec/omnivii.c                 |  4 ++--
 rigs/tentec/rx331.c                   | 19 ++++++++++++-------
 rigs/yaesu/ft1000mp.c                 |  7 +++----
 rigs/yaesu/ft817.c                    |  4 ++--
 rotators/{amsat => radant}/Android.mk |  4 ++--
 simulators/simelecraft.c              |  1 -
 simulators/simkenwood.c               |  2 --
 simulators/simyaesu.c                 |  1 -
 src/Android.mk                        | 13 +++++++------
 src/amplifier.c                       |  2 +-
 src/microham.c                        | 10 +++++-----
 src/misc.c                            |  3 ++-
 src/misc.h                            |  2 +-
 src/network.c                         |  2 +-
 src/register.c                        |  2 +-
 src/sprintflst.c                      |  3 ++-
 35 files changed, 90 insertions(+), 98 deletions(-)
 copy rotators/{amsat => radant}/Android.mk (79%)


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

[Hamlib-commits] Hamlib -- Ham radio control libraries annotated tag 4.3.1 created. 4.3.1

From: Nate B. <n0...@us...> - 2021-09-13 23:31:12

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 annotated tag, 4.3.1 has been created
        at  ec525038c670a3dbf6823680482aa36a6e363929 (tag)
   tagging  bacb20a029593e1980b081124a23ee45f797597b (commit)
  replaces  4.3
 tagged by  Nate Bargmann
        on  Mon Sep 13 18:29:19 2021 -0500

- Log -----------------------------------------------------------------
Hamlib 4.3.1 release
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQSC1k9rDmfNQfaJu6b7LFEw1VqIGQUCYT/e4QAKCRD7LFEw1VqI
GblYAKCkV4s2cAEvhNNmIv0k/3G11TLFwQCfenNeHyvc5MvvdYSLl9w95nomwTw=
=dUlA
-----END PGP SIGNATURE-----

AuroraRAS (2):
      Prepare .gitignore file for NDK build
      Append the missing information to build hamlib v4.3 for Android NDK

Mike Black W9MDB (9):
      Do not do vfo_fixup on satmode rigs https://github.com/Hamlib/Hamlib/issues/782
      Fix compilation of misc.c with gmtime_r replacement function for mingw https://github.com/Hamlib/Hamlib/issues/784
      Fix python build.  For some reason casting tp vfo_t in the RIG_VFO_N macro broke the swig parsing https://github.com/Hamlib/Hamlib/issues/786
      Change set_icom_set_mode_with_data to not change mode unless necessary
      Since Icom rigs default to filter 2 if a filter is not selected we will do the same when turning on data mode https://github.com/Hamlib/Hamlib/issues/791
      Fix segfault in kenwood_set_vfo https://github.com/Hamlib/Hamlib/issues/794
      Make testlibusb.c compatible with libusb < 1.0.23
      Update testlibusb.c warning to "may be" instead of "will be"
      Change kenwood to only set VFOA default on 1st rig_open call https://github.com/Hamlib/Hamlib/issues/797

Nate Bargmann (4):
      Advance configure.ac to version 4.3.1
      Update NEWS for 4.3.1 bug fixes
      Update NEWS for Kenwood VFO fix
      Merge pull request #796 from N0NB/Hamlib-4.3

Wouter van Gulik (1):
      scripts: Update example in readme, since 4.0 817 is 1020

小光 (1):
      Update README.android

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


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

[Hamlib-commits] Hamlib -- Ham radio control libraries branch Hamlib-4.3 updated. 4.3-17-gbacb20a0

From: Nate B. <n0...@us...> - 2021-09-13 23:30:57

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.3 has been updated
       via  bacb20a029593e1980b081124a23ee45f797597b (commit)
       via  c2ed3d6fb3eb10fd985f6078e3512a0d3501a91a (commit)
       via  2b211b43f1bcb99863427f4d953aea561a2b2b71 (commit)
       via  eb00c66aaf6044c963482819939ce4531b9c9efb (commit)
       via  27aecf91da09633c937d70b6b6536865aa7a189c (commit)
       via  c2c72602f31a21dbeed273a94330b873994bd467 (commit)
       via  391aef96cd12843de87f863725a5354b6954902b (commit)
       via  8d31be0ee11d06b5213b49ea5d2906ac4306427b (commit)
       via  36655931dde5df3fe46d4f43a28b68febd7a951b (commit)
       via  53f7c1ed3baad6f70339616130533b6eb280c1ff (commit)
       via  4f760debc3540d7393f198ef1a2f7017a2feced2 (commit)
       via  39bb9c4a92410d79aff56891111762a7bdc8a65a (commit)
       via  17206da434084a745eac24e65470265ee88328dc (commit)
       via  891a550e93f93d9d56b780ac672e65450ac3e3ea (commit)
       via  384f4973468b435e7554fba9faee2f6f3adca9b4 (commit)
       via  267d70c2bfd7cb1979f22fa5d68978cbd98bea71 (commit)
       via  f6dff2576c8b55a6e076cbe3bf492d3f9621e455 (commit)
      from  5a6134b7430126af15fbd4a4baa44acdfc0fa53d (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 bacb20a029593e1980b081124a23ee45f797597b
Merge: 5a6134b7 c2ed3d6f
Author: Nate Bargmann <n0...@n0...>
Date:   Mon Sep 13 18:27:43 2021 -0500

    Merge pull request #796 from N0NB/Hamlib-4.3
    
    Hamlib 4.3


commit c2ed3d6fb3eb10fd985f6078e3512a0d3501a91a
Author: Nate Bargmann <n0...@n0...>
Date:   Mon Sep 13 18:12:03 2021 -0500

    Update NEWS for Kenwood VFO fix

diff --git a/NEWS b/NEWS
index 20edd901..3b1dd662 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,7 @@ Version 4.3.1
               Note: On systems with libusb < 1.0.23 a warning will be emmitted
               but compliation should proceed without error.
             - Update testlibusb.c warning to "may be" instead of "will be"
+            - Change kenwood to only set VFOA default on 1st rig_open call
 
 Version 4.3
         * 2021-09-01

commit 2b211b43f1bcb99863427f4d953aea561a2b2b71
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 13 13:13:12 2021 -0500

    Change kenwood to only set VFOA default on 1st rig_open call
    https://github.com/Hamlib/Hamlib/issues/797
    
    (cherry picked from commit 0f2a92b2de7118f303215cccd1188199711a4b4d)

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 7b5ef5ec..b4e981f8 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -962,10 +962,11 @@ int kenwood_open(RIG *rig)
 
             rig->state.rigport.retry = retry_save;
 
-            // Default to 1st VFO and split off
-            if (rig->caps->set_vfo)
+            // Default to 1st VFO and split off -- but only 1 time
+            if (rig->caps->set_vfo && priv->opened == 0)
             {
                 rig_set_vfo(rig, vfo_fixup(rig, RIG_VFO_A, 0));
+                priv->opened = 1;
             }
 
             RETURNFUNC(RIG_OK);
diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h
index e0973afc..801fdb1b 100644
--- a/rigs/kenwood/kenwood.h
+++ b/rigs/kenwood/kenwood.h
@@ -28,7 +28,7 @@
 #include "token.h"
 #include "misc.h"
 
-#define BACKEND_VER "20210829"
+#define BACKEND_VER "20210911"
 
 #define EOM_KEN ';'
 #define EOM_TH '\r'
@@ -165,6 +165,7 @@ struct kenwood_priv_data
     int is_k4d;
     int is_k4hd;
     int no_id;  // if true will not send ID; with every set command
+    int opened; // true once rig_open is called to avoid setting VFOA every open call
 };
 
 

commit eb00c66aaf6044c963482819939ce4531b9c9efb
Author: Nate Bargmann <n0...@n0...>
Date:   Mon Sep 13 09:24:02 2021 -0500

    Update NEWS for 4.3.1 bug fixes

diff --git a/NEWS b/NEWS
index d7761cb6..20edd901 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,27 @@ Copyright (C) 2000-2021  Michael Black W9MDB, and others
 
 Please send Hamlib bug reports to ham...@li...
 
+Version 4.3.1
+        * 2021-09-14
+        * Bug fix release
+            - Do not do vfo_fixup on satmode rigs
+            - Fix compilation of misc.c with gmtime_r replacement function for
+              mingw
+            - Fix python build.  For some reason casting tp vfo_t in the
+              RIG_VFO_N macro broke the swig parsing
+            - Append the missing information to build hamlib v4.3 for Android
+              NDK
+            - Change set_icom_set_mode_with_data to not change mode unless
+              necessary
+            - Since Icom rigs default to filter 2 if a filter is not selected
+              we will do the same when turning on data mode
+            - Fix segfault in kenwood_set_vfo
+            - scripts: Update example in readme, since 4.0 817 is 1020
+            - Make testlibusb.c compatible with libusb < 1.0.23
+              Note: On systems with libusb < 1.0.23 a warning will be emmitted
+              but compliation should proceed without error.
+            - Update testlibusb.c warning to "may be" instead of "will be"
+
 Version 4.3
         * 2021-09-01
         * libusb-1.0.23 or greater is now required or use --without-libusb

commit 27aecf91da09633c937d70b6b6536865aa7a189c
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 22:37:35 2021 -0500

    Update testlibusb.c warning to "may be" instead of "will be"
    
    (cherry picked from commit f064241c64cd72e045aed5f8e2b48f439a63fc4d)

diff --git a/tests/testlibusb.c b/tests/testlibusb.c
index f01369a8..660420ec 100644
--- a/tests/testlibusb.c
+++ b/tests/testlibusb.c
@@ -343,7 +343,7 @@ static int test_wrapped_device(const char *device_name)
     return 0;
 }
 #else
-#warning LIBUSB-1.0.23 will be required in Hamlib > 4.3
+#warning LIBUSB-1.0.23 may be required in Hamlib > 4.3
 static int test_wrapped_device(const char *device_name)
 {
     (void)device_name;

commit c2c72602f31a21dbeed273a94330b873994bd467
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 07:03:53 2021 -0500

    Make testlibusb.c compatible with libusb < 1.0.23
    
    (cherry picked from commit 4679d0f2ef34d2e8600cb861ce5a024e09766803)

diff --git a/tests/testlibusb.c b/tests/testlibusb.c
index b1a92c9d..f01369a8 100644
--- a/tests/testlibusb.c
+++ b/tests/testlibusb.c
@@ -218,7 +218,10 @@ static void print_device(libusb_device *dev, libusb_device_handle *handle)
 
     case LIBUSB_SPEED_SUPER:    speed = "5G"; break;
 
+#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000107)
+
     case LIBUSB_SPEED_SUPER_PLUS:   speed = "10G"; break;
+#endif
 
     default:            speed = "Unknown";
     }

commit 391aef96cd12843de87f863725a5354b6954902b
Author: Wouter van Gulik <pa...@gm...>
Date:   Wed Sep 8 22:35:14 2021 +0200

    scripts: Update example in readme, since 4.0 817 is 1020
    
    (cherry picked from commit 3e1b06432bd27fc26b41d030a8631ae85ee7e2fb)

diff --git a/scripts/build-w32.sh b/scripts/build-w32.sh
index 0f60eedc..aa8ad55b 100755
--- a/scripts/build-w32.sh
+++ b/scripts/build-w32.sh
@@ -129,9 +129,9 @@ directory.
 
 In short, the command syntax is of the form:
 
-  rigctl -m 120 -r COM1 -vvvvv
+  rigctl -m 1020 -r COM1 -vvvvv
 
-  -m -> Radio model 120, or Yaesu FT-817 (use 'rigctl -l' for a list)
+  -m -> Radio model 1020, or Yaesu FT-817 (use 'rigctl -l' for a list)
   -r -> Radio device, in this case COM1
   -v -> Verbosity level.  For testing four or five v characters are required.
         Five 'v's set a debug level of TRACE which generates a lot of screen
diff --git a/scripts/build-w64-jtsdk.sh b/scripts/build-w64-jtsdk.sh
index 9b07c0f7..af6e4c6b 100755
--- a/scripts/build-w64-jtsdk.sh
+++ b/scripts/build-w64-jtsdk.sh
@@ -139,9 +139,9 @@ directory.
 
 In short, the command syntax is of the form:
 
-  rigctl -m 120 -r COM1 -vvvvv
+  rigctl -m 1020 -r COM1 -vvvvv
 
-  -m -> Radio model 120, or Yaesu FT-817 (use 'rigctl -l' for a list)
+  -m -> Radio model 1020, or Yaesu FT-817 (use 'rigctl -l' for a list)
   -r -> Radio device, in this case COM1
   -v -> Verbosity level.  For testing four or five v characters are required.
         Five 'v's set a debug level of TRACE which generates a lot of screen
diff --git a/scripts/build-w64.sh b/scripts/build-w64.sh
index 9567414e..c2433578 100755
--- a/scripts/build-w64.sh
+++ b/scripts/build-w64.sh
@@ -129,9 +129,9 @@ directory.
 
 In short, the command syntax is of the form:
 
-  rigctl -m 120 -r COM1 -vvvvv
+  rigctl -m 1020 -r COM1 -vvvvv
 
-  -m -> Radio model 120, or Yaesu FT-817 (use 'rigctl -l' for a list)
+  -m -> Radio model 1020, or Yaesu FT-817 (use 'rigctl -l' for a list)
   -r -> Radio device, in this case COM1
   -v -> Verbosity level.  For testing four or five v characters are required.
         Five 'v's set a debug level of TRACE which generates a lot of screen

commit 8d31be0ee11d06b5213b49ea5d2906ac4306427b
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 10 05:36:42 2021 -0500

    Fix segfault in kenwood_set_vfo
    https://github.com/Hamlib/Hamlib/issues/794
    
    (cherry picked from commit e881993433d8eb48b217ff4c1110689ee330090d)

diff --git a/Segfault-award b/Segfault-award
index f80986d0..db4d10af 100644
--- a/Segfault-award
+++ b/Segfault-award
@@ -25,3 +25,7 @@ Here is the list of the brave fellows:
 * Chuck Ritola
     fclose of fsockin or fsockout when null 
     https://github.com/Hamlib/Hamlib/issues/757
+
+* John Nelson G4KLA 09/2021
+    kenwood_set_vfo
+    https://github.com/Hamlib/Hamlib/issues/794
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index a03a8ea6..7b5ef5ec 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -1053,7 +1053,7 @@ int kenwood_get_if(RIG *rig)
  */
 int kenwood_set_vfo(RIG *rig, vfo_t vfo)
 {
-    char cmdbuf[6];
+    char cmdbuf[12];
     int retval;
     char vfo_function;
     struct kenwood_priv_data *priv = rig->state.priv;
@@ -1231,7 +1231,7 @@ int kenwood_get_vfo_main_sub(RIG *rig, vfo_t *vfo)
 int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
 {
     struct kenwood_priv_data *priv = rig->state.priv;
-    char cmdbuf[6];
+    char cmdbuf[12];
     int retval;
     unsigned char vfo_function;
 

commit 36655931dde5df3fe46d4f43a28b68febd7a951b
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 17:52:44 2021 -0500

    Since Icom rigs default to filter 2 if a filter is not selected we will do the same when turning on data mode
    https://github.com/Hamlib/Hamlib/issues/791
    
    (cherry picked from commit f2c60aa33adfe5051b403e76efd4420c3f25cfdf)

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 4c44ffd6..1425efcc 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1883,12 +1883,12 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
         case RIG_MODE_PKTFM:
         case RIG_MODE_PKTAM:
             datamode[0] = 0x01;
-            datamode[1] = 0x01; // default to filter 1
+            datamode[1] = 0x02; // default to filter 2
             break;
 
         default:
             datamode[0] = 0x00;
-            datamode[1] = 0x01; // default to filter 1
+            datamode[1] = 0x02; // default to filter 2
             break;
         }
 

commit 53f7c1ed3baad6f70339616130533b6eb280c1ff
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 17:44:57 2021 -0500

    Change set_icom_set_mode_with_data to not change mode unless necessary
    
    Should allow filters to stay where they are set if USB-D is the starting mode
    https://github.com/Hamlib/Hamlib/issues/791
    
    (cherry picked from commit e900b4f9dc7e6c9328d6726f1d66152595d6e2bc)

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 6f3e187c..4c44ffd6 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1790,6 +1790,8 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     unsigned char ackbuf[MAXFRAMELEN];
     int ack_len = sizeof(ackbuf);
     rmode_t icom_mode;
+    rmode_t tmode;
+    pbwidth_t twidth;
     //struct icom_priv_data *priv = (struct icom_priv_data *) rig->state.priv;
     unsigned char dm_sub_cmd =
         rig->caps->rig_model == RIG_MODEL_IC7200  ? 0x04 : S_MEM_DATA_MODE;
@@ -1807,6 +1809,23 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
 
     ENTERFUNC;
 
+    // if our current mode and width is not changing do nothing
+    retval = rig_get_mode(rig, vfo, &tmode, &twidth);
+
+    if (retval != RIG_OK)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: get_mode failed: %s\n", __func__,
+                  rigerror(retval));
+        RETURNFUNC(retval);
+    }
+
+    if (tmode == mode && width == RIG_PASSBAND_NOCHANGE)
+    {
+        rig_debug(RIG_DEBUG_TRACE, "%s: mode/width not changing\n", __func__);
+        RETURNFUNC(RIG_OK);
+    }
+    // looks like we need to change it
+
     switch (mode)
     {
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index d13f9d65..96637003 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210828"
+#define BACKEND_VER "20210907"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

commit 4f760debc3540d7393f198ef1a2f7017a2feced2
Author: 小光 <ch...@gm...>
Date:   Tue Sep 7 23:07:41 2021 +0800

    Update README.android
    
    (cherry picked from commit e911471eae1eb348a4ecd774c30531eff32b6380)

diff --git a/android/README.android b/android/README.android
index 3c6a6228..5d7c94c7 100644
--- a/android/README.android
+++ b/android/README.android
@@ -1,3 +1,6 @@
+Update Note:
+These Android NDK scripts can compile the 4.3 version of hamlib normally, but they may be corrupted as the master branch code is updated. If you encounter compile-time errors, please try to fix them, or choose to recompile with version 4.3.
+
 This is android port of hamlib
 (C) 2012 Ladislav Vaiz <ok...@na...>
 

commit 39bb9c4a92410d79aff56891111762a7bdc8a65a
Author: AuroraRAS <ch...@gm...>
Date:   Tue Sep 7 21:30:09 2021 +0800

    Append the missing information to build hamlib v4.3 for Android NDK
    
    The following errors were fixed in this commit:
    error: undefined symbol: rig_sprintf_vfo
    error: undefined symbol: initrots2_radant
    error: undefined symbol: ts890s_caps
    
    (cherry picked from commit b5bd1f4036bb42ae8b5c05900f51cec60bf2502e)

diff --git a/Android.mk b/Android.mk
index 8b507a90..e59ea0b8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,3 +48,4 @@ include $(TOP_PATH)/rotators/sartek/Android.mk
 include $(TOP_PATH)/rotators/satel/Android.mk
 include $(TOP_PATH)/rotators/spid/Android.mk
 include $(TOP_PATH)/rotators/ts7400/Android.mk
+include $(TOP_PATH)/rotators/radant/Android.mk
diff --git a/rigs/kenwood/Android.mk b/rigs/kenwood/Android.mk
index 80d20a12..9a7d39c9 100644
--- a/rigs/kenwood/Android.mk
+++ b/rigs/kenwood/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \
 		ts440.c ts940.c ts711.c ts811.c r5000.c \
 		thd7.c thf7.c thg71.c tmd700.c tmv7.c thf6a.c thd72.c tmd710.c \
 		kenwood.c th.c ic10.c elecraft.c transfox.c flex6xxx.c ts990s.c \
-		xg3.c thd74.c flex.c pihpsdr.c
+		xg3.c thd74.c flex.c pihpsdr.c ts890s.c
 LOCAL_MODULE := kenwood
 
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
diff --git a/rotators/radant/Android.mk b/rotators/radant/Android.mk
new file mode 100644
index 00000000..f66b69e9
--- /dev/null
+++ b/rotators/radant/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := radant.c
+LOCAL_MODULE := radant
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H
+LOCAL_C_INCLUDES := android include src
+LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/Android.mk b/src/Android.mk
index 21102426..d4a1f315 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -23,11 +23,12 @@ LOCAL_SRC_FILES := \
         parallel.c \
         debug.c \
         network.c \
-	sleep.c \
-	gpio.c \
-	microham.c \
-	rot_ext.c \
-        cm108.c
+        sleep.c \
+        gpio.c \
+        microham.c \
+        rot_ext.c \
+        cm108.c \
+        sprintflst.c
 
 
 LOCAL_MODULE := libhamlib
@@ -38,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := adat alinco amsat aor ars barrett celestron cnctrk \
         gs232a heathkit icmarine icom ioptron jrc kachina kenwood kit \
         lowe m2 meade pcr prm80 prosistel racal rft \
         rotorez rs sartek satel skanti spid tapr tentec ts7400 tuner \
-        uniden wj yaesu
+        uniden wj yaesu radant
 
 LOCAL_LDLIBS := -llog
 

commit 17206da434084a745eac24e65470265ee88328dc
Author: AuroraRAS <ch...@gm...>
Date:   Tue Sep 7 21:12:49 2021 +0800

    Prepare .gitignore file for NDK build
    
    (cherry picked from commit 84807bc95e3b1e46c3b14ebe49ab3ceb3e24ab59)

diff --git a/.gitignore b/.gitignore
index 3a47008c..f0c6221a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@ tests/rotctld
 src/hamlibdatetime.h
 .gdbinit
 build/
+libs/
+obj/

commit 891a550e93f93d9d56b780ac672e65450ac3e3ea
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 10 23:29:32 2021 -0500

    Fix python build.  For some reason casting tp vfo_t in the RIG_VFO_N macro broke the swig parsing
    https://github.com/Hamlib/Hamlib/issues/786
    
    (cherry picked from commit 004ddafb87da025ee958ac163de568818963a247)

diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 352d503e..4ab36850 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -428,7 +428,7 @@ typedef unsigned int vfo_t;
 
 /** \brief '' -- used in caps */
 
-#define RIG_VFO_N(n)        ((vfo_t)(1u<<(n)))
+#define RIG_VFO_N(n)        (1u<<(n))
 
 /** \brief \c VFONone -- vfo unknown */
 #define RIG_VFO_NONE        0

commit 384f4973468b435e7554fba9faee2f6f3adca9b4
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Thu Sep 2 17:08:10 2021 -0500

    Fix compilation of misc.c with gmtime_r replacement function for mingw
    https://github.com/Hamlib/Hamlib/issues/784
    
    (cherry picked from commit 820e4d43103b0b5cda944d496701adc15c16c822)

diff --git a/src/misc.c b/src/misc.c
index bc679198..76121037 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -2346,6 +2346,27 @@ uint32_t CRC32_function(uint8_t *buf, uint32_t len)
     return crc ^ 0xFFFFFFFF;
 }
 
+#if defined(_WIN32)
+// gmtime_r can be defined by mingw
+#ifndef gmtime_r
+static struct tm *gmtime_r(const time_t *t, struct tm *r)
+{
+    // gmtime is threadsafe in windows because it uses TLS
+    struct tm *theTm = gmtime(t);
+
+    if (theTm)
+    {
+        *r = *theTm;
+        return r;
+    }
+    else
+    {
+        return 0;
+    }
+}
+#endif // gmtime_r
+#endif // _WIN32
+
 //! @cond Doxygen_Suppress
 char *date_strget(char *buf, int buflen)
 {

commit 267d70c2bfd7cb1979f22fa5d68978cbd98bea71
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 1 12:45:29 2021 -0500

    Do not do vfo_fixup on satmode rigs
    https://github.com/Hamlib/Hamlib/issues/782
    
    (cherry picked from commit 6de4588335619e6ed3aae6dd36b32a5b4afa2de8)

diff --git a/src/rig.c b/src/rig.c
index dba18783..bec62059 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -4549,8 +4549,12 @@ int HAMLIB_API rig_set_split_vfo(RIG *rig,
         RETURNFUNC(-RIG_ENAVAIL);
     }
 
-    rx_vfo = vfo_fixup(rig, rx_vfo, split);
-    tx_vfo = vfo_fixup(rig, tx_vfo, split);
+    // We fix up vfos for non-satmode rigs
+    if (!(rig->caps->has_get_func & RIG_FUNC_SATMODE))
+    {
+        rx_vfo = vfo_fixup(rig, rx_vfo, split);
+        tx_vfo = vfo_fixup(rig, tx_vfo, split);
+    }
 
     // set rig to the the requested RX VFO
     TRACE;

commit f6dff2576c8b55a6e076cbe3bf492d3f9621e455
Author: Nate Bargmann <n0...@n0...>
Date:   Mon Sep 13 09:19:17 2021 -0500

    Advance configure.ac to version 4.3.1

diff --git a/configure.ac b/configure.ac
index ce9e9087..d5780826 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl Please do not use '-' in the version number, as package managers will fail,
 dnl however, the use of '~' should be fine as apt (others?) will treat
 dnl it as an earlier version than the actual release.  TNX KA6MAL
 dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars!
-AC_INIT([Hamlib],[4.3],[ham...@li...],[hamlib],[http://www.hamlib.org])
+AC_INIT([Hamlib],[4.3.1],[ham...@li...],[hamlib],[http://www.hamlib.org])
 
 AC_CONFIG_SRCDIR([include/hamlib/rig.h])
 AC_CONFIG_MACRO_DIR([macros])

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

Summary of changes:
 .gitignore                            |  2 ++
 Android.mk                            |  1 +
 NEWS                                  | 22 ++++++++++++++++++++++
 Segfault-award                        |  4 ++++
 android/README.android                |  3 +++
 configure.ac                          |  2 +-
 include/hamlib/rig.h                  |  2 +-
 rigs/icom/icom.c                      | 23 +++++++++++++++++++++--
 rigs/icom/icom.h                      |  2 +-
 rigs/kenwood/Android.mk               |  2 +-
 rigs/kenwood/kenwood.c                |  9 +++++----
 rigs/kenwood/kenwood.h                |  3 ++-
 rotators/{amsat => radant}/Android.mk |  4 ++--
 scripts/build-w32.sh                  |  4 ++--
 scripts/build-w64-jtsdk.sh            |  4 ++--
 scripts/build-w64.sh                  |  4 ++--
 src/Android.mk                        | 13 +++++++------
 src/misc.c                            | 21 +++++++++++++++++++++
 src/rig.c                             |  8 ++++++--
 tests/testlibusb.c                    |  5 ++++-
 20 files changed, 110 insertions(+), 28 deletions(-)
 copy rotators/{amsat => radant}/Android.mk (79%)


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

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

From: Michael B. <mdb...@us...> - 2021-09-11 04:33:08

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  2b3ec3f4bd7d7c80a16cfc5aa2bedf7340fd21a9 (commit)
       via  004ddafb87da025ee958ac163de568818963a247 (commit)
      from  6d3046e0122a349d0cb1823041c20e3bbbaa0215 (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 2b3ec3f4bd7d7c80a16cfc5aa2bedf7340fd21a9
Merge: 004ddafb 6d3046e0
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 10 23:31:08 2021 -0500

    Merge branch 'master' of https://github.com/Hamlib/Hamlib


commit 004ddafb87da025ee958ac163de568818963a247
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 10 23:29:32 2021 -0500

    Fix python build.  For some reason casting tp vfo_t in the RIG_VFO_N macro broke the swig parsing
    https://github.com/Hamlib/Hamlib/issues/786

diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 352d503e..4ab36850 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -428,7 +428,7 @@ typedef unsigned int vfo_t;
 
 /** \brief '' -- used in caps */
 
-#define RIG_VFO_N(n)        ((vfo_t)(1u<<(n)))
+#define RIG_VFO_N(n)        (1u<<(n))
 
 /** \brief \c VFONone -- vfo unknown */
 #define RIG_VFO_NONE        0

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

Summary of changes:
 include/hamlib/rig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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

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

From: Nate B. <n0...@us...> - 2021-09-10 19:29:43

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  6d3046e0122a349d0cb1823041c20e3bbbaa0215 (commit)
       via  5db5c47ce26252743ed72e4937be922a79a1bff8 (commit)
       via  e881993433d8eb48b217ff4c1110689ee330090d (commit)
       via  fe2f24cba3a87e3436937812158516e79c220aa0 (commit)
       via  720f8fa86ea04c1f849c7f19870ceda0b97a3a6e (commit)
       via  3edc59dbd2ce7ecd0eb47a6673b73df71fad13a5 (commit)
       via  d6c1c4ec78f1f627911632dd1e584bf56094f90f (commit)
       via  9134fa55c99a30c624e5c0b13a40b7622cd6aba4 (commit)
       via  998e19bdd4a3c1c94d0b974a3b03268ac0d547fd (commit)
       via  3e1b06432bd27fc26b41d030a8631ae85ee7e2fb (commit)
       via  037db1379bb34d8c92b1ca9d5754bb689d274dda (commit)
       via  f064241c64cd72e045aed5f8e2b48f439a63fc4d (commit)
       via  f2c60aa33adfe5051b403e76efd4420c3f25cfdf (commit)
       via  e900b4f9dc7e6c9328d6726f1d66152595d6e2bc (commit)
       via  4679d0f2ef34d2e8600cb861ce5a024e09766803 (commit)
       via  c53a288cd8e7b920cc3fbbf97ef5500371f9b218 (commit)
       via  cd194b64502a0f23ee5ac98a3510e9a07569f95f (commit)
       via  c7dbbfbc323ae53a6498e01a49ce58a6211fc885 (commit)
       via  b06a3c1714b416c0d5eca2000ae9ea785ffaa5d5 (commit)
       via  5aa1572a304fc894fc436277a6f8dc2062944012 (commit)
       via  6f02f38fdc752270b7cac6311bc8434d0d624600 (commit)
       via  49b2eca6c1d355ce15e15c897e6ef241c989f9e2 (commit)
       via  e9d32ed6c9390ac6151cd11259b31f39bd5d9bb0 (commit)
       via  187dcff6c5d2d8261584322fdaaeaae9182c8413 (commit)
       via  4cf092fc0bdf77365e0df1aa77a1f7e5fe59db97 (commit)
       via  83b887ca8c4450f3bcc330e2f22d2ab6b5570ba1 (commit)
       via  53035454f241ded78231275de73dd1b2379ad88d (commit)
       via  775fc832f6dab9b55f6b101411408b68de93a723 (commit)
       via  12889cd95711fcff392d62b17f557b52d8f9d4e7 (commit)
       via  e825e5b4c994ba70721bf731d9ef052820d5c3c5 (commit)
       via  d6350d1f0f9b3a2a7d36ace5ee70d6ff44fc6945 (commit)
       via  0e67bcd1fc55c9af2149588dbc290975a48ab493 (commit)
       via  99b7a2da24dca2fd3bbec4f0957feceff5552d0b (commit)
       via  731eb39df84dca6d2e6b7b7686d34a38f89b0487 (commit)
       via  e78a8258ce2ebe86dd1494067524e4059ed9f314 (commit)
       via  9162127e9c719b61d95fc26a948b56ee1b84ed52 (commit)
       via  b6837801a65591dcc9ed64701b5cfd174ffeb7cc (commit)
       via  287e79d31895b18a7457397be841971a58537def (commit)
       via  5a8922b5b54d17502afb3185fdcdf22b7d94390e (commit)
       via  f196d14b8449db864f88e81159a41c9f8f93ba8c (commit)
       via  3cdf09388fca2cc06ac575a0f457de3c129e2461 (commit)
       via  9dce7680d086b8f1e2771c888b7283c0f84d9b54 (commit)
       via  4c62b3d2bee00b8c5248269441a1eaa753fd371c (commit)
       via  44157ad114db04767f2cf0756d3568f04660a3d8 (commit)
       via  32de5c34854b0d382159a09ff54ffa406be9e9af (commit)
       via  d48f1aed426b8c2b7215eef23a1b6cc685988038 (commit)
       via  20221524f89a30a0faff30572fd8af5284b795c1 (commit)
       via  ecf53e22efca028da46a9963365fdf5e53e5127f (commit)
       via  e16a77aaa66a71ee948788278bbfbb08e040eb18 (commit)
       via  39d3c2f6818c6e2c208b55b3b1afe13623899f6d (commit)
       via  970dff70a3538fbf25500e3e4be4a3784a60bb01 (commit)
       via  95a737ea56fd5da65af86b261d0fed6253b99952 (commit)
       via  76b3f6196cbc2de246a7897f00b581f4b8b760fd (commit)
       via  7b6105720288b6495fcf99680845b135b0ff08ea (commit)
       via  8092588d97ee165db9b6e9dc81cda6d5e4f8622f (commit)
       via  21038df9f6c6eb1ca5a7c84731bd2347232ce8e1 (commit)
       via  a0e692006f197ee3495d1c915e1b2844902ea8fe (commit)
       via  fe46bcf540c31755c4f6e2a90049196050e1d056 (commit)
       via  72099a63ce52794309d228ecbfb3fb6493d06bc5 (commit)
       via  623bef2f61a6624f02bf9ff8dcb15c0e1f275d19 (commit)
       via  32460321ab1be1bcab8072acc6abde5e3905b69d (commit)
       via  fa4fa7a1d937efcaa8d7507d5955db5d7919313b (commit)
       via  124e2c30c7673a312fb60195f8d1dc806dee72e7 (commit)
       via  c04c4cbd2ae0b006b79b7fb84675807e0d173abf (commit)
       via  83590a0868e23cd3ba7f377fc26cd5ba7c97a44d (commit)
       via  d5028e7ba4c346b41f41bf6e2c4b0546bf3339c6 (commit)
       via  31696351a9660899bb68311ad6602e64cfd1628c (commit)
       via  fcdacb254037ec0423295fced437a8e4d1e5175b (commit)
       via  3dde32f53499050486d44e1283d5ca8e36342ed6 (commit)
       via  6a9432a0c7edc56aac7c7ccd11e10b7059a443a4 (commit)
       via  1c7b4ab80674ba981b56ea2d4d086fead1b1e1da (commit)
       via  eecffd31be0b072a121f20aca9ea1d4bbc20866b (commit)
       via  a851da80e210564f077aa6366c07c2be760e5004 (commit)
       via  aedcc4191c56ae61c5f8f840accf2a8fb38aebfc (commit)
       via  9b650f9dc533d90b39d5c4a6dc57cb58adbe68f4 (commit)
       via  9c44e29ec697a62d52b70eeb8ebec8f4eb6f29b9 (commit)
       via  c823564a2af6755f5a524003a0786442878451af (commit)
       via  49c7e09142db692693f68d2d959465a8d3a438d8 (commit)
       via  49240c9846c9d4c730e9cbe154ec07a496c4ec7d (commit)
       via  5a2cbdda219107e97971fdc21297005e34ce0f1c (commit)
       via  dd6224bc5b322592d6db4551523b972b3861d801 (commit)
       via  19c5e3e0a73c761e3bdd4f2009354661876ea67d (commit)
       via  82b0a8a84ebcbd3d5c5b0acd29d0cc9e252ef839 (commit)
       via  2fb5343cc17c1354e77fe6b6ca1fee953471abda (commit)
       via  617a38ff45c160950491ca3cc7ba5ff8a3a3b3b6 (commit)
       via  c9860abe9f59b3a541cd3bb50693260c02332586 (commit)
       via  f85cb7cb809d1b337ee2728832da0a7a9b12d06f (commit)
       via  a305b4f205f6a33f36d0b5f518351d60d881ddd2 (commit)
       via  bfd08203626fd6af5f42e22c1533a47a55697c07 (commit)
       via  447fda06813e82db5549018e286fb9da2d62c8ca (commit)
       via  4c371ca40acffa8cc7df498cac870fcd1d983d09 (commit)
       via  9311519461aeb32f6ea6526d8ec2c7edcb2eb3bd (commit)
       via  18bbd6b7a790d595760706749ed6c326b57cba0d (commit)
       via  61020e950cc3b979630dca8be4bab4ca8003a3da (commit)
       via  d97eba3c7046ce743ae61965c49c3b26fb6fc676 (commit)
       via  012b939a197eda184beae6b6ba93fdbdeda3f69a (commit)
       via  5ece51ef2f30bebf9c1f40e2303a190a04c1ee5f (commit)
       via  78160a1bf6d9d0493514dc9092e2dd0859740f6f (commit)
       via  9849a1bcaf438c08ac0ea31cad825b9157f80f0c (commit)
       via  cb9ea39c660d8a9c5a74f389ba252976dcc7d5c6 (commit)
       via  3fabc0b50384c17ce56f2662e4c2587aca5ed7a2 (commit)
       via  b2560982fe8ccfeefe656773d62df7863440b560 (commit)
       via  36b42332778ef3398dd08a6c237544c1ff385480 (commit)
       via  181571a9709475b7be4f37160c67a5f23da1bddb (commit)
       via  724891246af901b76adca5b84a6a21b849754a29 (commit)
       via  908b18246e5a0020ca49717f2887e28c616b72bd (commit)
       via  356f23b0fbe2c996738cd0cc641133a7324d1e74 (commit)
       via  67181bf7c9fa942ae2c5dd61810b2f6584328349 (commit)
       via  6cb90f5260de62234a6e4358d256120113b110dd (commit)
       via  2e48c2470b28abb105f2cf9a38fc230c15f98982 (commit)
       via  9c75ab3d40a9a4677e0d15b24acce28af2fb9b31 (commit)
       via  67597b50c7949ad7f013e8d4d994715391500ef0 (commit)
       via  d59d75c20a4ca851d50d1d879640867ec03fbdc7 (commit)
       via  72de08b3e074f971d4c7ff439c8d62e6f0464bac (commit)
       via  e0f468d2c61bffb3adbdc641a020a95abc0c3e38 (commit)
       via  06327322efe20e47730357a00e53f4ca769539c5 (commit)
       via  12b4dda856217cc60c6b392d4c5274a91e398198 (commit)
       via  c95adac2b1f3d7404cd4d2c551440b32333609e9 (commit)
       via  c5bc57b719d01734525e198b0a424ed479301af4 (commit)
       via  0ebf99742e91e1ff17f88003bf78bee25355bae1 (commit)
       via  06f471d5c880eeb6783595dcbb8304a7b32e3903 (commit)
       via  2bfd09e59386305024a08653e8d91ffb6f022d88 (commit)
      from  d1c824be5ca38efd9ca68e2ef5febe567cb2f686 (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 6d3046e0122a349d0cb1823041c20e3bbbaa0215
Merge: 5db5c47c fe2f24cb
Author: Michael Black <mdb...@ya...>
Date:   Fri Sep 10 05:48:01 2021 -0500

    Merge pull request #793 from wutje/improve_doc
    
    Improve doc


commit 5db5c47ce26252743ed72e4937be922a79a1bff8
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 10 05:46:13 2021 -0500

    Fix rigctl send_morse command when in vfo mode

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 4d350be3..4d5580da 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -321,7 +321,7 @@ static struct test_table test_list[] =
     { '*',  "reset",            ACTION(reset),          ARG_IN, "Reset" },
     { 'w',  "send_cmd",         ACTION(send_cmd),       ARG_IN1 | ARG_IN_LINE | ARG_OUT2 | ARG_NOVFO, "Cmd", "Reply" },
     { 'W',  "send_cmd_rx",      ACTION(send_cmd),       ARG_IN | ARG_OUT2 | ARG_NOVFO, "Cmd", "Reply"},
-    { 'b',  "send_morse",       ACTION(send_morse),     ARG_IN  | ARG_IN_LINE, "Morse" },
+    { 'b',  "send_morse",       ACTION(send_morse),     ARG_IN | ARG_NOVFO  | ARG_IN_LINE, "Morse" },
     { 0xbb, "stop_morse",       ACTION(stop_morse),     },
     { 0xbc, "wait_morse",       ACTION(wait_morse),     },
     { 0x94, "send_voice_mem",   ACTION(send_voice_mem), ARG_IN, "Voice Mem#" },

commit e881993433d8eb48b217ff4c1110689ee330090d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 10 05:36:42 2021 -0500

    Fix segfault in kenwood_set_vfo
    https://github.com/Hamlib/Hamlib/issues/794

diff --git a/Segfault-award b/Segfault-award
index f80986d0..db4d10af 100644
--- a/Segfault-award
+++ b/Segfault-award
@@ -25,3 +25,7 @@ Here is the list of the brave fellows:
 * Chuck Ritola
     fclose of fsockin or fsockout when null 
     https://github.com/Hamlib/Hamlib/issues/757
+
+* John Nelson G4KLA 09/2021
+    kenwood_set_vfo
+    https://github.com/Hamlib/Hamlib/issues/794
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index a03a8ea6..7b5ef5ec 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -1053,7 +1053,7 @@ int kenwood_get_if(RIG *rig)
  */
 int kenwood_set_vfo(RIG *rig, vfo_t vfo)
 {
-    char cmdbuf[6];
+    char cmdbuf[12];
     int retval;
     char vfo_function;
     struct kenwood_priv_data *priv = rig->state.priv;
@@ -1231,7 +1231,7 @@ int kenwood_get_vfo_main_sub(RIG *rig, vfo_t *vfo)
 int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
 {
     struct kenwood_priv_data *priv = rig->state.priv;
-    char cmdbuf[6];
+    char cmdbuf[12];
     int retval;
     unsigned char vfo_function;
 

commit fe2f24cba3a87e3436937812158516e79c220aa0
Author: Wouter van Gulik <pa...@gm...>
Date:   Thu Sep 9 22:47:57 2021 +0200

    Make make_crc_table and gen_crc static.

diff --git a/src/rig.c b/src/rig.c
index 31c45ed0..aeae9f2a 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -6484,7 +6484,7 @@ const char *HAMLIB_API rig_get_info(RIG *rig)
 }
 
 
-void make_crc_table(unsigned long crcTable[])
+static void make_crc_table(unsigned long crcTable[])
 {
     unsigned long POLYNOMIAL = 0xEDB88320;
     unsigned long remainder;
@@ -6516,7 +6516,7 @@ void make_crc_table(unsigned long crcTable[])
 
 static unsigned long crcTable[256];
 
-unsigned long gen_crc(unsigned char *p, size_t n)
+static unsigned long gen_crc(unsigned char *p, size_t n)
 {
     unsigned long crc = 0xfffffffful;
     size_t i;

commit 720f8fa86ea04c1f849c7f19870ceda0b97a3a6e
Author: Wouter van Gulik <pa...@gm...>
Date:   Thu Sep 9 22:42:55 2021 +0200

    Fix documentation for get_info. Memory is not allocated!
    Prevent users from trying to free it.

diff --git a/src/rig.c b/src/rig.c
index a8e3d339..31c45ed0 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -6463,9 +6463,9 @@ int HAMLIB_API rig_set_vfo_opt(RIG *rig, int status)
  * Retrieves some general information from the radio.
  * This can include firmware revision, exact model name, or just nothing.
  *
- * \return a pointer to freshly allocated memory containing the ASCIIZ string
+ * \return a pointer to memory containing the ASCIIZ string
  * if the operation has been successful, otherwise NULL if an error occurred
- * or get_info not part of capabilities.
+ * or if get_info is not part of the capabilities.
  */
 const char *HAMLIB_API rig_get_info(RIG *rig)
 {

commit 3edc59dbd2ce7ecd0eb47a6673b73df71fad13a5
Author: Wouter van Gulik <pa...@gm...>
Date:   Thu Sep 9 22:36:43 2021 +0200

    Add documentation for rig_get_cache.
    Note that it misses all sanity check on the input, but at least that is
    now documented.
    Made rig_check_rig_caps and twiddling static, they are not exported
    but Doxygen includes all globally visible function.

diff --git a/src/rig.c b/src/rig.c
index 842720f3..a8e3d339 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -329,7 +329,7 @@ void *caps_test_macro_name = &caps_test.macro_name;
 
 // check and show WARN if rig_caps structure doesn't match
 // this tests for shared library incompatibility
-int rig_check_rig_caps()
+static int rig_check_rig_caps()
 {
     int rc = RIG_OK;
 
@@ -1580,6 +1580,25 @@ static int set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq)
     return RIG_OK;
 }
 
+/**
+ * \brief get cached values for a VFO
+ * \param rig           The rig handle
+ * \param vfo           The VFO to get information from
+ * \param freq          The frequency is stored here
+ * \param cache_ms_freq The age of the last frequency update in ms
+ * \param mode          The mode is stored here
+ * \param cache_ms_mode The age of the last mode update in ms
+ * \param width         The width is stored here
+ * \param cache_ms_width The age of the last width update in ms
+ *
+ * Use this to query the cache and then determine to actually fetch data from
+ * the rig.
+ *
+ * \note All pointers must be given. No pointer can be left at NULL
+ *
+ * \return RIG_OK
+ *
+ */
 int rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms_freq,
                   rmode_t *mode, int *cache_ms_mode, pbwidth_t *width, int *cache_ms_width)
 {
@@ -1708,7 +1727,7 @@ int rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms_freq,
 // detect if somebody is twiddling the VFO
 // indicator is last set freq doesn't match current freq
 // so we have to query freq every time we set freq or vfo to handle this
-int twiddling(RIG *rig)
+static int twiddling(RIG *rig)
 {
     const struct rig_caps *caps;
 

commit d6c1c4ec78f1f627911632dd1e584bf56094f90f
Author: Wouter van Gulik <pa...@gm...>
Date:   Thu Sep 9 22:15:16 2021 +0200

    rig.c/rig_reset Make defines a link in the documentation

diff --git a/src/rig.c b/src/rig.c
index 5c0b6da8..842720f3 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -5623,7 +5623,7 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status)
  * \param reset The reset operation to perform
  *
  *  Resets the radio.
- *  See RIG_RESET_NONE, RIG_RESET_SOFT and RIG_RESET_MCALL defines
+ *  See #RIG_RESET_NONE, #RIG_RESET_SOFT and #RIG_RESET_MCALL defines
  *  for the \a reset.
  *
  * \return RIG_OK if the operation has been successful, otherwise

commit 9134fa55c99a30c624e5c0b13a40b7622cd6aba4
Author: Wouter van Gulik <pa...@gm...>
Date:   Wed Sep 8 22:57:04 2021 +0200

    rig.c: Fix Doxygen for rigerror

diff --git a/src/rig.c b/src/rig.c
index e4b4ad8d..5c0b6da8 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -286,6 +286,10 @@ int foreach_opened_rig(int (*cfunc)(RIG *, rig_ptr_t), rig_ptr_t data)
 #endif /* !DOC_HIDDEN */
 
 
+char debugmsgsave[DEBUGMSGSAVE_SIZE] = "No message";
+char debugmsgsave2[DEBUGMSGSAVE_SIZE] = "No message";
+char debugmsgsave3[DEBUGMSGSAVE_SIZE] = "No message";
+
 /**
  * \brief get string describing the error code
  * \param errnum    The error code
@@ -297,10 +301,6 @@ int foreach_opened_rig(int (*cfunc)(RIG *, rig_ptr_t), rig_ptr_t data)
  *
  * \todo support gettext/localization
  */
-char debugmsgsave[DEBUGMSGSAVE_SIZE] = "No message";
-char debugmsgsave2[DEBUGMSGSAVE_SIZE] = "No message";
-char debugmsgsave3[DEBUGMSGSAVE_SIZE] = "No message";
-
 const char *HAMLIB_API rigerror(int errnum)
 {
     errnum = abs(errnum);

commit 998e19bdd4a3c1c94d0b974a3b03268ac0d547fd
Author: Wouter van Gulik <pa...@gm...>
Date:   Wed Sep 8 22:45:36 2021 +0200

    Fix Doxygen in rig.c. Commit c5c60f0 also touched Doxygen comments which
    was not intended. It replaced \return with \RETURNFUNC. Breaking
    Doxygen.

diff --git a/src/rig.c b/src/rig.c
index 1898aef4..e4b4ad8d 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -663,7 +663,7 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model)
  * Opens communication to a radio which \a RIG handle has been passed
  * by argument.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -1110,7 +1110,7 @@ int HAMLIB_API rig_open(RIG *rig)
  * Closes communication to a radio which \a RIG handle has been passed
  * by argument that was previously open with rig_open().
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -1288,7 +1288,7 @@ int HAMLIB_API rig_close(RIG *rig)
  * Releases a rig struct which port has eventually been closed already
  * with rig_close().
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -1332,7 +1332,7 @@ int HAMLIB_API rig_cleanup(RIG *rig)
  * timeout seconds to stop rigctld when VFO is manually changed
  * turns on/off the radio.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -1357,7 +1357,7 @@ int HAMLIB_API rig_set_twiddle(RIG *rig, int seconds)
  * \param rig   The rig handle
  * \param seconds    1=Ignore Sub, 2=Ignore Main
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -1383,7 +1383,7 @@ int HAMLIB_API rig_set_uplink(RIG *rig, int val)
  * \param rig   The rig handle
  * \param seconds    The timeout value
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -1764,7 +1764,7 @@ int twiddling(RIG *rig)
  *
  * Sets the frequency of the target VFO.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -1965,7 +1965,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  *  The value stored at \a freq location equals RIG_FREQ_NONE when the current
  *  frequency of the VFO is not defined (e.g. blank memory).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -2183,7 +2183,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
  *  The value stored at \a freq location equals RIG_FREQ_NONE when the current
  *  frequency of the VFO is not defined (e.g. blank memory).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -2211,7 +2211,7 @@ int HAMLIB_API rig_get_freqs(RIG *rig, freq_t *freqA, freq_t freqB)
  * unchanged from the current value or default for the mode determined
  * by the rig.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -2310,7 +2310,7 @@ int HAMLIB_API rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
  *  Note that if either \a mode or \a width is NULL, -RIG_EINVAL is returned.
  *  Both must be given even if only one is actually wanted.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -2596,7 +2596,7 @@ pbwidth_t HAMLIB_API rig_passband_wide(RIG *rig, rmode_t mode)
  *  for VFOA, VFOB, VFOC respectively or RIG_VFO_MEM for Memory mode.
  *  Supported VFOs depends on rig capabilities.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -2738,7 +2738,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
  *  for VFOA, VFOB, VFOC respectively or RIG_VFO_MEM for Memory mode.
  *  Supported VFOs depends on rig capabilities.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -2818,7 +2818,7 @@ int HAMLIB_API rig_get_vfo(RIG *rig, vfo_t *vfo)
  *
  *  Sets "Push-To-Talk" on/off.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3103,7 +3103,7 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
  *
  *  Retrieves the status of PTT (are we on the air?).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3375,7 +3375,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
  *
  *  Retrieves the status of DCD (is squelch open?).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3489,7 +3489,7 @@ int HAMLIB_API rig_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
  *
  *  Sets the current repeater shift.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3560,7 +3560,7 @@ int HAMLIB_API rig_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift)
  *
  *  Retrieves the current repeater shift.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3636,7 +3636,7 @@ int HAMLIB_API rig_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
  *
  *  Sets the current repeater offset.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3706,7 +3706,7 @@ int HAMLIB_API rig_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs)
  *
  *  Retrieves the current repeater offset.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3781,7 +3781,7 @@ int HAMLIB_API rig_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs)
  *
  *  Sets the split(TX) frequency.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -3932,7 +3932,7 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
  *
  *  Retrieves the current split(TX) frequency.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4081,7 +4081,7 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
  *
  *  Sets the split(TX) mode.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4211,7 +4211,7 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
  *  The value stored at \a tx_mode location equals RIG_MODE_NONE
  *  when the current mode of the VFO is not defined (e.g. blank memory).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4345,7 +4345,7 @@ int HAMLIB_API rig_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
  *  the rig VFOs have to be exchanged or swapped to complete this
  *  combined function.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4460,7 +4460,7 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
  *  the rig VFOs have to be exchanged or swapped to complete this
  *  combined function.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4518,7 +4518,7 @@ int HAMLIB_API rig_get_split_freq_mode(RIG *rig,
  *
  *  Sets the current split mode.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4643,7 +4643,7 @@ int HAMLIB_API rig_set_split_vfo(RIG *rig,
  *
  *  Retrieves the current split mode.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4775,7 +4775,7 @@ int HAMLIB_API rig_get_split_vfo(RIG *rig,
  *
  *  Sets the current RIT offset. A value of 0 for \a rit disables RIT.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4846,7 +4846,7 @@ int HAMLIB_API rig_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
  *
  *  Retrieves the current RIT offset.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4923,7 +4923,7 @@ int HAMLIB_API rig_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
  *
  *  Sets the current XIT offset. A value of 0 for \a xit disables XIT.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -4994,7 +4994,7 @@ int HAMLIB_API rig_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
  *
  *  Retrieves the current XIT offset.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5071,7 +5071,7 @@ int HAMLIB_API rig_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
  *
  *  Sets the Tuning Step.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5142,7 +5142,7 @@ int HAMLIB_API rig_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
  *
  *  Retrieves the current tuning step.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5223,7 +5223,7 @@ int HAMLIB_API rig_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
     rig_set_ant(rig, RIG_VFO_RX, RIG_ANT_2);
 \endcode
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5394,7 +5394,7 @@ int HAMLIB_API rig_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
  *  also provided since the relative power is peculiar to a specific
  *  freq and mode range of the radio.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5450,7 +5450,7 @@ int HAMLIB_API rig_power2mW(RIG *rig,
  * also provided since the relative power is peculiar to a specific
  * freq and mode range of the radio.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5547,7 +5547,7 @@ shortfreq_t HAMLIB_API rig_get_resolution(RIG *rig, rmode_t mode)
  * See #RIG_POWER_ON, #RIG_POWER_OFF and #RIG_POWER_STANDBY defines
  * for the \a status.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, ortherwise
+ * \return RIG_OK if the operation has been successful, ortherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5584,7 +5584,7 @@ int HAMLIB_API rig_set_powerstat(RIG *rig, powerstat_t status)
  *  Retrieve the status of the radio. See RIG_POWER_ON, RIG_POWER_OFF and
  *  RIG_POWER_STANDBY defines for the \a status.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5626,7 +5626,7 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status)
  *  See RIG_RESET_NONE, RIG_RESET_SOFT and RIG_RESET_MCALL defines
  *  for the \a reset.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5701,7 +5701,7 @@ rig_model_t HAMLIB_API rig_probe(hamlib_port_t *port)
  * \warning this is really Experimental, It has been tested only
  * with IC-706MkIIG. any feedback welcome! --SF
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  */
@@ -5761,7 +5761,7 @@ vfo_op_t HAMLIB_API rig_has_vfo_op(RIG *rig, vfo_op_t op)
  *  Performs Memory/VFO operation.
  *  See #vfo_op_t for more information.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5865,7 +5865,7 @@ scan_t HAMLIB_API rig_has_scan(RIG *rig, scan_t scan)
  *  Performs scanning operation.
  *  See #scan_t for more information.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -5937,7 +5937,7 @@ int HAMLIB_API rig_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
  *  Sends DTMF digits.
  *  See DTMF change speed, etc. (TODO).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -6013,7 +6013,7 @@ int HAMLIB_API rig_send_dtmf(RIG *rig, vfo_t vfo, const char *digits)
  *  Receives DTMF digits (not blocking).
  *  See DTMF change speed, etc. (TODO).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -6088,7 +6088,7 @@ int HAMLIB_API rig_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
  *  Sends morse message.
  *  See keyer change speed, etc. (TODO).
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -6160,7 +6160,7 @@ int HAMLIB_API rig_send_morse(RIG *rig, vfo_t vfo, const char *msg)
  *
  *  Stops the send morse message.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -6258,7 +6258,7 @@ static int wait_morse_ptt(RIG *rig, vfo_t vfo)
  *
  *  waits for the end of the morse message to be sent.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -6315,7 +6315,7 @@ int HAMLIB_API rig_wait_morse(RIG *rig, vfo_t vfo)
  *
  *  Sends voice memory content.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case, cause is
  * set appropriately).
  *
@@ -6599,7 +6599,7 @@ int HAMLIB_API rig_get_rig_info(RIG *rig, char *response, int max_response_len)
  *  for VFOA, VFOB, VFOC respectively or RIG_VFO_MEM for Memory mode.
  *  Supported VFOs depends on rig capabilities.
  *
- * \RETURNFUNC(RIG_OK) if the operation has been successful, otherwise
+ * \return RIG_OK if the operation has been successful, otherwise
  * a negative value if an error occurred (in which case use rigerror(return)
  * for error message).
  *

commit 3e1b06432bd27fc26b41d030a8631ae85ee7e2fb
Author: Wouter van Gulik <pa...@gm...>
Date:   Wed Sep 8 22:35:14 2021 +0200

    scripts: Update example in readme, since 4.0 817 is 1020

diff --git a/scripts/build-w32.sh b/scripts/build-w32.sh
index 0f60eedc..aa8ad55b 100755
--- a/scripts/build-w32.sh
+++ b/scripts/build-w32.sh
@@ -129,9 +129,9 @@ directory.
 
 In short, the command syntax is of the form:
 
-  rigctl -m 120 -r COM1 -vvvvv
+  rigctl -m 1020 -r COM1 -vvvvv
 
-  -m -> Radio model 120, or Yaesu FT-817 (use 'rigctl -l' for a list)
+  -m -> Radio model 1020, or Yaesu FT-817 (use 'rigctl -l' for a list)
   -r -> Radio device, in this case COM1
   -v -> Verbosity level.  For testing four or five v characters are required.
         Five 'v's set a debug level of TRACE which generates a lot of screen
diff --git a/scripts/build-w64-jtsdk.sh b/scripts/build-w64-jtsdk.sh
index 9b07c0f7..af6e4c6b 100755
--- a/scripts/build-w64-jtsdk.sh
+++ b/scripts/build-w64-jtsdk.sh
@@ -139,9 +139,9 @@ directory.
 
 In short, the command syntax is of the form:
 
-  rigctl -m 120 -r COM1 -vvvvv
+  rigctl -m 1020 -r COM1 -vvvvv
 
-  -m -> Radio model 120, or Yaesu FT-817 (use 'rigctl -l' for a list)
+  -m -> Radio model 1020, or Yaesu FT-817 (use 'rigctl -l' for a list)
   -r -> Radio device, in this case COM1
   -v -> Verbosity level.  For testing four or five v characters are required.
         Five 'v's set a debug level of TRACE which generates a lot of screen
diff --git a/scripts/build-w64.sh b/scripts/build-w64.sh
index 9567414e..c2433578 100755
--- a/scripts/build-w64.sh
+++ b/scripts/build-w64.sh
@@ -129,9 +129,9 @@ directory.
 
 In short, the command syntax is of the form:
 
-  rigctl -m 120 -r COM1 -vvvvv
+  rigctl -m 1020 -r COM1 -vvvvv
 
-  -m -> Radio model 120, or Yaesu FT-817 (use 'rigctl -l' for a list)
+  -m -> Radio model 1020, or Yaesu FT-817 (use 'rigctl -l' for a list)
   -r -> Radio device, in this case COM1
   -v -> Verbosity level.  For testing four or five v characters are required.
         Five 'v's set a debug level of TRACE which generates a lot of screen

commit 037db1379bb34d8c92b1ca9d5754bb689d274dda
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 23:01:57 2021 -0500

    Update NEWS

diff --git a/NEWS b/NEWS
index d2e2d8cc..57f1e974 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Please send Hamlib bug reports to ham...@li...
 
 Version 4.4
         * 2021-??-??
+        * Icom rigs now default filter 2 when setting PKTUSB but user can override 
 
 Version 4.3
         * 2021-09-01

commit f064241c64cd72e045aed5f8e2b48f439a63fc4d
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 22:37:35 2021 -0500

    Update testlibusb.c warning to "may be" instead of "will be"

diff --git a/tests/testlibusb.c b/tests/testlibusb.c
index f01369a8..660420ec 100644
--- a/tests/testlibusb.c
+++ b/tests/testlibusb.c
@@ -343,7 +343,7 @@ static int test_wrapped_device(const char *device_name)
     return 0;
 }
 #else
-#warning LIBUSB-1.0.23 will be required in Hamlib > 4.3
+#warning LIBUSB-1.0.23 may be required in Hamlib > 4.3
 static int test_wrapped_device(const char *device_name)
 {
     (void)device_name;

commit f2c60aa33adfe5051b403e76efd4420c3f25cfdf
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 17:52:44 2021 -0500

    Since Icom rigs default to filter 2 if a filter is not selected we will do the same when turning on data mode
    https://github.com/Hamlib/Hamlib/issues/791

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index c316515e..d889ca57 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1883,12 +1883,12 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
         case RIG_MODE_PKTFM:
         case RIG_MODE_PKTAM:
             datamode[0] = 0x01;
-            datamode[1] = 0x01; // default to filter 1
+            datamode[1] = 0x02; // default to filter 2
             break;
 
         default:
             datamode[0] = 0x00;
-            datamode[1] = 0x01; // default to filter 1
+            datamode[1] = 0x02; // default to filter 2
             break;
         }
 

commit e900b4f9dc7e6c9328d6726f1d66152595d6e2bc
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 17:44:57 2021 -0500

    Change set_icom_set_mode_with_data to not change mode unless necessary
    Should allow filters to stay where they are set if USB-D is the starting mode
    https://github.com/Hamlib/Hamlib/issues/791

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 7d1d7eb9..c316515e 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1790,6 +1790,8 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     unsigned char ackbuf[MAXFRAMELEN];
     int ack_len = sizeof(ackbuf);
     rmode_t icom_mode;
+    rmode_t tmode;
+    pbwidth_t twidth;
     //struct icom_priv_data *priv = (struct icom_priv_data *) rig->state.priv;
     unsigned char dm_sub_cmd =
         rig->caps->rig_model == RIG_MODEL_IC7200  ? 0x04 : S_MEM_DATA_MODE;
@@ -1807,6 +1809,23 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
 
     ENTERFUNC;
 
+    // if our current mode and width is not changing do nothing
+    retval = rig_get_mode(rig, vfo, &tmode, &twidth);
+
+    if (retval != RIG_OK)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: get_mode failed: %s\n", __func__,
+                  rigerror(retval));
+        RETURNFUNC(retval);
+    }
+
+    if (tmode == mode && width == RIG_PASSBAND_NOCHANGE)
+    {
+        rig_debug(RIG_DEBUG_TRACE, "%s: mode/width not changing\n", __func__);
+        RETURNFUNC(RIG_OK);
+    }
+    // looks like we need to change it
+
     switch (mode)
     {
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 6c6e3d42..96637003 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210901"
+#define BACKEND_VER "20210907"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

commit 4679d0f2ef34d2e8600cb861ce5a024e09766803
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Sep 7 07:03:53 2021 -0500

    Make testlibusb.c compatible with libusb < 1.0.23

diff --git a/tests/testlibusb.c b/tests/testlibusb.c
index b1a92c9d..f01369a8 100644
--- a/tests/testlibusb.c
+++ b/tests/testlibusb.c
@@ -218,7 +218,10 @@ static void print_device(libusb_device *dev, libusb_device_handle *handle)
 
     case LIBUSB_SPEED_SUPER:    speed = "5G"; break;
 
+#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000107)
+
     case LIBUSB_SPEED_SUPER_PLUS:   speed = "10G"; break;
+#endif
 
     default:            speed = "Unknown";
     }

commit c53a288cd8e7b920cc3fbbf97ef5500371f9b218
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Sep 6 07:41:33 2021 -0500

    Add debug to show vfofixup being skipped due to satmode rig

diff --git a/src/rig.c b/src/rig.c
index bec62059..1898aef4 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -4549,8 +4549,12 @@ int HAMLIB_API rig_set_split_vfo(RIG *rig,
         RETURNFUNC(-RIG_ENAVAIL);
     }
 
-    // We fix up vfos for non-satmode rigs
-    if (!(rig->caps->has_get_func & RIG_FUNC_SATMODE))
+    // We fix up vfos for non-satmode rigs only
+    if (rig->caps->has_get_func & RIG_FUNC_SATMODE)
+    {
+        rig_debug(RIG_DEBUG_TRACE, "%s: satmode rig...not fixing up vfos rx=%s tx=%s\n", __func__, rig_strvfo(rx_vfo), rig_strvfo(tx_vfo));
+    }
+    else
     {
         rx_vfo = vfo_fixup(rig, rx_vfo, split);
         tx_vfo = vfo_fixup(rig, tx_vfo, split);

commit cd194b64502a0f23ee5ac98a3510e9a07569f95f
Merge: e9d32ed6 c7dbbfbc
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 4 16:53:02 2021 -0500

    Merge branch 'master' of https://github.com/Hamlib/Hamlib


commit c7dbbfbc323ae53a6498e01a49ce58a6211fc885
Merge: 187dcff6 b06a3c17
Author: Michael Black <mdb...@ya...>
Date:   Sat Sep 4 16:52:40 2021 -0500

    Merge pull request #788 from wutje/ft817_improvements
    
    FT817: add get_ant. Add SWR level. Fix ALC, PWR


commit b06a3c1714b416c0d5eca2000ae9ea785ffaa5d5
Merge: 5aa1572a 187dcff6
Author: Wouter van Gulik <pa...@gm...>
Date:   Sat Sep 4 23:16:18 2021 +0200

    Merge branch 'master' into ft817_improvements

diff --cc rigs/yaesu/ft897.c
index 310080eb,4c4772ef..7952a71e
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@@ -75,7 -75,7 +75,8 @@@
  #include "serial.h"
  #include "yaesu.h"
  #include "ft897.h"
 +#include "ft817.h" /* We use functions from the 817 code */
+ #include "ft857.h" //Needed for ft857_set_vfo, ft857_get_vfo
  #include "misc.h"
  #include "tones.h"
  #include "bandplan.h"

commit 5aa1572a304fc894fc436277a6f8dc2062944012
Merge: 6f02f38f d1c824be
Author: Wouter van Gulik <pa...@gm...>
Date:   Sat Sep 4 23:08:48 2021 +0200

    Merge branch 'master' into ft817_improvements

diff --cc rigs/yaesu/ft817.c
index 7e3619ac,73d67fd1..6fc58d71
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@@ -1396,9 -1149,9 +1396,7 @@@ static int ft817_set_vfo(RIG *rig, vfo_
      return ft817_send_cmd(rig, FT817_NATIVE_CAT_SET_VFOAB);
  }
  
--
--
 -int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 +static int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  {
      unsigned char data[YAESU_CMD_LENGTH - 1];
      int retval;
diff --cc rigs/yaesu/ft817.h
index 0e23be2e,97532dc0..475d74c0
--- a/rigs/yaesu/ft817.h
+++ b/rigs/yaesu/ft817.h
@@@ -75,8 -75,83 +75,7 @@@
   */
  #define FT817_CACHE_TIMEOUT     50
  
 -
 -enum ft817_native_cmd_e
 -{
 -    FT817_NATIVE_CAT_LOCK_ON = 0,
 -    FT817_NATIVE_CAT_LOCK_OFF,
 -    FT817_NATIVE_CAT_PTT_ON,
 -    FT817_NATIVE_CAT_PTT_OFF,
 -    FT817_NATIVE_CAT_SET_FREQ,
 -    FT817_NATIVE_CAT_SET_MODE_LSB,
 -    FT817_NATIVE_CAT_SET_MODE_USB,
 -    FT817_NATIVE_CAT_SET_MODE_CW,
 -    FT817_NATIVE_CAT_SET_MODE_CWR,
 -    FT817_NATIVE_CAT_SET_MODE_AM,
 -    FT817_NATIVE_CAT_SET_MODE_FM,
 -    FT817_NATIVE_CAT_SET_MODE_FM_N,
 -    FT817_NATIVE_CAT_SET_MODE_DIG,
 -    FT817_NATIVE_CAT_SET_MODE_PKT,
 -    FT817_NATIVE_CAT_CLAR_ON,
 -    FT817_NATIVE_CAT_CLAR_OFF,
 -    FT817_NATIVE_CAT_SET_CLAR_FREQ,
 -    FT817_NATIVE_CAT_SET_VFOAB,
 -    FT817_NATIVE_CAT_SPLIT_ON,
 -    FT817_NATIVE_CAT_SPLIT_OFF,
 -    FT817_NATIVE_CAT_SET_RPT_SHIFT_MINUS,
 -    FT817_NATIVE_CAT_SET_RPT_SHIFT_PLUS,
 -    FT817_NATIVE_CAT_SET_RPT_SHIFT_SIMPLEX,
 -    FT817_NATIVE_CAT_SET_RPT_OFFSET,
 -    FT817_NATIVE_CAT_SET_DCS_ON,
 -    FT817_NATIVE_CAT_SET_CTCSS_ON,
 -    FT817_NATIVE_CAT_SET_CTCSS_ENC_ON,
 -    FT817_NATIVE_CAT_SET_CTCSS_DCS_OFF,
 -    FT817_NATIVE_CAT_SET_CTCSS_FREQ,
 -    FT817_NATIVE_CAT_SET_DCS_CODE,
 -    FT817_NATIVE_CAT_GET_RX_STATUS,
 -    FT817_NATIVE_CAT_GET_TX_STATUS,
 -    FT817_NATIVE_CAT_GET_FREQ_MODE_STATUS,
 -    FT817_NATIVE_CAT_PWR_WAKE,
 -    FT817_NATIVE_CAT_PWR_ON,
 -    FT817_NATIVE_CAT_PWR_OFF,
 -    FT817_NATIVE_CAT_EEPROM_READ,
 -    FT817_NATIVE_SIZE       /* end marker */
 -};
 -
 -
 -typedef enum ft817_native_cmd_e ft817_native_cmd_t;
 -
--
 -/* fixme: why declare static? it has no effect */
 -static int ft817_init(RIG *rig);
 -static int ft817_open(RIG *rig);
 -static int ft817_cleanup(RIG *rig);
 -static int ft817_close(RIG *rig);
 -static int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 -static int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
 -static int ft817_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
 -static int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
 -static int ft817_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
 -static int ft817_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt);
 -static int ft817_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 -static int ft817_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);
 -static int ft817_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code);
 -static int ft817_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone);
 -static int ft817_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code);
 -static int ft817_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone);
 -static int ft817_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t shift);
 -static int ft817_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs);
 -static int ft817_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit);
 -static int ft817_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd);
  int ft817_set_powerstat(RIG *rig, powerstat_t status);
 -static int ft817_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);
 -static int ft817_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split,
 -                               vfo_t *tx_vfo);
 -static int ft817_set_split_vfo(RIG *rig, vfo_t vfo, split_t split,
 -                               vfo_t tx_vfo);
 -static int ft817_power2mW(RIG *rig, unsigned int *mwpower, float power,
 -                          freq_t freq, rmode_t mode);
 -static int ft817_mW2power(RIG *rig, float *power, unsigned int mwpower,
 -                          freq_t freq, rmode_t mode);
 +int ft817_read_ack(RIG *rig);
  
  #endif /* _FT817_H */

commit 6f02f38fdc752270b7cac6311bc8434d0d624600
Author: Wouter van Gulik <pa...@gm...>
Date:   Sun Aug 29 22:01:12 2021 +0200

    Add 60m to the 818 tx capabilities, it is one fo the few differences
    between 818 and 817.

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 1ee0e101..7e3619ac 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -500,7 +500,10 @@ const struct rig_caps ft818_caps =
     .tx_range_list1 =  {
         FRQ_RNG_HF(1, FT817_OTHER_TX_MODES, W(0.5), W(5), FT817_VFO_ALL, FT817_ANTS),
         FRQ_RNG_HF(1, FT817_AM_TX_MODES, W(0.5), W(1.5), FT817_VFO_ALL, FT817_ANTS),
-        /* TODO 60m is available seems always available on the 818 */
+
+        /* One of the key differences between 817 and 818: the 818 has 60m! */
+        FRQ_RNG_60m(1, FT817_OTHER_TX_MODES, W(0.5), W(5), FT817_VFO_ALL, FT817_ANTS),
+        FRQ_RNG_60m(1, FT817_AM_TX_MODES, W(0.5), W(1.5), FT817_VFO_ALL, FT817_ANTS),
 
         FRQ_RNG_6m(1, FT817_OTHER_TX_MODES, W(0.5), W(5), FT817_VFO_ALL, FT817_ANTS),
         FRQ_RNG_6m(1, FT817_AM_TX_MODES, W(0.5), W(1.5), FT817_VFO_ALL, FT817_ANTS),
@@ -526,7 +529,10 @@ const struct rig_caps ft818_caps =
     .tx_range_list2 =  {
         FRQ_RNG_HF(2, FT817_OTHER_TX_MODES, W(0.5), W(5), FT817_VFO_ALL, FT817_ANTS),
         FRQ_RNG_HF(2, FT817_AM_TX_MODES, W(0.5), W(1.5), FT817_VFO_ALL, FT817_ANTS),
-        /* FIXME: 60 meters in US version */
+
+        /* One of the key differences between 817 and 818: the 818 has 60m! */
+        FRQ_RNG_60m(2, FT817_OTHER_TX_MODES, W(0.5), W(5), FT817_VFO_ALL, FT817_ANTS),
+        FRQ_RNG_60m(2, FT817_AM_TX_MODES, W(0.5), W(1.5), FT817_VFO_ALL, FT817_ANTS),
 
         FRQ_RNG_6m(2, FT817_OTHER_TX_MODES, W(0.5), W(5), FT817_VFO_ALL, FT817_ANTS),
         FRQ_RNG_6m(2, FT817_AM_TX_MODES, W(0.5), W(1.5), FT817_VFO_ALL, FT817_ANTS),

commit 49b2eca6c1d355ce15e15c897e6ef241c989f9e2
Author: Wouter van Gulik <pa...@gm...>
Date:   Sat Sep 4 22:56:06 2021 +0200

    Add get_ant for 817. NO TESTED! I ONLY HAVE A FT818!

diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 38bc56d2..1ee0e101 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -57,6 +57,7 @@
 #include <stdlib.h>
 #include <string.h>     /* String function definitions */
 #include <unistd.h>     /* UNIX standard function definitions */
+#include <stdbool.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -172,6 +173,8 @@ static int ft817_mW2power(RIG *rig, float *power, unsigned int mwpower,
                           freq_t freq, rmode_t mode);
 static int ft817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
                              ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx);
+static int ft818_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
+                             ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx);
 
 /* Native ft817 cmd set prototypes. These are READ ONLY as each */
 /* rig instance will copy from these and modify if required . */
@@ -435,6 +438,7 @@ const struct rig_caps ft817_caps =
     .power2mW =         ft817_power2mW,
     .mW2power =         ft817_mW2power,
     .set_powerstat =    ft817_set_powerstat,
+    .get_ant =          ft817_get_ant,
     .get_level =        ft817_get_level,
     .set_func =         ft817_set_func,
     .vfo_op =           ft817_vfo_op,
@@ -581,7 +585,7 @@ const struct rig_caps ft818_caps =
     .power2mW =         ft817_power2mW,
     .mW2power =         ft817_mW2power,
     .set_powerstat =    ft817_set_powerstat,
-    .get_ant =          ft817_get_ant,
+    .get_ant =          ft818_get_ant,
     .get_level =        ft817_get_level,
     .set_func =         ft817_set_func,
     .vfo_op =           ft817_vfo_op,
@@ -1020,6 +1024,7 @@ static int ft817_get_tx_level(RIG *rig, value_t *val, unsigned char *tx_level, c
     }
 
     val->f = rig_raw2val_float(*tx_level, cal);
+    rig_debug(RIG_DEBUG_VERBOSE, "%s: level %f\n", __func__, val->f);
 
     return RIG_OK;
 }
@@ -1146,10 +1151,11 @@ static int ft817_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
     return RIG_OK;
 }
 
-static int ft817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
-                             ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx)
+static int ft818_817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
+                             ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx, bool is817)
 {
-    /* The FT818/817 has no targetable antenna, so rig.c switched the active VFO */
+    /* The FT818/817 has no RIG_TARGETABLE_ALL
+     * so rig.c switched the active VFO to the one requested */
     int ret;
     unsigned char eeprom_band, eeprom_ant;
 
@@ -1176,7 +1182,7 @@ static int ft817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
     }
 
     /* band info is 4 bit per VFO, for A lower nibble, B is upper nible */
-    switch(vfo) {
+    switch (vfo) {
         case RIG_VFO_A:
             eeprom_band &= 0xF;
         break;
@@ -1190,16 +1196,29 @@ static int ft817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
             return -RIG_EINTERNAL;
     }
 
+    /* The 818 and the 817 differ in bands: the 818 has 60m.
+     * The band selection flags for the 818 and 817 thus differ:
+     * 2 means 60m on 818 and 40m for 817.
+     * And the rest of the values are shifted.
+     *
+     * So to make the code simple: if we have a 817 and 2 or higher band then
+     * add 1 to the value to align it on the 818 mapping.
+     */
+    if (is817 && eeprom_band >= 2)
+    {
+        eeprom_band++;
+    }
+
     /* The 817/818 does not have a antenna selection per VFO but per band.
      * So we read the band for the requested VFO and then map it to the
      * selected antenna.
-     * TODO THIS IS 818 specific info: the 817 does not have 60m and
-     * thus has a shifted numbering!
      */
-    switch(eeprom_band) {
+
+
+    switch (eeprom_band) {
         case 0:  /* 160M */
         case 1:  /*  80M */
-        case 2:  /*  60M */
+        case 2:  /*  60M, 818 only */
         case 3:  /*  40M */
         case 4:  /*  30M */
         case 5:  /*  20M */
@@ -1243,6 +1262,21 @@ static int ft817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
     return RIG_OK;
 }
 
+static int ft817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
+                             ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx)
+{
+    return ft818_817_get_ant(rig, vfo, ant, option, ant_curr, ant_tx, ant_rx,
+            true);
+
+}
+
+static int ft818_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
+                             ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx)
+{
+    return ft818_817_get_ant(rig, vfo, ant, option, ant_curr, ant_tx, ant_rx,
+            false);
+
+}
 /* ---------------------------------------------------------------------- */
 
 int ft817_read_ack(RIG *rig)

commit e9d32ed6c9390ac6151cd11259b31f39bd5d9bb0
Merge: 06f471d5 187dcff6
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Sep 4 15:47:02 2021 -0500

    Merge branch 'master' of https://github.com/Hamlib/Hamlib


commit 187dcff6c5d2d8261584322fdaaeaae9182c8413
Merge: d1c824be 0ebf9974
Author: Michael Black <mdb...@ya...>
Date:   Sat Sep 4 15:46:51 2021 -0500

    Merge pull request #787 from wutje/yeasu_move_native_cmd_to_c_file
    
    Yeasu rigs: move native command to C file, move function declaration to C file

diff --cc rigs/yaesu/ft1000d.c
index 15029354,4374842b..04b75b79
--- a/rigs/yaesu/ft1000d.c
+++ b/rigs/yaesu/ft1000d.c
@@@ -2329,9 -2439,10 +2435,9 @@@ static int ft1000d_get_vfo(RIG *rig, vf
   *           In all other cases the passed vfo is selected if it differs
   *           from the currently selected VFO.
   */
- int ft1000d_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
+ static int ft1000d_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
  {
      struct ft1000d_priv_data *priv;
 -    struct rig_state *rig_s;
      unsigned char mdata[YAESU_CMD_LENGTH];
      int err;
  
@@@ -3296,8 -3408,10 +3402,8 @@@ static int ft1000d_get_update_data(RIG 
   * Returns:     RIG_OK if all called functions are successful,
   *              otherwise returns error from called functiion
   */
- int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
+ static int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
  {
 -    struct rig_state *rig_s;
 -    struct ft1000d_priv_data *priv;
      int err;
  
      rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@@ -3400,8 -3520,9 +3506,8 @@@ static int ft1000d_send_dynamic_cmd(RI
   * Returns:     RIG_OK if all called functions are successful,
   *              otherwise returns error from called functiion
   */
- int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
+ static int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
  {
 -    struct rig_state *rig_s;
      struct ft1000d_priv_data *priv;
      int err;
      // cppcheck-suppress *
@@@ -3458,9 -3581,10 +3564,9 @@@
   * Returns:     RIG_OK if all called functions are successful,
   *              otherwise returns error from called functiion
   */
- int ft1000d_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
+ static int ft1000d_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
  {
      struct ft1000d_priv_data *priv;
 -    struct rig_state *rig_s;
      int err;
  
      rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
diff --cc rigs/yaesu/ft1000mp.c
index 09c95396,5495255d..2f5b1390
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@@ -713,8 -807,9 +801,8 @@@ static int ft1000mp_open(RIG *rig
  
  
  
- int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
+ static int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  {
 -    struct rig_state *rig_s;
      struct ft1000mp_priv_data *p;
      unsigned char *cmd;           /* points to sequence to send */
      int cmd_index = 0;
diff --cc rigs/yaesu/ft600.c
index 43755559,c82df768..04a2d953
--- a/rigs/yaesu/ft600.c
+++ b/rigs/yaesu/ft600.c
@@@ -376,8 -476,9 +468,8 @@@ static int ft600_get_level(RIG *rig, vf
      return RIG_OK;
  }
  
- int ft600_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
+ static int ft600_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  {
 -    struct rig_state *rig_s;
      unsigned char p_cmd[YAESU_CMD_LENGTH];
      unsigned char cmd_index;  /* index of sequence to send */
  
@@@ -392,10 -495,10 +484,10 @@@
      freq = (int)freq / 10;
      to_bcd(p_cmd, freq, 8); /* store bcd format in in p_cmd */
  
 -    return write_block(&rig_s->rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
 +    return write_block(&rig->state.rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
  }
  
- int ft600_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
+ static int ft600_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
  {
  
      struct ft600_priv_data *priv = (struct ft600_priv_data *)rig->state.priv;
diff --cc rigs/yaesu/ft847.c
index addef755,ecc26205..986dfbc4
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@@ -702,8 -855,9 +842,8 @@@ static int opcode_vfo(RIG *rig, unsigne
   */
  
  
- int ft847_s...
 
[truncated message content]

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

From: Michael B. <mdb...@us...> - 2021-09-03 15:44:02

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  d1c824be5ca38efd9ca68e2ef5febe567cb2f686 (commit)
       via  820e4d43103b0b5cda944d496701adc15c16c822 (commit)
       via  6de4588335619e6ed3aae6dd36b32a5b4afa2de8 (commit)
       via  7a5834a9a370c37e76302b2bd438602edc2128dc (commit)
       via  acac64c1162b0b0ec3f329b8160cf2b5a7d08769 (commit)
       via  3e3436bdce4bf966e15c32eb5b167f39d7568fc2 (commit)
       via  ee566880036474fd3ad5a65b09730fad860ae41c (commit)
       via  9fad079730de45874e87d81beac75a71f80212f0 (commit)
       via  2ed6142851e9a75488afa26bfd15ce7325e9fe9d (commit)
       via  261825fa27a086fed5eb0ff7e6132d69dc050ca6 (commit)
      from  fe789607d098c10eee559596ba0191361c8935f8 (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 d1c824be5ca38efd9ca68e2ef5febe567cb2f686
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Fri Sep 3 10:17:51 2021 -0500

    Add simple.c example of rig_get_rig_info call

diff --git a/tests/simple.c b/tests/simple.c
new file mode 100644
index 00000000..165f4ec5
--- /dev/null
+++ b/tests/simple.c
@@ -0,0 +1,45 @@
+// Example of rig_get_rig_info
+// gcc -o simple simple.s -lhamlib
+
+#include <hamlib/rig.h>
+
+int main(int argc, char *argv[])
+{
+    rig_model_t model = 1;
+    RIG *rig;
+
+    rig_set_debug_level(RIG_DEBUG_WARN);
+    rig = rig_init(model);
+
+    if (rig == NULL)
+    {
+        fprintf(stderr, "rig_init failed\n");
+        return 1;
+    }
+
+    int retcode = rig_open(rig);
+
+    if (retcode != RIG_OK)
+    {
+        fprintf(stderr, "rig_open failed: %s\n", rigerror(retcode));
+        return 1;
+    }
+
+    char riginfo[1024];
+    retcode = rig_get_rig_info(rig, riginfo, sizeof(riginfo));
+
+    if (retcode != RIG_OK)
+    {
+        fprintf(stderr, "rig_get_rig_info failed: %s\n", rigerror(retcode));
+        return 1;
+    }
+
+    char vfo[16];
+    char mode[16];
+    double freq;
+    sscanf(riginfo, "VFO=%s Freq=%lf Mode=%s", vfo, &freq, mode);
+    printf("VFO=%s Freq=%.0f Mode=%s\n", vfo, freq, mode);
+    printf("=========================\nEntire response:\n%s", riginfo);
+    rig_close(rig);
+    return 0;
+}

commit 820e4d43103b0b5cda944d496701adc15c16c822
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Thu Sep 2 17:08:10 2021 -0500

    Fix compilation of misc.c with gmtime_r replacement function for mingw
    https://github.com/Hamlib/Hamlib/issues/784

diff --git a/src/misc.c b/src/misc.c
index bc679198..76121037 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -2346,6 +2346,27 @@ uint32_t CRC32_function(uint8_t *buf, uint32_t len)
     return crc ^ 0xFFFFFFFF;
 }
 
+#if defined(_WIN32)
+// gmtime_r can be defined by mingw
+#ifndef gmtime_r
+static struct tm *gmtime_r(const time_t *t, struct tm *r)
+{
+    // gmtime is threadsafe in windows because it uses TLS
+    struct tm *theTm = gmtime(t);
+
+    if (theTm)
+    {
+        *r = *theTm;
+        return r;
+    }
+    else
+    {
+        return 0;
+    }
+}
+#endif // gmtime_r
+#endif // _WIN32
+
 //! @cond Doxygen_Suppress
 char *date_strget(char *buf, int buflen)
 {

commit 6de4588335619e6ed3aae6dd36b32a5b4afa2de8
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 1 12:45:29 2021 -0500

    Do not do vfo_fixup on satmode rigs
    https://github.com/Hamlib/Hamlib/issues/782

diff --git a/src/rig.c b/src/rig.c
index dba18783..bec62059 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -4549,8 +4549,12 @@ int HAMLIB_API rig_set_split_vfo(RIG *rig,
         RETURNFUNC(-RIG_ENAVAIL);
     }
 
-    rx_vfo = vfo_fixup(rig, rx_vfo, split);
-    tx_vfo = vfo_fixup(rig, tx_vfo, split);
+    // We fix up vfos for non-satmode rigs
+    if (!(rig->caps->has_get_func & RIG_FUNC_SATMODE))
+    {
+        rx_vfo = vfo_fixup(rig, rx_vfo, split);
+        tx_vfo = vfo_fixup(rig, tx_vfo, split);
+    }
 
     // set rig to the the requested RX VFO
     TRACE;

commit 7a5834a9a370c37e76302b2bd438602edc2128dc
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 1 09:11:00 2021 -0500

    Fix bogus sscanf in kpa_get_powerstat -- function would not work

diff --git a/amplifiers/elecraft/kpa.c b/amplifiers/elecraft/kpa.c
index dc066de6..fa0ed55a 100644
--- a/amplifiers/elecraft/kpa.c
+++ b/amplifiers/elecraft/kpa.c
@@ -505,7 +505,7 @@ int kpa_get_powerstat(AMP *amp, powerstat_t *status)
     int retval;
     int operate;
     int ampon;
-    int nargs = sscanf(responsebuf, "^ON%d", &ampon);
+    int nargs;
 
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -518,6 +518,8 @@ int kpa_get_powerstat(AMP *amp, powerstat_t *status)
 
     if (retval != RIG_OK) { return retval; }
 
+    nargs = sscanf(responsebuf, "^ON%d", &ampon);
+
     if (nargs != 1)
     {
         rig_debug(RIG_DEBUG_VERBOSE, "%s Error: ^ON response='%s'\n", __func__,
diff --git a/amplifiers/elecraft/kpa1500.c b/amplifiers/elecraft/kpa1500.c
index 65724a4f..ea3b2775 100644
--- a/amplifiers/elecraft/kpa1500.c
+++ b/amplifiers/elecraft/kpa1500.c
@@ -65,7 +65,7 @@ const struct amp_caps kpa1500_amp_caps =
     AMP_MODEL(AMP_MODEL_ELECRAFT_KPA1500),
     .model_name =   "KPA1500",
     .mfg_name =     "Elecraft",
-    .version =      "20200112.0",
+    .version =      "20210901.0",
     .copyright =    "LGPL",
     .status =     RIG_STATUS_ALPHA,
     .amp_type =     AMP_TYPE_OTHER,

commit acac64c1162b0b0ec3f329b8160cf2b5a7d08769
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 1 09:08:13 2021 -0500

    Really fix icom_set_func so that it can also turn off DUAL_WATCH

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 6f3e187c..7d1d7eb9 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -6579,7 +6579,7 @@ int icom_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 
     case RIG_FUNC_DUAL_WATCH:
         fct_cn = C_SET_VFO;
-        fct_sc = S_DUAL;
+        fct_sc = status ? S_DUAL_ON : S_DUAL_OFF;
         break;
 
     case RIG_FUNC_SATMODE:

commit 3e3436bdce4bf966e15c32eb5b167f39d7568fc2
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 1 09:06:23 2021 -0500

    Fix gp2000_get_mode bogus sscanf -- potential seg fault function would not work

diff --git a/rigs/rs/gp2000.c b/rigs/rs/gp2000.c
index cfc34e3b..f2b7e402 100644
--- a/rigs/rs/gp2000.c
+++ b/rigs/rs/gp2000.c
@@ -237,7 +237,7 @@ gp2000_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
     int buf_len, retval;
     int nmode;
     char *pmode = "UNKNOWN";
-    int n = sscanf(buf, "%*cI%d", &nmode);
+    int n;
 
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s\n", __func__, rig_strvfo(vfo));
@@ -252,8 +252,11 @@ gp2000_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         return retval;
     }
 
+    n = sscanf(buf, "%*cI%d", &nmode);
+
     if (n != 1)
     {
+        rig_debug(RIG_DEBUG_ERR, "%s: unable to parse mode from '%s'\n", __func__, buf);
         return -RIG_EPROTO;
     }
 
diff --git a/rigs/rs/gp2000.h b/rigs/rs/gp2000.h
index 13ff3874..848f1ca0 100644
--- a/rigs/rs/gp2000.h
+++ b/rigs/rs/gp2000.h
@@ -25,7 +25,7 @@
 #define _XK2000_H 1
 
 #undef BACKEND_VER
-#define BACKEND_VER "20180307"
+#define BACKEND_VER "20210901"
 
 #include <hamlib/rig.h>
 

commit ee566880036474fd3ad5a65b09730fad860ae41c
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 1 09:00:56 2021 -0500

    Fix icom_set_func so that it can also turn off DUAL_WATCH
    In ic756.c remove ic756_set_func and use icom_set_func instead

diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c
index 64e8243f..cee4dc2a 100644
--- a/rigs/icom/ic756.c
+++ b/rigs/icom/ic756.c
@@ -88,8 +88,6 @@ struct cmdparams ic756pro_cmdparms[] =
          { 247 ,60 } \
     } }
 
-int ic756_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);
-
 /*
  *  This function deals with the older type radios with only 2 filter widths
  *  (0 - normal, 1 - narrow)
@@ -144,7 +142,7 @@ const struct rig_caps ic756_caps =
     RIG_MODEL(RIG_MODEL_IC756),
     .model_name = "IC-756",
     .mfg_name =  "Icom",
-    .version =  BACKEND_VER ".0",
+    .version =  BACKEND_VER ".1",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -260,7 +258,7 @@ const struct rig_caps ic756_caps =
     .decode_event =  icom_decode_event,
     .set_level =  icom_set_level,
     .get_level =  icom_get_level,
-    .set_func =  ic756_set_func,
+    .set_func =  icom_set_func,
     .get_func =  icom_get_func,
     .set_mem =  icom_set_mem,
     .vfo_op =  icom_vfo_op,
@@ -307,7 +305,7 @@ const struct rig_caps ic756pro_caps =
     RIG_MODEL(RIG_MODEL_IC756PRO),
     .model_name = "IC-756PRO",
     .mfg_name =  "Icom",
-    .version =  BACKEND_VER ".0",
+    .version =  BACKEND_VER ".1",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -422,7 +420,7 @@ const struct rig_caps ic756pro_caps =
     .decode_event =  icom_decode_event,
     .set_level =  icom_set_level,
     .get_level =  icom_get_level,
-    .set_func =  ic756_set_func,
+    .set_func =  icom_set_func,
     .get_func =  icom_get_func,
     .set_mem =  icom_set_mem,
     .vfo_op =  icom_vfo_op,
@@ -544,7 +542,7 @@ const struct rig_caps ic756pro2_caps =
     RIG_MODEL(RIG_MODEL_IC756PROII),
     .model_name = "IC-756PROII",
     .mfg_name =  "Icom",
-    .version =  BACKEND_VER ".0",
+    .version =  BACKEND_VER ".1",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -662,7 +660,7 @@ const struct rig_caps ic756pro2_caps =
     .get_parm =  icom_get_parm,
     .set_level =  icom_set_level,
     .get_level =  icom_get_level,
-    .set_func =  ic756_set_func,
+    .set_func =  icom_set_func,
     .get_func =  icom_get_func,
     .set_mem =  icom_set_mem,
     .vfo_op =  icom_vfo_op,
@@ -1105,7 +1103,7 @@ const struct rig_caps ic756pro3_caps =
     .get_parm =  icom_get_parm,
     .set_level =  icom_set_level,
     .get_level =  icom_get_level,
-    .set_func =  ic756_set_func,
+    .set_func =  icom_set_func,
     .get_func =  icom_get_func,
     .set_mem =  icom_set_mem,
     .vfo_op =  icom_vfo_op,
@@ -1130,37 +1128,3 @@ const struct rig_caps ic756pro3_caps =
     .set_ext_parm =  ic756pro2_set_ext_parm,
     .get_ext_parm =  ic756pro2_get_ext_parm,
 };
-
-int ic756_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
-{
-    unsigned char fctbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
-    int fct_len = 0, acklen, retval;
-    int fct_cn, fct_sc;        /* Command Number, Subcommand */
-
-    switch (func)
-    {
-    case RIG_FUNC_DUAL_WATCH:
-        fct_cn = C_SET_VFO;
-        fct_sc = status ? S_DUAL_ON : S_DUAL_OFF;
-        break;
-
-    default:
-        return icom_set_func(rig, vfo, func, status);
-    }
-
-    retval = icom_transaction(rig, fct_cn, fct_sc, fctbuf, fct_len, ackbuf,
-                              &acklen);
-
-    if (retval != RIG_OK)
-    {
-        return retval;
-    }
-
-    if (acklen != 1)
-    {
-        rig_debug(RIG_DEBUG_ERR, "%s: wrong frame len=%d\n", __func__, acklen);
-        return -RIG_EPROTO;
-    }
-
-    return RIG_OK;
-}
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index d13f9d65..6c6e3d42 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210828"
+#define BACKEND_VER "20210901"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

commit 9fad079730de45874e87d81beac75a71f80212f0
Merge: fe789607 2ed61428
Author: Michael Black <mdb...@ya...>
Date:   Wed Sep 1 06:06:12 2021 -0500

    Merge pull request #780 from wutje/yeasu_cmmd_indirection_removal
    
    Yaesu cmnd indirection removal


commit 2ed6142851e9a75488afa26bfd15ce7325e9fe9d
Author: Wouter van Gulik <pa...@gm...>
Date:   Mon Aug 30 22:42:51 2021 +0200

    Drop pointless rig_s assignment from Yeasu code.
    rig_s was assigned once and use once, better use rig->state direct;
    it gives less code to read.
    Also dramatically shrinked send_priv_cmd for ft1000mp, ft100, ft600,
    ft747 and ft847 by simply using ncmd direct instead of via a variabel.

diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c
index 98871fad..2919f836 100644
--- a/rigs/yaesu/ft100.c
+++ b/rigs/yaesu/ft100.c
@@ -386,19 +386,12 @@ int ft100_close(RIG *rig)
 
 static int ft100_send_priv_cmd(RIG *rig, unsigned char cmd_index)
 {
-
-    struct rig_state *rig_s;
-    unsigned char *cmd;       /* points to sequence to send */
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s called (%d)\n", __func__, cmd_index);
 
     if (!rig) { return -RIG_EINVAL; }
 
-    rig_s = &rig->state;
-
-    cmd = (unsigned char *) &ncmd[cmd_index].nseq; /* get native sequence */
-
-    return write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) &ncmd[cmd_index].nseq,
+            YAESU_CMD_LENGTH);
 }
 
 static int ft100_read_status(RIG *rig)
@@ -463,14 +456,11 @@ static int ft100_read_flags(RIG *rig)
 
 int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
-    struct rig_state *rig_s;
     unsigned char p_cmd[YAESU_CMD_LENGTH];
     unsigned char cmd_index;  /* index of sequence to send */
 
     if (!rig) { return -RIG_EINVAL; }
 
-    rig_s = &rig->state;
-
     rig_debug(RIG_DEBUG_VERBOSE, "ft100: requested freq = %"PRIfreq" Hz \n", freq);
 
     cmd_index = FT100_NATIVE_CAT_SET_FREQ;
@@ -481,7 +471,7 @@ int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     freq = (int)freq / 10;
     to_bcd(p_cmd, freq, 8); /* store bcd format in in p_cmd */
 
-    return write_block(&rig_s->rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
 }
 
 int ft100_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
@@ -1045,13 +1035,10 @@ int ft100_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *shift)
  */
 int ft100_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code)
 {
-    struct rig_state *rig_s;
     unsigned char p_cmd[YAESU_CMD_LENGTH];
     unsigned char cmd_index;  /* index of sequence to send */
     int pcode;
 
-    rig_s = &rig->state;
-
     for (pcode = 0; pcode < 104 && ft100_dcs_list[pcode] != 0; pcode++)
     {
         if (ft100_dcs_list[pcode] == code)
@@ -1075,7 +1062,7 @@ int ft100_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code)
 
     p_cmd[3] = (char)pcode;
 
-    return write_block(&rig_s->rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
 }
 
 int ft100_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code)
@@ -1102,7 +1089,6 @@ int ft100_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code)
  */
 int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    struct rig_state *rig_s;
     unsigned char p_cmd[YAESU_CMD_LENGTH];
     unsigned char cmd_index;  /* index of sequence to send */
     int ptone;
@@ -1121,8 +1107,6 @@ int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s = %.1f Hz, n=%d\n", __func__,
               (float)tone / 10, ptone);
 
@@ -1132,7 +1116,7 @@ int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 
     p_cmd[3] = (char)ptone;
 
-    return write_block(&rig_s->rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
 }
 
 int ft100_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c
index 9329273a..15029354 100644
--- a/rigs/yaesu/ft1000d.c
+++ b/rigs/yaesu/ft1000d.c
@@ -2332,7 +2332,6 @@ int ft1000d_get_vfo(RIG *rig, vfo_t *vfo)
 int ft1000d_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
 {
     struct ft1000d_priv_data *priv;
-    struct rig_state *rig_s;
     unsigned char mdata[YAESU_CMD_LENGTH];
     int err;
 
@@ -2375,8 +2374,7 @@ int ft1000d_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
         return err;
     }
 
-    rig_s = &rig->state;
-    err = read_block(&rig_s->rigport, (char *) mdata, FT1000D_READ_METER_LENGTH);
+    err = read_block(&rig->state.rigport, (char *) mdata, FT1000D_READ_METER_LENGTH);
 
     if (err < 0)
     {
@@ -3267,7 +3265,7 @@ int ft1000d_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
             return -RIG_EINVAL;
         }
 
-        n = read_block(&rig_s->rigport, p, rl);
+        n = read_block(&rig->state.rigport, p, rl);
 
     }
     while (n < 0 && retry-- >= 0);
@@ -3300,7 +3298,6 @@ int ft1000d_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
  */
 int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
 {
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -3311,8 +3308,6 @@ int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     if (!ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
@@ -3320,7 +3315,7 @@ int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    err = write_block(&rig_s->rigport, (char *) ncmd[ci].nseq,
+    err = write_block(&rig->state.rigport, (char *) ncmd[ci].nseq,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3328,7 +3323,7 @@ int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
         return err;
     }
 
-    hl_usleep(rig_s->rigport.write_delay * 1000);
+    hl_usleep(rig->state.rigport.write_delay * 1000);
     return RIG_OK;
 }
 
@@ -3349,7 +3344,6 @@ int ft1000d_send_dynamic_cmd(RIG *rig, unsigned char ci,
                              unsigned char p1, unsigned char p2,
                              unsigned char p3, unsigned char p4)
 {
-    struct rig_state *rig_s;
     struct ft1000d_priv_data *priv;
     int err;
 
@@ -3375,7 +3369,6 @@ int ft1000d_send_dynamic_cmd(RIG *rig, unsigned char ci,
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
     priv->p_cmd[3] = p1;
@@ -3383,7 +3376,7 @@ int ft1000d_send_dynamic_cmd(RIG *rig, unsigned char ci,
     priv->p_cmd[1] = p3;
     priv->p_cmd[0] = p4;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3391,7 +3384,7 @@ int ft1000d_send_dynamic_cmd(RIG *rig, unsigned char ci,
         return err;
     }
 
-    hl_usleep(rig_s->rigport.write_delay * 1000);
+    hl_usleep(rig->state.rigport.write_delay * 1000);
     return RIG_OK;
 }
 
@@ -3409,7 +3402,6 @@ int ft1000d_send_dynamic_cmd(RIG *rig, unsigned char ci,
  */
 int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft1000d_priv_data *priv;
     int err;
     // cppcheck-suppress *
@@ -3434,8 +3426,6 @@ int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     /* Copy native cmd freq_set to private cmd storage area */
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
@@ -3445,7 +3435,7 @@ int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
     rig_debug(RIG_DEBUG_TRACE, fmt, __func__, (int64_t)from_bcd(priv->p_cmd,
               FT1000D_BCD_DIAL) * 10);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3453,7 +3443,7 @@ int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
         return err;
     }
 
-    hl_usleep(rig_s->rigport.write_delay * 1000);
+    hl_usleep(rig->state.rigport.write_delay * 1000);
     return RIG_OK;
 }
 
@@ -3471,7 +3461,6 @@ int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 int ft1000d_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
 {
     struct ft1000d_priv_data *priv;
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -3485,7 +3474,6 @@ int ft1000d_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     rig_debug(RIG_DEBUG_TRACE, "%s: passed rit = %li Hz\n", __func__, rit);
 
     priv = (struct ft1000d_priv_data *) rig->state.priv;
-    rig_s = &rig->state;
 
     if (ncmd[ci].ncomp)
     {
@@ -3513,7 +3501,7 @@ int ft1000d_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     // Store bcd format into privat command storage area
     to_bcd(priv->p_cmd, labs(rit) / 10, FT1000D_BCD_RIT);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3521,7 +3509,7 @@ int ft1000d_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
         return err;
     }
 
-    hl_usleep(rig_s->rigport.write_delay * 1000);
+    hl_usleep(rig->state.rigport.write_delay * 1000);
     return RIG_OK;
 }
 
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 61f28ae7..09c95396 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -703,7 +703,7 @@ int ft1000mp_open(RIG *rig)
 
     /* send PACING cmd to rig  */
     cmd = p->p_cmd;
-    write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
 
     ft1000mp_get_vfo(rig, &rig->state.current_vfo);
     /* TODO */
@@ -715,7 +715,6 @@ int ft1000mp_open(RIG *rig)
 
 int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft1000mp_priv_data *p;
     unsigned char *cmd;           /* points to sequence to send */
     int cmd_index = 0;
@@ -724,8 +723,6 @@ int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
     p = (struct ft1000mp_priv_data *)rig->state.priv;
 
-    rig_s = &rig->state;
-
     rig_debug(RIG_DEBUG_TRACE, "%s: requested freq = %"PRIfreq" Hz \n", __func__,
               freq);
 
@@ -768,7 +765,7 @@ int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
               (freq_t)from_bcd(p->p_cmd, 8) * 10);
 
     cmd = p->p_cmd;               /* get native sequence */
-    write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
 
     RETURNFUNC(RIG_OK);
 }
@@ -1560,21 +1557,19 @@ int ft1000mp_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 static int ft1000mp_get_update_data(RIG *rig, unsigned char ci,
                                     unsigned char rl)
 {
-    struct rig_state *rig_s;
     struct ft1000mp_priv_data *p;
     int n;                        /* for read_  */
 
     ENTERFUNC;
 
     p = (struct ft1000mp_priv_data *)rig->state.priv;
-    rig_s = &rig->state;
 
     // timeout retries are done in read_block now
     // based on rig backed retry value
     /* send UPDATE command to fetch data*/
     ft1000mp_send_priv_cmd(rig, ci);
 
-    n = read_block(&rig_s->rigport, (char *) p->update_data, rl);
+    n = read_block(&rig->state.rigport, (char *) p->update_data, rl);
 
     if (n == -RIG_ETIMEOUT)
     {
@@ -1594,26 +1589,15 @@ static int ft1000mp_get_update_data(RIG *rig, unsigned char ci,
 
 static int ft1000mp_send_priv_cmd(RIG *rig, unsigned char ci)
 {
-    struct rig_state *rig_s;
-    unsigned char *cmd;           /* points to sequence to send */
-    unsigned char cmd_index;      /* index of sequence to send */
-
     ENTERFUNC;
 
-    rig_s = &rig->state;
-
-    cmd_index = ci;               /* get command */
-
-    if (! ncmd[cmd_index].ncomp)
+    if (! ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE, "%s: attempt to send incomplete sequence\n",
                   __func__);
         RETURNFUNC(-RIG_EINVAL);
     }
-
-    cmd = (unsigned char *) ncmd[cmd_index].nseq; /* get native sequence */
-    rig_flush(&rig_s->rigport);
-    write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    write_block(&rig->state.rigport, (char *) ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
     RETURNFUNC(RIG_OK);
 
diff --git a/rigs/yaesu/ft600.c b/rigs/yaesu/ft600.c
index 78dc7808..43755559 100644
--- a/rigs/yaesu/ft600.c
+++ b/rigs/yaesu/ft600.c
@@ -298,19 +298,11 @@ int ft600_close(RIG *rig)
 
 static int ft600_send_priv_cmd(RIG *rig, unsigned char cmd_index)
 {
-
-    struct rig_state *rig_s;
-    unsigned char *cmd;       /* points to sequence to send */
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s called (%d)\n", __func__, cmd_index);
 
     if (!rig) { return -RIG_EINVAL; }
 
-    rig_s = &rig->state;
-
-    cmd = (unsigned char *) &ncmd[cmd_index].nseq; /* get native sequence */
-
-    return write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) &ncmd[cmd_index].nseq, YAESU_CMD_LENGTH);
 }
 
 static int ft600_read_status(RIG *rig)
@@ -386,14 +378,11 @@ int ft600_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 int ft600_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
-    struct rig_state *rig_s;
     unsigned char p_cmd[YAESU_CMD_LENGTH];
     unsigned char cmd_index;  /* index of sequence to send */
 
     if (!rig) { return -RIG_EINVAL; }
 
-    rig_s = &rig->state;
-
     rig_debug(RIG_DEBUG_VERBOSE, "ft600: requested freq = %"PRIfreq" Hz \n", freq);
 
     cmd_index = FT600_NATIVE_CAT_SET_FREQ;
@@ -403,7 +392,7 @@ int ft600_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     freq = (int)freq / 10;
     to_bcd(p_cmd, freq, 8); /* store bcd format in in p_cmd */
 
-    return write_block(&rig_s->rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
 }
 
 int ft600_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c
index 7793420c..1d6ff267 100644
--- a/rigs/yaesu/ft747.c
+++ b/rigs/yaesu/ft747.c
@@ -372,7 +372,7 @@ int ft747_open(RIG *rig)
 
     /* send PACING cmd to rig, once for all */
 
-    ret = write_block(&rig_s->rigport, (char *)p->p_cmd, YAESU_CMD_LENGTH);
+    ret = write_block(&rig->state.rigport, (char *)p->p_cmd, YAESU_CMD_LENGTH);
 
     if (ret < 0)
     {
@@ -407,7 +407,6 @@ int ft747_close(RIG *rig)
 
 int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft747_priv_data *p;
     unsigned char *cmd;       /* points to sequence to send */
     // cppcheck-suppress *
@@ -415,8 +414,6 @@ int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
     p = (struct ft747_priv_data *)rig->state.priv;
 
-    rig_s = &rig->state;
-
     rig_debug(RIG_DEBUG_VERBOSE, "ft747: requested freq = %"PRIfreq" Hz \n", freq);
 
     /*
@@ -435,7 +432,7 @@ int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     rig_force_cache_timeout(&p->status_tv);
 
     cmd = p->p_cmd; /* get native sequence */
-    return write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
 }
 
 
@@ -909,24 +906,14 @@ static int ft747_get_update_data(RIG *rig)
 
 static int ft747_send_priv_cmd(RIG *rig, unsigned char ci)
 {
-
-    struct rig_state *rig_s;
-    unsigned char *cmd;       /* points to sequence to send */
-    unsigned char cmd_index;  /* index of sequence to send */
-
-    rig_s = &rig->state;
-
-    cmd_index = ci;       /* get command */
-
-    if (! ft747_ncmd[cmd_index].ncomp)
+    if (! ft747_ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_VERBOSE, "%s: attempt to send incomplete sequence\n",
                   __func__);
         return -RIG_EINVAL;
     }
 
-    cmd = (unsigned char *) ft747_ncmd[cmd_index].nseq; /* get native sequence */
-    return write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) ft747_ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
 }
 
diff --git a/rigs/yaesu/ft840.c b/rigs/yaesu/ft840.c
index c381217d..5e9f573b 100644
--- a/rigs/yaesu/ft840.c
+++ b/rigs/yaesu/ft840.c
@@ -1697,7 +1697,6 @@ static int ft840_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 
 static int ft840_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 {
-    struct rig_state *rig_s;
     struct ft840_priv_data *priv;
     int n, err;                       /* for read_  */
 
@@ -1709,7 +1708,6 @@ static int ft840_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
     }
 
     priv = (struct ft840_priv_data *)rig->state.priv;
-    rig_s = &rig->state;
 
     err = ft840_send_static_cmd(rig, ci);
 
@@ -1718,7 +1716,7 @@ static int ft840_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
         return err;
     }
 
-    n = read_block(&rig_s->rigport, (char *) priv->update_data, rl);
+    n = read_block(&rig->state.rigport, (char *) priv->update_data, rl);
 
     if (n < 0)
     {
@@ -1745,7 +1743,6 @@ static int ft840_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 
 static int ft840_send_static_cmd(RIG *rig, unsigned char ci)
 {
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -1755,8 +1752,6 @@ static int ft840_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     if (!ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
@@ -1764,7 +1759,7 @@ static int ft840_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    err = write_block(&rig_s->rigport, (char *) ncmd[ci].nseq,
+    err = write_block(&rig->state.rigport, (char *) ncmd[ci].nseq,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1794,7 +1789,6 @@ static int ft840_send_dynamic_cmd(RIG *rig, unsigned char ci,
                                   unsigned char p1, unsigned char p2,
                                   unsigned char p3, unsigned char p4)
 {
-    struct rig_state *rig_s;
     struct ft840_priv_data *priv;
     int err;
 
@@ -1819,7 +1813,6 @@ static int ft840_send_dynamic_cmd(RIG *rig, unsigned char ci,
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
     priv->p_cmd[P1] = p1;         /* ick */
@@ -1827,7 +1820,7 @@ static int ft840_send_dynamic_cmd(RIG *rig, unsigned char ci,
     priv->p_cmd[P3] = p3;
     priv->p_cmd[P4] = p4;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1855,7 +1848,6 @@ static int ft840_send_dynamic_cmd(RIG *rig, unsigned char ci,
 
 static int ft840_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft840_priv_data *priv;
     int err;
     // cppcheck-suppress *
@@ -1880,8 +1872,6 @@ static int ft840_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     /* Copy native cmd freq_set to private cmd storage area */
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
@@ -1891,7 +1881,7 @@ static int ft840_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
     rig_debug(RIG_DEBUG_TRACE, fmt, __func__, (int64_t)from_bcd(priv->p_cmd,
               FT840_BCD_DIAL) * 10);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1924,7 +1914,6 @@ static int ft840_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 #ifdef USE_FT840_SET_RIT
 static int ft840_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
 {
-    struct rig_state *rig_s;
     struct ft840_priv_data *priv;
     unsigned char p1;
     unsigned char p2;
@@ -1949,8 +1938,6 @@ static int ft840_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     p1 = CLAR_SET_FREQ;
 
     if (rit < 0)
@@ -1976,7 +1963,7 @@ static int ft840_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     priv->p_cmd[P1] = p1;         /* ick */
     priv->p_cmd[P2] = p2;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index 69242e70..addef755 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -645,15 +645,6 @@ int ft847_close(RIG *rig)
 
 static int ft847_send_priv_cmd(RIG *rig, int cmd_index)
 {
-
-    struct rig_state *rig_s;
-    unsigned char *cmd;       /* points to sequence to send */
-
-    if (!rig)
-    {
-        return -RIG_EINVAL;
-    }
-
     if (! ncmd[cmd_index].ncomp)
     {
         rig_debug(RIG_DEBUG_VERBOSE, "%s: attempt to send incomplete sequence\n",
@@ -661,11 +652,7 @@ static int ft847_send_priv_cmd(RIG *rig, int cmd_index)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
-    cmd = (unsigned char *) ncmd[cmd_index].nseq; /* get native sequence */
-
-    return write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *) ncmd[cmd_index].nseq, YAESU_CMD_LENGTH);
 }
 
 
@@ -717,7 +704,6 @@ static int opcode_vfo(RIG *rig, unsigned char *cmd, int cmd_index, vfo_t vfo)
 
 int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
-    struct rig_state *rig_s;
     unsigned char p_cmd[YAESU_CMD_LENGTH]; /* sequence to send */
     int ret;
     // cppcheck-suppress *
@@ -728,8 +714,6 @@ int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     rig_debug(RIG_DEBUG_VERBOSE, "ft847: requested freq = %"PRIfreq" Hz, vfo=%s\n",
               freq, rig_strvfo(vfo));
 
@@ -761,7 +745,7 @@ int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         }
     }
 
-    return write_block(&rig_s->rigport, (char *)p_cmd, YAESU_CMD_LENGTH);
+    return write_block(&rig->state.rigport, (char *)p_cmd, YAESU_CMD_LENGTH);
 }
 
 #define MD_LSB  0x00
diff --git a/rigs/yaesu/ft890.c b/rigs/yaesu/ft890.c
index 0ef0e00e..5c1b63e4 100644
--- a/rigs/yaesu/ft890.c
+++ b/rigs/yaesu/ft890.c
@@ -1636,7 +1636,6 @@ static int ft890_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 
 static int ft890_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 {
-    struct rig_state *rig_s;
     struct ft890_priv_data *priv;
     int n, err;                       /* for read_  */
 
@@ -1648,7 +1647,6 @@ static int ft890_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
     }
 
     priv = (struct ft890_priv_data *)rig->state.priv;
-    rig_s = &rig->state;
 
     err = ft890_send_static_cmd(rig, ci);
 
@@ -1657,7 +1655,7 @@ static int ft890_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
         return err;
     }
 
-    n = read_block(&rig_s->rigport, (char *) priv->update_data, rl);
+    n = read_block(&rig->state.rigport, (char *) priv->update_data, rl);
 
     if (n < 0)
     {
@@ -1684,7 +1682,6 @@ static int ft890_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 
 static int ft890_send_static_cmd(RIG *rig, unsigned char ci)
 {
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -1694,8 +1691,6 @@ static int ft890_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     if (!ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
@@ -1703,7 +1698,7 @@ static int ft890_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    err = write_block(&rig_s->rigport, (char *) ncmd[ci].nseq,
+    err = write_block(&rig->state.rigport, (char *) ncmd[ci].nseq,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1733,7 +1728,6 @@ static int ft890_send_dynamic_cmd(RIG *rig, unsigned char ci,
                                   unsigned char p1, unsigned char p2,
                                   unsigned char p3, unsigned char p4)
 {
-    struct rig_state *rig_s;
     struct ft890_priv_data *priv;
     int err;
 
@@ -1758,7 +1752,6 @@ static int ft890_send_dynamic_cmd(RIG *rig, unsigned char ci,
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
     priv->p_cmd[P1] = p1;         /* ick */
@@ -1766,7 +1759,7 @@ static int ft890_send_dynamic_cmd(RIG *rig, unsigned char ci,
     priv->p_cmd[P3] = p3;
     priv->p_cmd[P4] = p4;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1794,7 +1787,6 @@ static int ft890_send_dynamic_cmd(RIG *rig, unsigned char ci,
 
 static int ft890_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft890_priv_data *priv;
     int err;
     // cppcheck-suppress *
@@ -1819,8 +1811,6 @@ static int ft890_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     /* Copy native cmd freq_set to private cmd storage area */
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
@@ -1830,7 +1820,7 @@ static int ft890_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
     rig_debug(RIG_DEBUG_TRACE, fmt, __func__, (int64_t)from_bcd(priv->p_cmd,
               FT890_BCD_DIAL) * 10);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1862,7 +1852,6 @@ static int ft890_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 
 static int ft890_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
 {
-    struct rig_state *rig_s;
     struct ft890_priv_data *priv;
     unsigned char p1;
     unsigned char p2;
@@ -1887,8 +1876,6 @@ static int ft890_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     p1 = CLAR_SET_FREQ;
 
     if (rit < 0)
@@ -1914,7 +1901,7 @@ static int ft890_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     priv->p_cmd[P1] = p1;         /* ick */
     priv->p_cmd[P2] = p2;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
diff --git a/rigs/yaesu/ft900.c b/rigs/yaesu/ft900.c
index 63571919..72f561a6 100644
--- a/rigs/yaesu/ft900.c
+++ b/rigs/yaesu/ft900.c
@@ -1638,10 +1638,9 @@ static int ft900_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 
 static int ft900_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 {
-    struct rig_state *rig_s;
     struct ft900_priv_data *priv;
-    int n, err;                       /* for read_  */
-
+    int err;
+    int n;
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
     if (!rig)
@@ -1650,7 +1649,6 @@ static int ft900_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
     }
 
     priv = (struct ft900_priv_data *)rig->state.priv;
-    rig_s = &rig->state;
 
     err = ft900_send_static_cmd(rig, ci);
 
@@ -1659,7 +1657,7 @@ static int ft900_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
         return err;
     }
 
-    n = read_block(&rig_s->rigport, (char *) priv->update_data, rl);
+    n = read_block(&rig->state.rigport, (char *) priv->update_data, rl);
 
     if (n < 0)
     {
@@ -1686,7 +1684,6 @@ static int ft900_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 
 static int ft900_send_static_cmd(RIG *rig, unsigned char ci)
 {
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -1696,8 +1693,6 @@ static int ft900_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     if (!ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
@@ -1705,7 +1700,7 @@ static int ft900_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    err = write_block(&rig_s->rigport, (char *) ncmd[ci].nseq,
+    err = write_block(&rig->state.rigport, (char *) ncmd[ci].nseq,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1735,7 +1730,6 @@ static int ft900_send_dynamic_cmd(RIG *rig, unsigned char ci,
                                   unsigned char p1, unsigned char p2,
                                   unsigned char p3, unsigned char p4)
 {
-    struct rig_state *rig_s;
     struct ft900_priv_data *priv;
     int err;
 
@@ -1760,7 +1754,6 @@ static int ft900_send_dynamic_cmd(RIG *rig, unsigned char ci,
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
     priv->p_cmd[P1] = p1;         /* ick */
@@ -1768,7 +1761,7 @@ static int ft900_send_dynamic_cmd(RIG *rig, unsigned char ci,
     priv->p_cmd[P3] = p3;
     priv->p_cmd[P4] = p4;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1796,7 +1789,6 @@ static int ft900_send_dynamic_cmd(RIG *rig, unsigned char ci,
 
 static int ft900_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft900_priv_data *priv;
     int err;
     // cppcheck-suppress *
@@ -1821,8 +1813,6 @@ static int ft900_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     /* Copy native cmd freq_set to private cmd storage area */
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
@@ -1832,7 +1822,7 @@ static int ft900_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
     rig_debug(RIG_DEBUG_TRACE, fmt, __func__, (int64_t)from_bcd(priv->p_cmd,
               FT900_BCD_DIAL) * 10);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -1864,7 +1854,6 @@ static int ft900_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 
 static int ft900_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
 {
-    struct rig_state *rig_s;
     struct ft900_priv_data *priv;
     unsigned char p1;
     unsigned char p2;
@@ -1889,8 +1878,6 @@ static int ft900_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     p1 = CLAR_SET_FREQ;
 
     if (rit < 0)
@@ -1916,7 +1903,7 @@ static int ft900_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     priv->p_cmd[P1] = p1;         /* ick */
     priv->p_cmd[P2] = p2;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
diff --git a/rigs/yaesu/ft920.c b/rigs/yaesu/ft920.c
index d44fe552..900cbc2f 100644
--- a/rigs/yaesu/ft920.c
+++ b/rigs/yaesu/ft920.c
@@ -453,7 +453,7 @@ static int ft920_open(RIG *rig)
 
     rig_debug(RIG_DEBUG_TRACE, "%s: read pacing = %i\n", __func__, priv->pacing);
 
-    err = write_block(&rig_s->rigport, (char *) priv->p_cmd, YAESU_CMD_LENGTH);
+    err = write_block(&rig->state.rigport, (char *) priv->p_cmd, YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
     {
@@ -2350,7 +2350,6 @@ static int ft920_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 
 static int ft920_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 {
-    struct rig_state *rig_s;
     struct ft920_priv_data *priv;
     int n;                              /* for read_  */
     int err;
@@ -2363,7 +2362,6 @@ static int ft920_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
     }
 
     priv = (struct ft920_priv_data *)rig->state.priv;
-    rig_s = &rig->state;
 
     err = ft920_send_static_cmd(rig, ci);
 
@@ -2372,7 +2370,7 @@ static int ft920_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
         return err;
     }
 
-    n = read_block(&rig_s->rigport, (char *)priv->update_data, rl);
+    n = read_block(&rig->state.rigport, (char *)priv->update_data, rl);
 
     if (n < 0)
     {
@@ -2399,7 +2397,6 @@ static int ft920_get_update_data(RIG *rig, unsigned char ci, unsigned char rl)
 
 static int ft920_send_static_cmd(RIG *rig, unsigned char ci)
 {
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -2409,7 +2406,6 @@ static int ft920_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
     /*
      * If we've been passed a command index (ci) that is marked
      * as dynamic (0), then bail out.
@@ -2421,7 +2417,7 @@ static int ft920_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    err = write_block(&rig_s->rigport, (char *) ncmd[ci].nseq,
+    err = write_block(&rig->state.rigport, (char *) ncmd[ci].nseq,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -2451,7 +2447,6 @@ static int ft920_send_dynamic_cmd(RIG *rig, unsigned char ci,
                                   unsigned char p1, unsigned char p2,
                                   unsigned char p3, unsigned char p4)
 {
-    struct rig_state *rig_s;
     struct ft920_priv_data *priv;
     int err;
 
@@ -2481,7 +2476,6 @@ static int ft920_send_dynamic_cmd(RIG *rig, unsigned char ci,
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
     priv->p_cmd[P1] = p1;               /* ick */
@@ -2489,7 +2483,7 @@ static int ft920_send_dynamic_cmd(RIG *rig, unsigned char ci,
     priv->p_cmd[P3] = p3;
     priv->p_cmd[P4] = p4;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH);
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
     {
@@ -2516,7 +2510,6 @@ static int ft920_send_dynamic_cmd(RIG *rig, unsigned char ci,
 
 static int ft920_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft920_priv_data *priv;
     int err;
     // cppcheck-suppress *
@@ -2545,8 +2538,6 @@ static int ft920_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     /* Copy native cmd freq_set to private cmd storage area */
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
@@ -2556,7 +2547,7 @@ static int ft920_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
     rig_debug(RIG_DEBUG_TRACE, fmt, __func__, (int64_t)from_bcd(priv->p_cmd,
               FT920_BCD_DIAL) * 10);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH);
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
     {
@@ -2587,7 +2578,6 @@ static int ft920_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 
 static int ft920_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
 {
-    struct rig_state *rig_s;
     struct ft920_priv_data *priv;
     unsigned char p1;
     unsigned char p2;
@@ -2616,8 +2606,6 @@ static int ft920_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     p1 = CLAR_SET_FREQ;
 
     if (rit < 0)
@@ -2642,7 +2630,7 @@ static int ft920_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     priv->p_cmd[P1] = p1;               /* ick */
     priv->p_cmd[P2] = p2;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH);
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
     {
diff --git a/rigs/yaesu/ft990.c b/rigs/yaesu/ft990.c
index 41cec45d..4c59dae0 100644
--- a/rigs/yaesu/ft990.c
+++ b/rigs/yaesu/ft990.c
@@ -2281,7 +2281,6 @@ int ft990_get_vfo(RIG *rig, vfo_t *vfo)
 int ft990_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
 {
     struct ft990_priv_data *priv;
-    struct rig_state *rig_s;
     unsigned char mdata[YAESU_CMD_LENGTH];
     int err;
 
@@ -2324,8 +2323,7 @@ int ft990_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
         return err;
     }
 
-    rig_s = &rig->state;
-    err = read_block(&rig_s->rigport, (char *) mdata, FT990_READ_METER_LENGTH);
+    err = read_block(&rig->state.rigport, (char *) mdata, FT990_READ_METER_LENGTH);
 
     if (err < 0)
     {
@@ -3124,7 +3122,6 @@ int ft990_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
  */
 int ft990_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
 {
-    struct rig_state *rig_s;
     struct ft990_priv_data *priv;
     int n;
     int err;
@@ -3142,7 +3139,6 @@ int ft990_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
     }
 
     priv = (struct ft990_priv_data *)rig->state.priv;
-    rig_s = &rig->state;
 
     if (ci == FT990_NATIVE_UPDATE_MEM_CHNL_DATA)
         // P4 = 0x01 to 0x5a for channel 1 - 90
@@ -3194,7 +3190,7 @@ int ft990_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
         return -RIG_EINVAL;
     }
 
-    n = read_block(&rig_s->rigport, p, rl);
+    n = read_block(&rig->state.rigport, p, rl);
 
     if (n < 0)
     {
@@ -3224,7 +3220,6 @@ int ft990_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
  */
 int ft990_send_static_cmd(RIG *rig, unsigned char ci)
 {
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -3234,8 +3229,6 @@ int ft990_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     if (!ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
@@ -3243,7 +3236,7 @@ int ft990_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    err = write_block(&rig_s->rigport, (char *) ncmd[ci].nseq,
+    err = write_block(&rig->state.rigport, (char *) ncmd[ci].nseq,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3271,7 +3264,6 @@ int ft990_send_dynamic_cmd(RIG *rig, unsigned char ci,
                            unsigned char p1, unsigned char p2,
                            unsigned char p3, unsigned char p4)
 {
-    struct rig_state *rig_s;
     struct ft990_priv_data *priv;
     int err;
 
@@ -3296,7 +3288,6 @@ int ft990_send_dynamic_cmd(RIG *rig, unsigned char ci,
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
     priv->p_cmd[3] = p1;
@@ -3304,7 +3295,7 @@ int ft990_send_dynamic_cmd(RIG *rig, unsigned char ci,
     priv->p_cmd[1] = p3;
     priv->p_cmd[0] = p4;
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3330,7 +3321,6 @@ int ft990_send_dynamic_cmd(RIG *rig, unsigned char ci,
  */
 int ft990_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 {
-    struct rig_state *rig_s;
     struct ft990_priv_data *priv;
     int err;
     // cppcheck-suppress *
@@ -3355,8 +3345,6 @@ int ft990_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    rig_s = &rig->state;
-
     /* Copy native cmd freq_set to private cmd storage area */
     memcpy(&priv->p_cmd, &ncmd[ci].nseq, YAESU_CMD_LENGTH);
 
@@ -3366,7 +3354,7 @@ int ft990_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
     rig_debug(RIG_DEBUG_TRACE, fmt, __func__, (int64_t)from_bcd(priv->p_cmd,
               FT990_BCD_DIAL) * 10);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3391,7 +3379,6 @@ int ft990_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 int ft990_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
 {
     struct ft990_priv_data *priv;
-    struct rig_state *rig_s;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -3405,7 +3392,6 @@ int ft990_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     rig_debug(RIG_DEBUG_TRACE, "%s: passed rit = %li Hz\n", __func__, rit);
 
     priv = (struct ft990_priv_data *) rig->state.priv;
-    rig_s = &rig->state;
 
     if (ncmd[ci].ncomp)
     {
@@ -3433,7 +3419,7 @@ int ft990_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     // Store bcd format into privat command storage area
     to_bcd(priv->p_cmd, labs(rit) / 10, FT990_BCD_RIT);
 
-    err = write_block(&rig_s->rigport, (char *) &priv->p_cmd,
+    err = write_block(&rig->state.rigport, (char *) &priv->p_cmd,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)

commit 261825fa27a086fed5eb0ff7e6132d69dc050ca6
Author: Wouter van Gulik <pa...@gm...>
Date:   Mon Aug 30 21:48:59 2021 +0200

    Stop copying table to private data, use table direct.
    The table is never written so there is no point makeing the copy;
    it only adds confusion for a programmer.

diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c
index 8d801cd9..9329273a 100644
--- a/rigs/yaesu/ft1000d.c
+++ b/rigs/yaesu/ft1000d.c
@@ -135,7 +135,6 @@ struct ft1000d_priv_data
     vfo_t split_vfo;                          /* TX VFO in split mode Added on 16 Dec 2016 to include FT1000D function */
     split_t split;                              /* split active or not Added on 16 Dec 2016 to include FT1000D function */
     unsigned char p_cmd[YAESU_CMD_LENGTH];    /* private copy of CAT cmd */
-    yaesu_cmd_set_t pcs[FT1000D_NATIVE_SIZE];   /* private cmd set */
     ft1000d_update_data_t update_data;          /* returned data */
 };
 
@@ -325,9 +324,6 @@ int ft1000d_init(RIG *rig)
 
     priv = rig->state.priv;
 
-// Copy native cmd set to private cmd storage area
-    memcpy(priv->pcs, ncmd, sizeof(ncmd));
-
     // Set default pacing value
     priv->pacing = FT1000D_PACING_DEFAULT_VALUE;
 
@@ -3297,7 +3293,7 @@ int ft1000d_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
  * TODO: place variant of this in yaesu.c
  *
  * Arguments:   *rig    Valid RIG instance
- *              ci      Command index of the pcs struct
+ *              ci      Command index of the ncmd table
  *
  * Returns:     RIG_OK if all called functions are successful,
  *              otherwise returns error from called functiion
@@ -3305,7 +3301,6 @@ int ft1000d_get_update_data(RIG *rig, unsigned char ci, unsigned short ch)
 int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
 {
     struct rig_state *rig_s;
-    struct ft1000d_priv_data *priv;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -3316,17 +3311,16 @@ int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
         return -RIG_EINVAL;
     }
 
-    priv = (struct ft1000d_priv_data *)rig->state.priv;
     rig_s = &rig->state;
 
-    if (!priv->pcs[ci].ncomp)
+    if (!ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
                   "%s: Attempt to send incomplete sequence\n", __func__);
         return -RIG_EINVAL;
     }
 
-    err = write_block(&rig_s->rigport, (char *) priv->pcs[ci].nseq,
+    err = write_block(&rig_s->rigport, (char *) ncmd[ci].nseq,
                       YAESU_CMD_LENGTH);
 
     if (err != RIG_OK)
@@ -3345,7 +3339,7 @@ int ft1000d_send_static_cmd(RIG *rig, unsigned char ci)
  * TODO: place variant of this in yaesu.c
  *
  * Arguments:   *rig    Valid RIG instance
- *              ci      Command index of the pcs struct
+ *              ci      Command index of the ncmd table
  *              p1-p4   Command parameters
  *
  * Returns:     RIG_OK if all called functions are successful,
@@ -3374,7 +3368,7 @@ int ft1000d_send_dynamic_cmd(RIG *rig, unsigned char ci,
 
     priv = (struct ft1000d_priv_data *)rig->state.priv;
 
-    if (priv->pcs[ci].ncomp)
+    if (ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
                   "%s: Attempt to modify complete sequence\n", __func__);
@@ -3408,7 +3402,6 @@ int ft1000d_send_dynamic_cmd(RIG *rig, unsigned char ci,
  * TODO: place variant of this in yaesu.c
  *
  * Arguments:   *rig    Valid RIG instance
- *              ci      Command index of the pcs struct
  *              freq    freq_t frequency value
  *
  * Returns:     RIG_OK if all called functions are successful,
@@ -3434,7 +3427,7 @@ int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
 
     priv = (struct ft1000d_priv_data *)rig->state.priv;
 
-    if (priv->pcs[ci].ncomp)
+    if (ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE,
                   "%s: Attempt to modify complete sequence\n", __func__);
@@ -3469,7 +3462,7 @@ int ft1000d_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq)
  * change the rit frequency.
  *
  * Arguments:   *rig    Valid RIG instance
- *              ci      Command index of the pcs struct
+ *              ci      Command index of the ncmd table
  *              rit    shortfreq_t frequency value
  *
  * Returns:     RIG_OK if all called functions are successful,
@@ -3494,7 +3487,7 @@ int ft1000d_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     priv = (struct ft1000d_priv_data *) rig->state.priv;
     rig_s = &rig->state;
 
-    if (priv->pcs[ci].ncomp)
+    if (ncmd[ci].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE, "%s: Attempt to modify complete sequence\n",
                   __func__);
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 260150a1..61f28ae7 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -206,7 +206,6 @@ struct ft1000mp_priv_data
     unsigned int read_update_delay;           /* depends on pacing value */
     unsigned char
     p_cmd[YAESU_CMD_LENGTH];    /* private copy of 1 constructed CAT cmd */
-    yaesu_cmd_set_t pcs[FT1000MP_NATIVE_SIZE];  /* private cmd set */
     unsigned char update_data[2 *
                                 FT1000MP_STATUS_UPDATE_LENGTH]; /* returned data--max value, some are less */
 };
@@ -642,11 +641,6 @@ int ft1000mp_init(RIG *rig)
 
     priv = rig->state.priv;
 
-    /*
-     * Copy native cmd set to private cmd storage area
-     */
-    memcpy(priv->pcs, ncmd, sizeof(ncmd));
-
     /* TODO: read pacing from preferences */
     priv->pacing =
         FT1000MP_PACING_DEFAULT_VALUE; /* set pacing to minimum for now */
@@ -1601,25 +1595,23 @@ static int ft1000mp_get_update_data(RIG *rig, unsigned char ci,
 static int ft1000mp_send_priv_cmd(RIG *rig, unsigned char ci)
 {
     struct rig_state *rig_s;
-    struct ft1000mp_priv_data *p;
     unsigned char *cmd;           /* points to sequence to send */
     unsigned char cmd_index;      /* index of sequence to send */
 
     ENTERFUNC;
 
-    p = (struct ft1000mp_priv_data *)rig->state.priv;
     rig_s = &rig->state;
 
     cmd_index = ci;               /* get command */
 
-    if (! p->pcs[cmd_index].ncomp)
+    if (! ncmd[cmd_index].ncomp)
     {
         rig_debug(RIG_DEBUG_TRACE, "%s: attempt to send incomplete sequence\n",
                   __func__);
         RETURNFUNC(-RIG_EINVAL);
     }
 
-    cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
+    cmd = (unsigned char *) ncmd[cmd_index].nseq; /* get native sequence */
     rig_flush(&rig_s->rigport);
     write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
 
diff --git a/rigs/yaesu/ft840.c b/rigs/yaesu/ft840.c
index c4cb1b1b..c381217d 100644
--- a/rigs/yaesu/ft840.c
+++ b/rigs/yaesu/ft840.c
@@...
 
[truncated message content]

[Hamlib-commits] Hamlib -- Ham radio control libraries annotated tag 4.3 created. 4.3

From: Nate B. <n0...@us...> - 2021-09-01 02:23:06

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 annotated tag, 4.3 has been created
        at  34bc685d8cc5e4f6117881e472742fe5fd1e2989 (tag)
   tagging  5a6134b7430126af15fbd4a4baa44acdfc0fa53d (commit)
 tagged by  Nate Bargmann
        on  Tue Aug 31 21:20:22 2021 -0500

- Log -----------------------------------------------------------------
Hamlib 4.3 release
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQSC1k9rDmfNQfaJu6b7LFEw1VqIGQUCYS7jlwAKCRD7LFEw1VqI
GW5gAKCrSprhxCd06p75Qk9WfR8hw/mHugCfSYzZLUcykDI/w43qdWVGKrydzLU=
=07cT
-----END PGP SIGNATURE-----

(no author) (1):
      New repository initialized by cvs2svn.

Adrian Chadd (1):
      Upgrade TS-711 and TS-811 to work.

Agis Zisimatos (1):
      easycomm: Return the correct value of pointer val

Alessandro Zummo, IZ1PRB (36):
      Remove const from priv_caps to allow kenwood_init to initialize default values if they're missing
      Call kenwood_init in each and every driver
      Use an appropriate debug level
      Support get/set_powerstat on pcr100
      Add kenwood_simple_cmd
      Make set_ptt behave as before, fix set_ant for ts570.c
      ts450: remove RIG_FUNC_TONE from has_xx_func if tone unit is not detected
      ts450,ts690,ts850: use FL command to get/set filters in get/set_mode. (code from ts850.c)
      ts450: indentation fixes
      remove fixed command terminator (;) from generic code
      ts140,ts2000,ts480,ts570,ts680,ts850,ts870s: remove usage of fixed ; and EOM
      fix tabs
      thg71,tmv7,ts450s,ts690: verify rig id at rig_open
      ts450: implement set_channel
      remove unused parameter from get_kenwood_func
      ts570,ts850,ts870s,ts140,ts480,ts680: use kenwood_simple_cmd where possible
      Replace __FUNCTION__, which is gcc specific and was deprecated a long time ago, with __func__, which is at least defined in C99.
      generic, ts850: implemented CTCSS TN command (reported not working for ts850, should now be fixed)
      Add description for the kenwood mode n. 8
      implemented set/get_ext_param (voice, fine, xit, rit). enabled on ts450 and ts850
      Added my call sign
      removed comment about switch optimizatons. the compiler will generate the assembly code in a different order which is usually based on the case value. other compiler optimizations might also affect it, so it's useless to optimize the order.
      check ptt status before set_ptt. enabled on ts850.
      style fixes
      band up/down was inverted
      Try to compensate for leftover characters
      Try to cope withe the PCR100 and PCR1000 at the same time
      Bumped out to beta, solved a few bugs. Tested with PCR100/1000/1500.
      kenwood: send the whole buffer at once, added kenwood_cmd
      - removed EOM, it's handled by kenwood_transaction - fixed tabs and spaces - added generic routine for vfo errors - set_mem: do not switch vfo if already in mem mode - simplified invocation of some commands - buffer optimizations - added PARM_BEEP and PARM_APO - fixed getting of LEVEL_RFPOWER - fixed get_ant
      tmv7: removed EOM
      thg71: removed EOM
      thf7:  - wrong rfpower level granularity         - added .reset         - call kenwood_open         - use generic th_set_vfo
      th: fixed formatting issue
      th: fixed stack corruption
      th: fixed a missing newline

Alex V Flinsch, KC2IVL (8):
      Initial changes for ft100
      Initial release
      initial release
      fixed various command options
      new file, list of tones/codes and sequence used by various yaesu rigs
      added get frequency to ft100 code
      added getinfo func hdr
      *** empty log message ***

Alexander Sack (1):
      Get firmware revision level from K3/KX3.

Alexander Schultze (3):
      easycomm: include a new EasyComm3 to support move speed and infostring
      update EasyComm3 to include setting and getting of config and status
      easycomm: implement get/set config, easycom include status and error bytes, fix get_info

Alexandru Csete OZ9AEC (34):
      Added new stylesheet to make API docs look better.
      Modified to use new stylesheet.
      Added doxygen comments.
      Added rotator.h and rotlist.h to the input list.
      Applied Tommi's improvements from the FT-857 backend with the following changes and additions:
      Full RF power scale corresponds to 10 bars, not 15.
      Added RIT, XIT and IF shift ranges to dummy backend.
      Cast constant caps to variable caps in order to avoid compiler warnings.
      Cast from const to variable in order to avoid compiler warnings.
      - Cast unsigned char to char in order to avoid compiler warnings. - Ensure that all variables have a value before they are used (ft920). - Disable unused functions and variables (frg100). - Incremented backend version numbers.
      Use tone_t for pcr1_ctcss_list. Changed arg 4 of pcr_transaction to unsigned. Cast the other mismatches to (char *).
      Cast unsigned char to char in order to avoid compiler warnings. Incremented backend version number.
      - Cast unsigned char to char in order to avoid compiler warnings. - Ensure that all variables have a value before they are used (tentec.c).
      - Cast unsigned char to char in order to avoid compiler warnings. - Incremented backend version number.
      - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version number.
      - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version numbers.
      - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version numbers.
      - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version number.
      - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version numbers.
      - Cast unsigned char to char in order to avoid compiler warnings. - Handle all enum values in switch statements.
      Fixed type mismatches that caused compile warnings.
      Fixed type mismatches that caused compile warnings.
      Initialise icom_val to avoid compiler warning.
      Fixed type mismatches between signed and unsigned char. There are a few very suspicious 'if' statements in icom.c and frame.c
      - Fixed type mismatches and unhandled switch cases. - Incremented backend version numbers.
      Cast constant caps to variable caps in order to avoid compiler warnings.
      Updated.
      Added infor about w (send_cmd).
      Max serial rate is 9600. Changed backend status to stable.
      Escape the backslash character.
      The 765 can do RIG_SCAN_PROG and RIG_SCAN_MEM.
      Fixed S-meter reading to use calibration table since frontend always uses RAWSTR.
      Fixed RF power reading and added power2mw and mw2power.
      Fixed RIG_LEVEL_STRENGTH reading.

Andrew Errington (1):
      Initial support for CM108 GPIO contorl of PTT

Ben Coleman, NJ8J (6):
      Fixed bug in rpcrig_set_parm (using RIG_LEVEL_IS_FLOAT instead of RIG_PARM_FLOAT)
      Fixed same bug in rigctl_get_parm.
      Added checking of return string from rig on set (non-retrieval) commands. Added code for COMP function. Added alinco_set_parm & tweaked dx77 capabilities.
      Handle setting Keyer speed and CW Pitch
      Added NJ8J's email address.
      Change email address for NJ8J

Berndt Josef Wulf, VK5ABN (11):
      Implemented rig_set_channel()
      Implemented set_parm() for BACKLIGHT operation
      Commented out RIG_MODE_PKTFM overlooked at the submission of previous code
      Implemented RIG_MODE_PKTFM and RIG_MODE_PKTLSB modes
      Changed debug message format for freq_t from long long to double
      ft990_get_ptt() now uses the FT990_SF_XMIT instead of FT990_SF_PTT. FT990_SF_PTT only returns status of PTT activated by CAT commands, whereas FT990_SF_XMIT reports the actual status of the ptt line.
      ft990_get_mem(): Fixed bug that prevented the reporting of current channel                  number when vfo != RIG_VFO_MEM
      Fixed erroneous return value
      Fixed mispelled name for VK5ABN
      Added missing modes to RX/TX caps
      Fixed bug in ft990_set_mode that caused RTTY interchanged modes USB/LSB Fixed bugs in ft990_get_channel

Bill Barker (1):
      Add test for Flex 6300 ID

Bill Somerville (212):
      Patch submission for IC-756
      Patch to allow same serial port for PTT and CAT.
      Patch to fix broken Yaesu backend with FT-2000(D)
      Fix rig_open not failing when PTT/DCD port is unavailable.
      Fix Icom IC-756 filter handling.
      Fix Yaesu newcat backend set_tx_vfo issue.
      Add support for Data Modes on Icom "Pro" models.
      Fix Icom IC-726 mode handling.
      Fix Kenwood TS-2000 split operation.
      Fix Kenwood Split Operation for TS50 & TS480.
      Fix Kenwood TS-870s split and bandwidth set/get.
      Correct receive buffer length for IS; comamnd.
      Fix Kenwood CAT transaction busy retry mechanism.
      Fix Kenwood get split VFO function.
      Add data sub-mode support for TS590s.
      Correct order of MD and DA commands for TS590s.
      Get firmware revision for TS590s in rig_open.
      Fix TS590s firmware defect.
      Fix Kenwood get_vfo function returning wrong VFO in split TX.
      Make Kenwood TS590s firmware defect fixup revision specific.
      Extend TS590s firmware defect fixup to both VFOs.
      Fix Icom IC-756 Pro III get data mode.
      Add spilt mode get and set for Elecraft K3.
      Fix data sub-modes on Elecraft K3.
      Fix Elecraft Data Mode Translation.
      Fix Elecraft K3 Data Sub-Mode Setting.
      Fix Yaesu FT1000MP and FT1000MP Mk V modes.
      Fix configure.ac
      Fix a warning message.
      Added option to not use VFO XCHG command when setting split parameters.
      Fix a buffer overflow in the Windows termios emulation.
      Fix pkg-config generation.
      Fix Icom IC-756Pro mode get/set.
      Facility for rigctl to read commands from standard input.
      Add a pause command to the rigctl command set.
      Prefix action function names so as not to clash with system names.
      Prefix action function names so as not to clash with system names.
      Corrected typos in rigctl.1 manpage.
      Add read commands from stdin and pause command features to rotctl.
      Merge branch 'rigctl-stdin' of ssh://git.code.sf.net/u/bsomervi/hamlib into rigctl-stdin
      Fix manpage errors.
      Remove redundant RIG_PTT_SERIAL_CAT enum from ptt_t
      Only check for serial control line conflicts if PTT shares CAT port
      Fix Ten-Tec Orion get/set split functions
      Icom IC-7410 has VFO A/B not MAIN/SUB
      Added IC-7410 data modes
      Add retry mechanism for Yaesu "newcat" backend
      Implement retries for Yaesu "newcat" rigs
      Disable auto information mode on open
      Add retry mechanism for Yaesu "newcat" backend
      Implement retries for Yaesu "newcat" rigs
      Disable auto information mode on open
      Merge branch 'yaesu-retries' of ssh://git.code.sf.net/u/bsomervi/hamlib into yaesu-retries
      RIG_OK is zero and need not be negated and this will not change
      Fix response length expected error in K3 back end
      Data mode support for the Icom IC-7700
      Data mode support for the Icom IC-9100
      Data mode support for the Icom IC-7200
      Add support for the Kenwood TS-590SG
      Kenwood TS-590SG
      Always clear serial control lines when used for PTT
      Disable AI mode on open for Kenwood/Elecraft rigs
      Add more diagnostics and error checks to serial line control
      Move serial line control error checks to lower level routines
      Merge branch 'master' into kenwood-ai-off-at-start
      Merge branch 'master' into ptt-control-on-cat-port
      Fix serial i/o on Windows.
      Yaesu newcat style command response reading improvements
      Increase communications timeout for Icom rigs
      Kenwood AIn; command has no reply
      Revert read_string() to partial results are a success status
      Remove gratuitous sleeps before function exits
      Error checks on simulated direct VFO addressing
      Elecraft K2 RTTY modes are not FSK
      Kenwood and Elecraft rigs sometimes ignore commands
      Removed kenwood_cmd function and replaced uses of it
      Allow for failed test command on the K2
      Elecraft K3 has 1 stop bit
      Kenwood TS-570 series IF returns current frequency
      Switch to "ID;" command for verification as no "AI;" on TS-840s
      Increase Elecraft K2 comms timeout and retries
      Switch Kenwood TS940 to generic kenwood CAT functions
      Improve command verification for Kenwood & Elecraft
      Use local buffer in kenwood transaction funciton
      Clarify the handling of Kenwood CAT message terminators
      Further clarification in the implementation of kenwood_transaction()
      Removed redundant precondition test
      Remove kenwood_simple_cmd as kenwood_transaction has that functionality
      Call kenwood_open() for TS-2000 to ensure AI mode is disabled
      Allow for bad ID from DDUtil in TS-2000 mode
      Allow one extra byte in read_string() length to accomodate terminator
      Enable data modes for the Icom IC-7100
      Allow for PowerSDR ID in Kenwood TS2000 emulation mode
      Fix TenTec Argonaut message lengths and timeout
      Fix TenTec set split command
      Implement get PTT status for the TenTec Argonaut
      Fix error with width in set mode for the TT argonaut
      Yaesu FT540 can only change the frequency of the current VFO
      Fix defect in Kenwood TS-940 IF command response parsing
      Fix response lengths for the TT Jupiter 538
      Do not attempt CAT PTT commands on the Icom IC-706mkIIG
      Use correct argument type for serial control line functions
      Initial back end implementation for the Kenwood TS-990s
      Mode set is not VFO targetable on the Kenwood TS990s
      The Kenwood TS990s only does split Tx on SUB VFO
      The doesn't appear to be a way of getting PTT/SEND on the TS990s
      Lower both RTS and DTR on alternate PTT serial port
      Honour any error status from serial port calls
      Dummy get_ptt function needs to read RTS/DTR/PARALLEL
      Make autogen.sh agnostic to whitespace in paths
      Increase the number or retries for most Kenwood rigs
      Command validation for Yaesu set commands
      Remove unecessary delays from TS-940S backend
      Proper IPv6 and dual stack networking
      Fix compiler warnings
      Proper IPv6 and dual stack networking for rotator net daemon
      Attempt to restore AI status on exit
      Allow for poor emulations of Kenwood rigs that have no ID command
      Use correct function to execute set  type commands with no response
      Add a new command line option '--no-restore-ai' ('-n') to rigctl
      Fix FT-817/857/897 issues and add some missing functionality
      Fix missing PKTUSB mode setting code for FT-817 & FT-897
      Fix a logic error in band detection during IC-910 set frequency
      Add missing configuration getters
      Detect C-IV NAK returns as rejected commands
      Elecraft rigs do not switch VFO in IF command responses during split Tx.
      Redundant split mode directives on Elecraft rigs cause Tx failures
      Only use IPv6 features on Windows versions that support it (>=XP)
      Improve IPv6 portability and consistency
      Add 23cms to IC-910(H) backend
      Implement combined split VFO frequency and mode setting.
      Initial implementation of rig_{set,get}_split_freq_mode() for FT-857.
      Implement rig_{set,get}_split_freq_mode() for IC-756 series.
      Add {get,set}_splitfrequency_mode for the IC-910(H)
      Elide unnecessary CAT commands when setting split frequency and mode
      Do not swap VFO unnecessarily
      Better set frequency semantics for the IC-910(h)
      VFO targetable get frequency operation for the Icom IC-910(h)
      Make sure right band is used when setting frequency on IC-910(H)
      Use rig state rig port retry option rather than from capabilities
      Use a sensible port timeout value for the Kenwood TS-850
      Further attempts to simplify and improve Icom CAT for split operating
      Add RIG_PASSBAND_NOCHANGE as possible set_{split_,split_freq_,}mode argument
      Switch to POSIXLY_CORRECT mode for getopt_long()
      Fix a regression introduced in 222ad74
      Do not crash if expected CTCSS tones not sepcified
      Do not attempt to query AI state on the TS-450s as it is not supported
      Some more Kenwood rigs with no AI query
      Adjust rig_list_foreach to allow use for unregistering
      Fix an issue presenting on the Yaesu FT-450(D)
      Release the serial port used for PTT when possible
      Change the IC7600 & IC7800 set/get mode to versions that support DATA modes
      Add rig_{open,close} functions to TS-790 backend
      Revised kenwood rig busy response handling
      Add get and set split functions for the TS450S
      Simplify and fix defects in the FT991 back end
      Fix some endian issues in the si570/AVR SDR back ends
      Fix a state machine defect with repeated PTT reset calls
      Do not pass --no-cpp_precomp to compilers on Mac OS X
      Allow RIG_LEVEL_STRENGTH queries over the network link
      Stop rigctld and rotctld crashing when service threads cannot write to clients
      Use snprintf throughout kenwood/kenwood.c for buffer safety
      Fix off-by-one issue in reading memory mode from IF command response
      Fix some issues with commands not supported by TS-2000 CAT emulations
      Add best guess transmit status to rig state structure
      Take out unecessary delays in K(X)3(S) back end.
      FT-817 status queries honour retries and timeout
      Make rig_open() call in rigctld lazy and add graceful termination
      Simplify SWIG interface definition and hide 64-bit values from Lua binding
      Remove unnecessary delays from TS-990 and TS-2000 back ends
      Change frequency setting for the FT-747GX to something more basic
      Fix an incorrect error return value from win32_serial_select()
      Fix timeout issues with the Ten-Tec Orion/Eagle
      Ensure compilation works with a pre C11 compiler
      Make code C90 compliant again
      Move unnecessary global and file static variables to the stack
      Simplify unnecessary persistence of extended response state
      Fix misunderstanding of netrigctl_transaction() return value
      Made PTT and DCD options consistent between rigctl and rigctld
      Report unrecognised PTT and DCD types in rigctl and rigctld
      Update i/o functions to support GPIO(N) port closure
      Fixed erroneous messages in rig_close with GPIO(N) PTT or DCD types
      Remove duplication across GPIO and GPION handling of PTT and DCD
      Improved get PTT state handling in dummy backend
      Simplify closing of device files
      Repair a regression with the dummy get PTT functionality
      Revert "Add debug to serial.c"
      Repair a regression with the dummy get PTT functionality
      Revert "Add debug to serial.c"
      Fix regression with slow responses from SmartSDR causing errors
      Deal with remote PTT type at the client end
      Avoid 'echo -n' as macOS sh doesn't support it
      Fixing an operator precedence defect
      Updates to the TH-D7A/E back end
      Less ambiguous variable name and repair merge issue in prior commit
      Add missing config parameters for rig power on/off and screen-saver
      New power on option rather than power on/off
      Make version recording safe for parallel builds without breaking make dist
      Make version recording safe for parallel builds
      Ensure old hamlibdatetime.h headers in the source dir are ignored
      Merge branch 'safe-scs-versioning' of ssh://git.code.sf.net/u/bsomervi/hamlib into safe-scs-versioning
      Fix make dist versioning
      Use BUILT_SOURCES make mechanism as intended
      Fix rebuild dependency
      Build hamlibdatetime.h every time
      Force copy over existing
      Minimize rebuilding
      Correct use of sh if
      Another attempt at a reliable SCS version header generation
      Remove temporary file
      Add missing shared library API exports
      Add missing export definition

Blaine Kubesh (8):
      added Icom803 to icmarine
      added Icom803 to icmarine
      added Icom803 to icmarine
      Update ic-m803 remote-id to 20
      Update icm803.c
      Update AUTHORS
      undo author changes
      Update icm803.c

Bob Freeman (1):
      New CNCTRK rotor backend

Brian G. Lucas (10):
      Pretty much a complete re-write of thd72.c, since the old one didn't work at all.  Many commands have been tested with real hardware. But more work remains to be done.
      WIP: thd72 driver.  More level, func, and parm stuff works.
      WIP: thd72 driver.  Try to simplify the menu based interface.
      WIP: thd72 driver.  First cut at get_channel().  Other cleanup.
      WIP: thd72 driver.  More interfaces implemented.  Other cleanup.
      Implement some more interfaces.  Comment out get_chan_all_cb because the block read routine doesn't work.
      Fix a format so that it works with Windows.  Can't test it because I have no Windows machines.
      Fix RFPOWER level for FT-450D.  It uses 5-100, rather than 0-255 that the FT-450 does.
      In newcat_open(), initialize rig_id in case any subsequent commands need it.
      Some calls to thd72_get_menu_item where passing wrong values for range check.

C-Elegans (1):
      Add ability to have rigctld display transverter frequency

Charles Suprin (7):
      Add file for TM-D710 support.
      Merge branch 'master' of ssh://hamlib.git.sourceforge.net/gitroot/hamlib/hamlib
      Add D710 to riglist.
      Add D710 code to kenwood library.
      Register D710 interface.
      Initial D710 Implementation.
      Register D710 interface.

Charles Suprin, AA1VS (3):
      extend th_get_vfo_char to support D700
      Changed th_set_freq to round and select step size to use. Allows 6.25kHz and 5kHz channelization.
      Use new th_set_freq for TM-D700

Chris Karpinsky, AA1VL (7):
      add serial_flush() method to clean rx buffer
      initial stab at this for the Yaesu FT-817
      add ft817.*
      add ft817
      bump the backend status to ALPHA
      Initial entry of cgirig giving ability to use hamlib from a web browser.
      increased post write delay to 300

Chris Ruvolo (4):
      TS-690: deal with optional tone board using TS-450 logic
      TS-690 does not implement the PC command to get/set output power level
      TS-690 does not implement the GT command to get/set AGC rate
      TS-690: bump version

Chuck Hemker, N2POR (1):
      Use RIG_TARGETABLE_MODE in rig_set_mode and rig_get_mode

Chuck Ritola (7):
      Use loop to ensure RS-HFIQ hears first command. Closes #730
      Add ability to read TX drive level
      Implement board temperature reading for TEMP_METER
      Parse and store RS-HFIQ firmware version.
      Firmware version check before power meter query.
      Merge branch 'master' into rshfiq-aug2021
      Map FCDPP LNA and Mixer Gain as PREAMP values. Closes #766

DL1YCF (6):
      Merge branch 'master' of https://github.com/Hamlib/Hamlib
      Merge branch 'master' of https://github.com/Hamlib/Hamlib
      Merge branch 'master' of https://github.com/Hamlib/Hamlib
      Merge branch 'master' of https://github.com/Hamlib/Hamlib
      Merge branch 'master' of https://github.com/Hamlib/Hamlib
      Merge branch 'master' of https://github.com/Hamlib/Hamlib

Dale E. Edmons, KD7ENI (19):
      Added comments to commandline in rigctl (second time) --Dale
      Started TS-2000 update/overhaul --Dale
      Copied too much stuff, backed out what I broke.
      Bring ts2k.c more in line with current CVS.
      Changed ts2000.c to ts2000.h.
      Start of rig menuing functions.
      New file.
      Renamed ts2000.c.new ts2000.h
      Bring code more in line with CVS code.
      Changes often, so added status.  Will delete when things stabilize.
      Corrected status to CVS branch.
      Renamed new ts2000.c to ts2000.h
      Wouldn't compile.  Removed ts2k.c.  Haven't got all new rig.h stuff removed.
      Temp kludge to make ts2k.c compile (keeps Hamlib from compiling!).
      Updated status.
      Added working TS-2000 files.  There are some changes left out but this is the minimum I could commit and have a functional rig.  The cost is that I've broken kylix and others that duplicate rig.h.  I'm in the process of repairing the damage.  Please be patient.  I hope a day or so, but am asking for up to a week.  E-mail me about *anything* you find broken.  Kylix (and similar) is (are) known to not work.
      Changed name back to original.
      Had to re-run automake kenwood/Makefile.
      1) Updated branch_ts2k with respect to HEAD. 2) Working ts2k_menu.  (only in RIG_MODEL_TS2K) 3) Split TS-2000 into experimental and standard versions:    RIG_MODEL_TS2000 = standard, RIG_MODEL_TS2K = experimental. 4) Basic command parser in tests/rc.  Will open/close rig or copy a    freq from one rig/vfo to another rig/vfo.  Very cool.  Very basic.    Very experimental. 5) Added test programs.    a) testcmd - calls parser (no command prompt yet!)    b) testts2k - replacement for testrig (with trivial modification)    c) testptt - testts2k/testrig should not transmit.  TX stuff in testptt. 6) Used crowbar to merge HEAD into branch_ts2k.  Working on clean-up. 7) I'm sure I've forgotten or neglected to mention some other stuff.

Daniel Estévez (2):
      Fix DIG MODE for FT817-ND
      Fix DIG MODE for FT817-ND

Daniele Forsi (5):
      Set the executable bits on py3test.py
      Fix spelling errors
      Fix more spelling errors
      Fix more spelling errors
      Fix typos

Daniele Forsi IU5HKX (1):
      Fix a [missingInclude] "information" when running cppcheck --check-config

Dario Ventura (3):
      New Prosistel rotor backend from IZ7CRX
      Add elevation code to Prosistel backend
      TS2000 Satellite mode and Gpredict

Dariusz Bismor, SQ9KEJ (1):
      rigmem: implement CSV file loading

David Fannin (1):
      Submission for new backend model (134) for Yaesu FT-DX1200

Davide Gerhard (3):
      tests/{memcsv.c,memsave.c}: partially revert commit 4072f9f4
      ic746.c: correct chanbuf length, fix channel structure and support split
      ic746.c: add ic746pro_set_channel() to load memory from csv

Dawid Szymanski (2):
      ICOM Voice Keyer implemented.
      typo fix

Diane Bruce, VA3DB (5):
      - first cut at fixing configure to recognise --without-tcl-binding   and --without-python-binding options
      - gt_HEADER_INTTYPES_H is definitely bogus here, leftover from what?
      - document debian/FreeBSD needs for AUTOMAKE etc. - add in libtoolize which should be there
      - These should have been commented out.
      - Extra comma on RIG_STATUS_BUGGY can cause a compiler error.

Dieter Röver (1):
      Fix bug in vfo_comp calculation in Hamlib

Ekki Plicht (DF4OR) (2):
      New model Icom IC-R8600
      Patch for Icom DCS code handling

Elliott Liggett (1):
      Added functionality for the IC-7300 auto antenna tuner

Eriks Dobelis (2):
      ft817: adding delay before next retry after returning from tx to rx
      ft817: Moving delay value into #define section of the header

Ervin Hegedus (9):
      RIG_PASSBAND_NORMAL wasn't handled correctly when rig_set_mode() was called - fixed
      Fixed SWIG `Setting a const char * variable may leak memory' error
      Fixed Kenwood filter cmd when passband is set to 500Hz
      Merged from upstream
      Merge branch 'master' of http://git.code.sf.net/p/hamlib/code
      Added Lua binding and demo script
      Added new example to Python demo script (set/get float type level)
      Change variable length argument handling in affected functions
      Fix two typos

Ervin Hegedüs (1):
      rig.swg: New properly formatted macro

Evgeniy Titorenko (1):
      Add Radant AZV-1 Rotator controller protocol.

Francois Retief (21):
      Added read_serial function to read strings from a port.
      Corrected some comments
      Added code to hexdump to right align ASCII dump column
      added private caps for rig termination character
      add private caps and more commands.
      Changed to a new transaction function and adde quite a few commands.
      add private caps to store the termination character of Kenwood rigs commands.
      added a kenwood_init and _cleanup routine for priv caps & priv data.
      Added a new function:  LCD Lamp ON/OFF (for Kenwood TH-7DA)
      check trn state of rig in rig_open.
      Initial commit of Kylix binding
      New backend for rotators
      New RPC backend for rotators
      Added rot_move function
      Fix macro name
      Added rot_move function
      Added easycomm and rpcrot backends
      Fixed circular dependency for rpc.rigd and rpc.rotd
      regenerated
      Added IC-910 rig.
      Added constants for the IC-910 rig.

Frank Goenninger (3):
      Add ADAT ADT-200A backend
      adat updates from Frank, DG1SBG
      ADAT fixes on Windows

Frank Singleton, VK3FCS (165):
      Initial revision
      Initial revision
      *** empty log message ***
      *** empty log message ***
      *** empty log message ***
      Initial revision
      Initial revision
      *** empty log message ***
      *** empty log message ***
      added build_all ,cleanall and verify targets
      *** empty log message ***
      initial top level makefile
      add some things
      initial import
      initial import
      initial import
      fixed some typos
      use rig_open and rig_close
      added rig_open and rig_close
      fixed cmd_sat_on / off
      added sat-on and sat_off to test
      changed cmd_get_rx_status, must do tx also
      updated test()
      all reads use while (1) and break
      added ../common as object path
      added rig_open and rig_close
      using rig_open and rig_close and serial.h
      use common dir for serial stuff
      use ft747 on serial port /dev/ttyS0
      read uses while(1) and break
      use while(1) and break
      added read_sleep
      use read_sleep now from serial.h
      using read_sleep from serial.h
      had rx and tx status swapped (document error?)
      removed cmd_get_update
      using CVS instead of RCS directories
      use MODE_xx defines
      cannot use const int in case statements ?? so use #define instead
      use #defines for MODE_XXX used in case statements
      working out freq conversion, unfinished
      playing with test routines
      long int cmd_get_freq_mode_status_main_vfo(int fd, unsigned char *mode);
      long int cmd_get_freq_mode_status_main_vfo(int fd, unsigned char *mode)
      frq = cmd_get_freq_mode_status_main_vfo(fd, &mode);
      starting with the cmd_set commands now
      starting on cmd_set commands now
      starting on cmd_set_freq commands now
      add scanning todo
      now set sat rx and tx freq and mode also
      fix typo
      dump raw hex data when writing and reading
      trying some cms_set_freq_xxx commands
      added routines for dec <-> packed decimal conversion
      minor
      added generic hex dump routine, static void dump_hex(unsigned char *ptr, int size, int width);
      removed unwanted debug printf's
      removed dump_hex from here..
      calc_freq_from_packed4 is about to be replaced
      calc_packed_from_char and calc_char_from_packed now here
      cleanup
      cleanup
      void dump_hex(unsigned char *ptr, int size, int width);
      adding dcs tables and repeater offset in Hz
      describe faulty yaesu documentation
      added README.license for GPL
      added GPL license info
      included full GPL license
      Updated docs to point to  http://sourceforge.net/projects/hamlib/ and added a C code snippet on how to use the API.
      added -I$(COMMON_DIR) to find rig.h
      added  -I$(COMMON_DIR) to find rig.h
      adding capabilities
      initial capabilities stuff
      starting to add rig_caps stuff
      starting to add rig_caps stuff
      starting to add rig_caps stuff.
      added GPL stuff and comments
      adding rig_caps stuff
      adding rig_cap stuff
      adding rig_caps stuff
      add capabilities and preferences
      adding rig_caps functionality
      adding rig_caps stuff
      frontend reduction on backend function namespace - phew !!
      frontend API clarification
      removed old open_port2() using old rig_caps
      fixed some typos, added  3 more candidates for API
      missing ; in some enums
      converting to frontend/backend structure compiles ok
      removed open_port() and write_block()
      removed open_port() and write_block()
      fixed typos, added &ft747_caps in rig_caps
      changing to frontend/backend style
      converting to frontend/backend style
      added 3 more cmd_* for API examples
      Example of setting rig Main VFO to 439.700 Mhz FM
      cleanup comments
      added extern const struct rig_caps ft747_caps;
      still thinking about set/get strategy
      minor updates
      added extra rig caps
      added some set/get examples with return code checking
      added testrig to Makefile, no linking yet
      added usleep to read_sleep()
      updated rig_caps structure
      *** empty log message ***
      test making a shared lib (at last) for the frontend - more todo
      test making a shared lib  for the frontend - make hamlib
      describe frontend/backend structure
      updated code snippet example
      started ft747_set_ptt and ft747_set_vfo
      starting to implement set/get pairs
      added typedef enum ptt_type_e ptt_type_t;
      added VFO types to enum
      starting on libhamlib Makefile, added ./lib and ./include under common
      make, make install, and make clean work ok, using ./lib and ./include directories also.
      make, make install, and make clean work ok, using ./lib and ./include directories also.
      removed "make verify". Added reference to common/Makefile
      added 	printf("testrig:main() has been called \n"); for testing linking
      makefile for testing testrig linking
      alternative rig_base declaration removes references to rig_caps at compile time. should populate it another way -- FS
      added printf's to confirm rig.c (hamlib) is being called ok
      better libhamlib.so version :-)
      added ft847_open and ft847_close to enable CAT ON/OFF
      added ft747_open and ft747_close
      updated lib names for backend to libhamlib-xxxxx.so
      API updates - added set/get_mode
      merge with TRN stuff and add some set/get_mode and vfo stuff
      added post_write_delay
      cvs mails to hamlib-cvs-digest
      cvs mail update works ok :-)
      minor fixes
      updated ptt/mode/vfo
      added set/get freq to use generic bcd etc
      more set_freq() examples
      1. Added VFO as target for some set/get cmds. 2. ./testrig still runs ok using RIG_VFO_CURR.
      minor update to active VFO handling in _set_vfo
      some new defines for FT747_VFO_A/B
      minor updates to active vfo handling
      added ptt handling example, stand back !
      trying different approach to storing cmd sequence. _set_ptt is being converted. Needs tidying up though. Some sequences are complete, and can be read from static data. Incomplete sequences will eventually be copied form static declaration, and completed in priv data.
      Removed static stuff from functions. Also, begin to implement table driven command translation from API to rig native. priv now contains a cmd table that is used for backend commands towards rig.
      Added some new freq/mode combinations.
      converting ft847 to table driven, similar to ft747.
      more table driven stuff for ft847. cat/ptt/freq being converted.
      Added ft847_send_priv_cmd(), converted some part of API to use this. Added _set_mode to work now. TODO: put _send_priv_cmd into yaesu.[ch] so ft747 can use also. Turned on PTT also (stand back)..
      rig_cleanup and rig_close not calling backend
      removed unused calc_ functions.
      removed old API functions, general cleanup tested rig_close and rig_cleanup
      Initial release, common yaesu declareations etc.
      add version tag
      nseq uses YAESU_CMD_LENGTH
      Initial yaesu Makefile
      Moved from ft747 and ft847 dirs
      common yaesu handling
      common yaesu dir
      Begin to use common yaesu code
      general cleanup, added _send_priv_cmd
      added targetable_vfo value to caps
      minor cleanup
      ChangeLog history started
      Initial import for ChangeLog handling
      starting to convert rig struct to readable form
      more of convert rig struct to readable form
      Changelog update for HAMLIB-1.1.1

Gerardo Richarte (1):
      gs232b.c: Improve get_position string parsing

Gisle Vanem (1):
      Enable verbose mode in bindings/pytest.py

Greg Troxel (1):
      Warning about dodgy code in drake.c

HB9EIK (4):
      Initial release ELAD FDM DUO
      Update ELAD files
      Update build system for ELAD backend
      Update copyright for fdm_duo.c

Hans Van Ingelgom (1):
      Added Peaberry V1 and V2 models

Hegedüs Ervin (4):
      Merge branch 'master' of http://git.code.sf.net/p/hamlib/code
      Check SWIG string functions for some languages
      Leave off multiply 'typedef const char * const_char_string' definition (in rig.swg and rotator.swg)
      Fixed int[10] type variable error in bindings

Jae Stutzman (5):
      Added HPSDR backend
      Clears potential garbage data in read buffer prior to command being sent
      Updated PiHPSDR backend defaults
      Use Windows ioctlsocket to avoid buffer overrun
      Added new AGC control for PiHPSDR

James Watson, HZ1JW (2):
      Added ic7200 to icom
      Corrected modes in ic7200.c

Jaroslav Skarvada (2):
      Fix hardcoded pcconfig libdir
      Fix serial_port DCD squelch

Jeroen Vreeken (9):
      Add support for GPIO PTT.
      Add missing breaks and improve error messages
      Add Dorji DRA818 modules (VHF and UHF variants) Also works with NiceRF SA818 modules
      Merge branch 'master' of git://git.code.sf.net/p/hamlib/code
      Small fixes to DRA818 volume handling
      Add GPIO and GPION options for DCD. Also bump abi version since the config params struct needed resizing.
      Merge branch 'master' of github.com:Hamlib/Hamlib
      GPIO working after debugging
      Merge branch 'master' of github.com:Hamlib/Hamlib

Johan Ström (1):
      Backup serial options on open, restore on close

John Paul Adrian Glaubitz (1):
      dummy/dummy.c: Fix unaligned access in dummy_get_level()

Jonathan Bastien-Filiatrault (3):
      Correct FT; command that does not exist on the FT-891.
      Allow setting split mode without smashing the VFOB frequency.
      Scale power values correctly for Yaesu FT-891.

Jonny public (1):
      ether6:  New rotor backend from Jonny, DG9OAA

Joop Stakenborg, PG4I (116):
      update (kenwood is not a WIP anymore)
      first implementation of kenwood_get_ptt
      enable get_ptt for this rig
      add get_ptt for this rig
      additional protocol checks and cleanups
      fix signal strength
      add RIG_LEVEL_RFPOWER
      fix_compilation
      add rit capabilities
      bring comands in sync with other kenwood rigs
      add rit capabilities
      send_morse added
      explain set_rit
      fix get_ctcss_tone by using IF command
      typo
      add xit capabilities
      add set_level and get_level
      bring rig in sync with other kenwood rigs
      bump version numbers
      nothing returned by the rig for these commands
      fix get_level_agc
      fix set_level_agc
      getting in sync with the debian 1.1.2 package
      remove template files
      initial checkin
      make this NMU for now
      correct the path for copying files in the apropriate package
      do not install the old changelog
      versioning not used
      move .la, .a, .so files to the correct package
      include rpc.rigd and rpc.rotd
      include pkgconfig support
      don't create shlibs file for drake, jrc and easycomm libraries
      move hamlib1 to the top so the documentations gets installed correctly
      make building easier, call autogen.sh
      INSTALL file not used
      build the documentation package
      we don't have to call configure twice
      cleanup
      remove some build dependencies and don't call autogen.sh
      ts450s uses IF command for get_vfo, get_freq and get_mode
      minor bugfix, bump to beta
      add CWR and RTTYR
      this rig does not have a command for reading IF bandwidth
      retrieve passband with FW command
      passband should be calculated after mode is set
      use rig_passband_normal here
      various lintian fixes
      one last lintian fix
      use FW command to set bandpass
      cw filters for normal, narrow and wide
      more filters
      get_mode and set_mode for this rig
      filters
      some comments
      correct rit
      add get_level
      cleanups
      more modes
      set_level for this rig
      should use kenwood_get_freq
      minor bug
      add rpm support
      need hamlib.spec for 'make rpm'
      make rpm will fail with a '-' in the version number
      a working spec file
      update debian build for rotorez and fodtrack, minor fixes
      unofficial
      fix the debian build script, new maintainer
      update the debian build tree to the latest
      correct baudrate for the ts-950, use the information field IF for get_vfo by default (supported by most kenwood rigs), ts870s will use the much shorter FR command for get_vfo
      correct baudrate for some rigs and add ts-950 to the id_list
      ts-850 returns ID 009 according to martin, OK1RR
      fix 'make rpm'
      build for hamlib-1.1.5
      not needed
      sync with latest debian package and add tcl, c++, python and perl bindings
      correct spelling
      s-meter calibration by Matt Dawson
      basic functionality by Matt Dawson, tested with grig and xlog
      lifetime e-mail address :-)
      sync with latest debian release
      more functionality, mode and frequency get by Matt Dawson
      only switch tx vfo is split is on
      set attenuator level
      export convenience function get_kenwood_level, so they can be use by other backends
      add RIG_LEVEL_SWR, copied from ts850
      add RIG_LEVEL_COMP, RIG_LEVEL_AGC, copied from ts850
      bump version, no preamp
      really add ALC read this time, only change meter if needed, cleanups
      split has_get_level and has_set_level
      fix coding, python2.4 compatibility
      fix compilation warnings
      more compilation warnings nuked, use tone_t for ctcss_list
      use size_t
      fix more compilation warnings, int->size_t, unsigned char->char
      more unsigned char->char and int->size_t transitions
      set functions should have ack_len zero, also need to check other rigs
      make sure we use ack_len=0 for functions that return nothing (set functions)
      more unsigned char->char and int->size_t transitions
      extend rig capabilities, patch by Tom, DL1JBE
      add RIG_LEVEL_STRENGTH to caps, set post write delay to 0 and do some cleanups
      re-establish post-write delay
      remove rpath backdoor
      long long really needed here?
      updates by matt, GW0VNR
      long long really needed here? - patch by diane Bruce
      distribute footer.html
      correct set/get power
      try better s-meter readings
      packages renamed
      obsolete
      sync with latest debian release
      no need to link to python
      sync with latest, python changes
      another debian update: use 'make distclean' in the rules file

Joshua Lynch (4):
      initial SatEL rotator support
      factored io functions out. improve reliability...i hope.
      fixed state bug. reconnecting would disable motion every other connect.
      merged upstream/master into master

Juergen Rinas, DC3BW (4):
      added antenna switching...
      added a few get_level/set_level get_function/set_functions.
      * fixed set_func (concerns most kenwood rigs) * added 115200 to the list of baudrates in probeallrigs_kenwood()
      * fixed ptt * expanded frequency range (available after firmware update) according to   http://www.kenwood.com/i/products/info/amateur/ts_480/firmware/pop_ts480_e.htm * added tuning steps * added filter list * increased version info

Julian Cable (3):
      WinRadio G313: Updates from Julian Campbell
      wrg313api.c: Fix Win32 (MinGW) build issue
      Use Automake conditionals for G313 build

Kamal Mostafa (3):
      Fix mingw32 cross-compilation procedure and config
      Do not let macros/ac_python_devel.m4 trash CPPFLAGS and LIBS
      Fix spelling errors

Kamal Mostafa, KA6MAL (19):
      Hard-code length of hamlib_version and hamlib_copyright strings to stay compliant with hamlib 1.2 ABI and avoid spurious "consider relinking" warnings from dynamic loader.
      Removed stale debian/ dir from the hamlib source (it is maintained in the Debian diff and isn't useful in this tree).
      Update bundled libltdl (libtool) to version 2.2.6b to address CVE-2009-3736.  - autogen.sh: never downgrade our bundled libltdl/ (only run libtoolize if         system version is newer than our bundled version).  - autofixer.sh: script removed as libtool 1.x is no longer allowed.  - configure.ac: (not enabled) optional setting to deprecate embedded libltdl/.
      Added Kamal Mostafa and Jaime Robles as maintainers for Debian packaging.
      Fix build --with-python-binding breakage introduced by Python 2.6: Do not reference LOCALMODLIBS, else it will add libraries to our link line (e.g -lssl) which are not necessarily installed.
      Elektor 507 frequency selection resolution improvements, contributed by John Nogatch AC6SL.
      Move backend libraries into /usr/lib/hamlib directory.
      Force automake to invoke the C (not C++) linker in kit/ when no C++ is in use.
      python: fix --with-python-binding configure macro
      fix configure.ac paths for FreeBSD
      Remove bundled libltdl (libtool)
      README.developer: restore libtool prerequisite text
      Fix segfault on improper -C syntax
      configure: add check and advice for missing ltdl.h
      configure: refine advice for missing ltdl.h
      source warnings cleanup: rpcgen-generated code
      source warnings cleanup: #if-0 out a few unused routines
      source warnings cleanup: #ifdef out unused FT-840 routines
      source warnings cleanup: rotorez_rot_reset wrapper for stop

Kayne (1):
      Updated k3_set_modes to work on KX3

Kosta Arvanitis (1):
      Allow IC-7410 to send cw messages

Kārlis Millers (1):
      Merge pull request #1 from Hamlib/master

Ladislav Vaiz (3):
      Add Android build support
      Android build updates for monolithic build
      Initial support for FUNcube Dongle Pro

Larry Gadallah (1):
      AR7030+: Error reading signal strength for low signal levels.

Larry Gadallah, VE6VQ (20):
      Added Larry Gadallah as maintainer of AOR AR7030+
      Added AOR AR7030 Plus
      Added caps for AR7030+
      Added caps for AR7030+
      Added AR7030+
      Alpha version of AR7030+ backend
      Alpha version of AR7030+ backend
      Rationalized naming convention, ran everything through lint.
      Rationalized naming convention, ran everything through lint.
      Fixed SVN tags
      Fixed SVN tags
      Added AR7030P utilities in ar7030p_utils.c
      Initial version of utility functions for AR7030 Plus receiver
      Removed utility/helper functions, added/updated Rig API functions
      Added new I/O helper functions, IR code definitions
      Added private data to support channel information
      Added init/cleanup functions, started implementation of mem/channel access functions
      Added prototypes for pbsToHz() and hzToPBS() helper functions. Added comments to denote mey_sq, mey_pb, and mey_id labels
      Added implementation for pbsToHz() and hzToPBS() helper functions.
      Added various memory/VFO functions.

Lorenzo Santina (2):
      Fixed rigctl ignore error command line
      Fixed c++ exception for visual studio compiler

Magne Mæhre (1):
      Enable set_powerstat (turning radio on/off) for IC-7100.

Malcolm Herring (62):
      init branch
      init branch
      New model:  Icom IC-R6
      Icom IC-R10 & 20 testing complete. Move to Beta
      ignore build
      Complete R6 commands
      Add IC-R30
      daily
      fix tones
      Merge remote-tracking branch 'Hamlib/master'
      update
      Merge branch 'master' into icr6
      ICR6 new functions
      merge
      update
      Merge remote-tracking branch 'Hamlib/master'
      commands 00-15
      Merge branch 'master' into icr30
      icr30 updates
      Automatically detect CI-V echo state
      Icom R8600 to Alpha
      Update contributors
      Merge branch 'master' into origin/master
      Fix Icom DCS SQL funnctions
      Merge remote-tracking branch 'Hamlib/master'
      Merge remote-tracking branch 'Hamlib/master'
      Prepare for D-STAR implementation
      Merge remote-tracking branch 'Hamlib/master'
      Initial implementation of icom extended operations
      more extended operations
      Merge remote-tracking branch 'Hamlib/master'
      more ext functions
      fix merge conflicts
      more ext_cmd updates
      ic7100 ext functions
      Merge remote-tracking branch 'mdblack/master'
      Merge branch 'master' of https://github.com/malcolmh/Hamlib
      add token list for ext operations
      Merge remote-tracking branch 'mdblack/master'
      more ext operations
      Merge remote-tracking branch 'mdblack/master'
      custom ops using ext ops scheme
      custom level ops
      Merge remote-tracking branch 'mdblack/master'
      Merge remote-tracking branch 'Hamlib/master'
      add scope functions
      update IC7100
      update rigs for new functions
      Merge remote-tracking branch 'Hamlib/master'
      new directory structure
      Merge remote-tracking branch 'Hamlib/master'
      correct powerstat caps
      Merge remote-tracking branch 'Hamlib/master'
      New custom parm implementations
      restore get_powerstat
      correct rig_close cap
      Merge remote-tracking branch 'Hamlib/master'
      Merge remote-tracking branch 'Hamlib/master'
      Merge remote-tracking branch 'Hamlib/master'
      add g/set_ext_func to API
      additional error checking for extended operations
      Add Macports to README.osx

Mark J. Fine (25):
      Fixed post-write-delay timing
      Added support for ECSS/FAX and meter strength
      Added support for meter strength
      Added ECSS support to R8B and reconfigured default filter modes
      Reconfigured default filter modes
      Updated to reflect recent changes within v1.2.2cvs-2
      Fixed CWPITCH function on IC-R75 to use 'set mode data' command. Added level granularity steps
      included other rig_ prefixes
      fixed get_powerstat to read correctly when memory channel is blank
      Added memory switching function in set_vfo Added set memory channel# in radio in set_mem
      Added set_vfo command for vfo/mem switching Corrected handling of "vacant" memory channels
      Correctly detect if in memory mode in get_vfo() Reduced large decision trees with bitwise math
      Added set/get channel functions
      Updated set/get channel functions
      Made get_channel aware of untunable blank memory channel
      accounted for dual preamp (10 & 20db)
      Fixed passband width return for IC-756PROII
      Added FM narrow to passband spec
      Added a provisional define for a variable bandwidth control
      Added a provisional variable bandwidth control to the RIG_LEVEL enumeration
      Added provisions for a variable bandwidth control Added provisions for a tone control Corrected problems with Squelch (SQL) and Notch (NOTCHF) controls
      Added provisions for a variable bandwidth control (BWC)
      Fixed low-end of freq range from 100kHz to 10kHz.
      Fixed several differences in 535/545 commands
      Added missing manual notch switch for the NRD-545

Martin Cooper (2):
      Don't expect a response when none is required.
      Don't send EasyComm I commands to EasyComm II rotators.

Martin Ewing (7):
      Add test for valid set frequency, esp. for VFOA (ham band only) Expand valid range_lists for full hardware ranges Fix tt565_transaction to allow Morse commands.
      Orion.c: remove spurious debug statement.
      implement level settting and misc fixes
      remove debug stmt
      Increment Jupiter version
      Trim TS950 commands that are not provided by CAT
      jupiter.c:  Updates from Martin, AA6E

Martin Ewing, AA6E (69):
      specified buffer lengths, added default vfo A setting
      Fix SWR & S-meter, set ATT, set AGC, add rough STR_CAL func.
      Fix timeout, add retry, better S-mtr scale
      various bug fixes
      Added RIG_LEVEL_CWPITCH, RIG_LEVEL_KEYSPD, send_morse()
      Added RIG_FUNC_TUNER, RIG_FUNC_LOCK and RIG_FUNC_VOX, fixed MEM_CAP.
      Added VFO_OPS, promote to Beta
      Support LEVEL_VOX, VOXGAIN, ANTIVOX Support LEVEL_NR as Orion NB setting (firmware bug), FUNC_NB -> NB=0,4
      Add get_, set_ant (ignores rx only ant)
      Added Orion, Orion 2 info
      Squashed warnings about signedness
      Orion S-meter cal
      minor - add doxygen info for enums
      minor - doxygen parameters
      doxygen formatting
      add comments
      info on generating docs
      doc improvements
      add comment
      documentation
      documentation
      allow atten = 0 dB
      patch from SM6PPS
      fix enum documentation
      documentation page
      documentation
      documentation
      split orion.c and add doc info
      documentation
      SM6PPS mods for AOR 5000a
      further rx-320 mods by Ken Prox
      use binary mode VFO requests
      correct CHANNEL_CAPS sytax
      Dead simple sample Hamlib program
      Correct float vs int interpolation options
      Add autodetect version 1 or 2 firmware (using rig_get_info). Correct V1 calibration.  Make V2 calibration the default. Signal RIG_LEVEL_STRENGTH supported.
      Moved firmware detection to new tt565_open routine, where it is done every time the rig is opened.
      Add more functions to example program.
      Ensure printable get_info string
      Fix bug that seg faulted when get_info returned null. (No reward points!)
      Add S meter operations to sample program.
      Adjust retry & timeout values to help in case of no response from rig, i.e., if rig power happens to be off.  Prettify some code indents.
      Better error handling, reliability for serial I/O.  Misc prettification.
      TT Omni VI / Plus improvements
      Fix typo
      Fix Omni VI PTT function
      Update Icom info
      Declutter
      Omni VI memories, rit/xit
      Fix serial I/O error checking
      Add author. (credits info added to web page, also)
      Switch back to ASCII freq. setting because of hardware(?) bug.
      Add AF, RF gain and squelch level capability.
      Add thanks to W1RFI & ARRL
      minor changes
      RIG_STATUS_ALPHA reflecting initial tests.
      fix missing comma
      use rawstrength.i which matters in PPC compile
      fix string handling in LEVEL_RAWSTR
      Orion - implement RIG_LEVEL_STRENGTH
      Example updates
      Orion: Allow frontend to handle RIG_LEVEL_STRENGTH
      Minor comment re rit/xit
      Downgrade ERR to WARN (i/o retry)
      Init revision - tnx Stephane
      Autofixer sets up for libtool v1 or v2
      autofixer.sh supportin libtool v1 and v2
      minor update
      repair echo cmd

Max Lock (1):
      Addition of support for CM108B PTT

Michael Black (1323):
      TenTec Omni VII update from W9MDB
      New XG3 backend
      Fixes to termios.c on W32 targets
      xg3 patch
      Check TS-590S for EU or US firmware
      New backend for FT-991
      Flush the debug stream
      Omni VII to set VFO_CURR correctly
      Omni VII patch for WSJT-X
      FT-991 patch
      Small FT-991 patch for WSJT support
      Omni VII patch
      FT-857 and FT-991 patches
      Fix possible frequency overflow on Kenwood and Yaesu
      Add get_freq to FRG-100
      Clean up clang warnings on adat.c
      Clear up a clang compiler warning in kenwood/elecraft.h
      Clean up clang warnings in tentec
      Fix port->pathname checks
      Quell clang warnings in tests directory
      Various Yaesu updates
      Simply define TRUE to 1 in omnivii.c
      Allow the ft757gx to work with WSJT-X.
      Remove input redirects in autogen.sh
      Initial support for the IC-7300
      Add send_morse to icom rigs
      tmd710 patch
      Icom frame patch
      Exposed constants via function calls
      Remove define
      Merge branch 'master' of https://github.com/N0NB/hamlib
      Changed some modules to LGPL in lieu of GPL
      Fixed buffer overflow in rigctl_parse and rotctl_parse
      Merge branch 'master' of https://github.com/N0NB/hamlib
      Move K3 DT0 before mode switch, add version info to electraft rig open, WSJT-X VOX rig split now works
      Merge branch 'master' of https://github.com/N0NB/hamlib
      Added IC-7850/51 -- works with WSJT-X
      Merge branch 'master' of https://github.com/N0NB/hamlib
      Add ic7850 ic7851 -- works with wsjtx
      Add ic7850 ic7851 -- works with wsjtx
      Merger 7850/51 into 785x
      Fix ft991_get_mode
      Added ft891 backend
      Fix ic785x default addr to 0x8e
      Fix FT-891 recognition
      IC-M710 now working with WSJST-X
      Add icm710.h to icmarine Makefile.am
      Merge pull request #1 from Hamlib/master
      Fix FT857 to return the SMeter-based value
      Reduce debug info in flrig.c
      Change RIG_MODE and RIG_FUNC to 64-bit values
      Merge hamlib head
      Add PRXll macro for 64-bit use
      Fixup for 64-bit in memcsv.c
      64 bit mods to netrigctl.c testrig.c
      Add TS-890S as derivative of TS-480 plus new modes
      Add XHCG to ic706.c
      Change rmode_t to uint64_t and remove unneeded casts
      Fix RIG_MODE structure in src/msic.c
      Fix some 64bit items and add RIG_FUNC_NB2 for TS-890S
      Suppress GCC unused-return warning
      Fix rig_idx2settings for 64-bit sprintf_list functions
      Fix flrig when WSJT-X startup causes rig mode change Increase flrig timeout value Add USB mode to flrig Fix flrig memory leak Fix bug where constant value was being trashed
      Add PKT modes to ts590.c
      Add BC2 and NB2 functions for newer kenwoods Change RIG_SETTING_MAX for 64-bit compatibility
      All kenwoods to have 3-char commands for functions and return whatever value the rig returns instead of 0/1 Changes to add more ts890 capabilities, e.g. NB2, BC2
      Fix kenwoood BC BC2 returns
      Fix kenwood BC BC2 return
      merge master
      New utility to allow non-hamlib-aware programs to use hamlib rigs via COM ports Virtual com ports providing a TS-2000 Emulator Example connecting N1MM or such to FLRig via COM5/COM6 virtual COM pair rigctlcom -m 4 -R COM5 -S 115200 N1MM connects to COM6 TS-2000 115200 8N1
      Add TUNER on/off fnction for Yaesu rigs
      Fix segfault in rigctlcom with no args and improve usage
      Add rigctlcom to install scripts
      Add FT847UNI for early serial number units that are one-way comm
      Add rigctlcom to gitignore
      Reduce verbosity in FLRig
      Ensure buf is zeroed in kenwood_safe_transaction to avoid return random data
      Reduce verbosity of rig_strrmode and read_string
      Improve error handling in network_flush when disconnect happens
      Reduce verbosity of rig_strvfo
      netrigctl can now do vfo mode -- has automatic detection of rigctld vfo mode rigctl automatically detects vfo mode of rigctld rigctli and rigctld recommend vfo mode if not selected
      Merge branch 'master' of https://github.com/Hamlib/Hamlib
      Fix memset in kenwood.c
      Fix network_flush as it was not actually flushing before This was causing an infinite loop and WSJT-X to lock up using flex6xxx backend
      network.c astyle applied
      Add ability for rigctlcom to work with Ham Radio Deluxe
      astyle format of rigctlcom.c
      Relax chk_vfo requirement for backward compatibility
      astyle for netrigctl.c
      Merge branch 'master' of https://github.com/Hamlib/Hamlib
      Fix ts590 RIG_LEVEL_AF
      astyle ts590.c
      Update TS590 version and make it STABLE
      Add set/get powerstat for ic785x.c
      Have kenwood set_powerstat ON...
 
[truncated message content]

[Hamlib-commits] Hamlib -- Ham radio control libraries branch Hamlib-4.3 created. 5a6134b7430126af15fbd4a4baa44acdfc0fa53d

From: Nate B. <n0...@us...> - 2021-09-01 02:16:40

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.3 has been created
        at  5a6134b7430126af15fbd4a4baa44acdfc0fa53d (commit)

- Log -----------------------------------------------------------------
commit 5a6134b7430126af15fbd4a4baa44acdfc0fa53d
Author: Nate Bargmann <n0...@n0...>
Date:   Tue Aug 31 21:14:39 2021 -0500

    Update for Hamlib 4.3 release

diff --git a/configure.ac b/configure.ac
index 2ff5cbdb..ce9e9087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl Please do not use '-' in the version number, as package managers will fail,
 dnl however, the use of '~' should be fine as apt (others?) will treat
 dnl it as an earlier version than the actual release.  TNX KA6MAL
 dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars!
-AC_INIT([Hamlib],[4.3~git],[ham...@li...],[hamlib],[http://www.hamlib.org])
+AC_INIT([Hamlib],[4.3],[ham...@li...],[hamlib],[http://www.hamlib.org])
 
 AC_CONFIG_SRCDIR([include/hamlib/rig.h])
 AC_CONFIG_MACRO_DIR([macros])

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


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

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

From: Nate B. <n0...@us...> - 2021-09-01 02:12:35

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  fe789607d098c10eee559596ba0191361c8935f8 (commit)
       via  45e0db787d6f67777c6db740e55529a67bd52552 (commit)
       via  53104cac3c86712276db792aed5788183f751c53 (commit)
      from  cd8acd5c1ff94247a474a90ee499e5b41e02a018 (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 fe789607d098c10eee559596ba0191361c8935f8
Author: Nate Bargmann <n0...@n0...>
Date:   Tue Aug 31 21:09:55 2021 -0500

    Update for 4.4 release

diff --git a/NEWS b/NEWS
index d7761cb6..d2e2d8cc 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ Copyright (C) 2000-2021  Michael Black W9MDB, and others
 
 Please send Hamlib bug reports to ham...@li...
 
+Version 4.4
+        * 2021-??-??
+
 Version 4.3
         * 2021-09-01
         * libusb-1.0.23 or greater is now required or use --without-libusb

commit 45e0db787d6f67777c6db740e55529a67bd52552
Author: Nate Bargmann <n0...@n0...>
Date:   Tue Aug 31 21:09:30 2021 -0500

    Advance to version 4.4~git

diff --git a/configure.ac b/configure.ac
index 2ff5cbdb..6aa937e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl Please do not use '-' in the version number, as package managers will fail,
 dnl however, the use of '~' should be fine as apt (others?) will treat
 dnl it as an earlier version than the actual release.  TNX KA6MAL
 dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars!
-AC_INIT([Hamlib],[4.3~git],[ham...@li...],[hamlib],[http://www.hamlib.org])
+AC_INIT([Hamlib],[4.4~git],[ham...@li...],[hamlib],[http://www.hamlib.org])
 
 AC_CONFIG_SRCDIR([include/hamlib/rig.h])
 AC_CONFIG_MACRO_DIR([macros])
@@ -56,7 +56,7 @@ dnl See README.release on setting these values
 # Values given to -version-info when linking.  See libtool documentation.
 # Set them here to keep c++/Makefile and src/Makefile in sync.
 ABI_VERSION=4
-ABI_REVISION=3
+ABI_REVISION=4
 ABI_AGE=0
 
 AC_DEFINE_UNQUOTED([ABI_VERSION], [$ABI_VERSION], [Frontend ABI version])

commit 53104cac3c86712276db792aed5788183f751c53
Author: Nate Bargmann <n0...@n0...>
Date:   Tue Aug 31 21:00:22 2021 -0500

    Change release date to 2021-09-01

diff --git a/NEWS b/NEWS
index 84526076..d7761cb6 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Copyright (C) 2000-2021  Michael Black W9MDB, and others
 Please send Hamlib bug reports to ham...@li...
 
 Version 4.3
-        * 2021-08-31
+        * 2021-09-01
         * libusb-1.0.23 or greater is now required or use --without-libusb
         * Generating documentation now requires GNU source-highlighter.
         * Added IC-575

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

Summary of changes:
 NEWS         | 5 ++++-
 configure.ac | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-08-30 22:38:37

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  cd8acd5c1ff94247a474a90ee499e5b41e02a018 (commit)
       via  03ebf857a9d28ab4a30a2c484c5b405c8e79a410 (commit)
       via  eaa39df66be96f5130ad06b6c14bbd8904bcc9cf (commit)
      from  4c0781560d86e8a7addc1ff345d5cfcd43ef4743 (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 cd8acd5c1ff94247a474a90ee499e5b41e02a018
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Aug 30 17:38:00 2021 -0500

    Update NEWS for 4.3 release

diff --git a/NEWS b/NEWS
index 1cc539b3..84526076 100644
--- a/NEWS
+++ b/NEWS
@@ -7,10 +7,13 @@ Copyright (C) 2000-2021  Michael Black W9MDB, and others
 Please send Hamlib bug reports to ham...@li...
 
 Version 4.3
-        * 2021-??-??
+        * 2021-08-31
         * libusb-1.0.23 or greater is now required or use --without-libusb
         * Generating documentation now requires GNU source-highlighter.
         * Added IC-575
+        * Less VFO swapping of newer Icom rigs -- zero swapping in WSJTX and JTDX
+        * Dual rotator control in rotctl -R option
+        * Started work on simulators -- very crude right now but usable to debug some things
         * Overhaul of rig split -- reverse split (VFOA=RX VFOB=TX) should work for rigs capable of it
           Starting VFO does not matter -- rig will end up on RX VFO
           S VFOA 1 VFOB

commit 03ebf857a9d28ab4a30a2c484c5b405c8e79a410
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Aug 30 15:19:16 2021 -0500

    Update rotctl.1 man page

diff --git a/doc/man1/rotctl.1 b/doc/man1/rotctl.1
index e783e5e5..a85d8e1a 100644
--- a/doc/man1/rotctl.1
+++ b/doc/man1/rotctl.1
@@ -19,6 +19,7 @@ rotctl \- control antenna rotators
 .OP \-hiIlLuV
 .OP \-m id
 .OP \-r device
+.OP \-R device2
 .OP \-s baud
 .OP \-t char
 .OP \-C parm=val
@@ -87,6 +88,20 @@ etc. on MS Windows.  The BSD flavors and Mac OS/X have their own designations.
 See your system's documentation.
 .
 .TP
+.BR \-R ", " \-\-rot\-file2 = \fIdevice\fP
+Use
+.I device
+as the file name of the port connected to the 2nd rotator.
+e.g. 2nd rotator used for elevation.
+.IP
+Often a serial port, but could be a USB to serial adapter.  Typically
+.IR /dev/ttyS0 ", " /dev/ttyS1 ", " /dev/ttyUSB0 ,
+etc. on Linux,
+.IR COM1 ", " COM2 ,
+etc. on MS Windows.  The BSD flavors and Mac OS/X have their own designations.
+See your system's documentation.
+.
+.TP
 .BR \-s ", " \-\-serial\-speed = \fIbaud\fP
 Set serial speed to
 .I baud

commit eaa39df66be96f5130ad06b6c14bbd8904bcc9cf
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Aug 30 10:41:05 2021 -0500

    Update tests/Makefile.am to not remove build scripts

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3fac3cf7..654478e1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -127,4 +127,4 @@ testcookie.sh:
 	echo './testcookie 1' > testcookie.sh
 	chmod +x ./testcookie.sh
 
-CLEANFILES = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh testlibusb
+CLEANFILES = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh testlibusb build-w32.sh build-w64.sh build-w64-jtsdk.sh

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

Summary of changes:
 NEWS              |  5 ++++-
 doc/man1/rotctl.1 | 15 +++++++++++++++
 tests/Makefile.am |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-08-30 13:47:12

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  5c00d46cc3a2ec75e4773343c27f58b748a23958 (commit)
       via  f65022b4caf1db9b8218710918fdcba4f35cef05 (commit)
       via  118dcbb35f4ba0b3fb97eae84001eb519b645d43 (commit)
       via  53b67d24ec2730516dff5b5670d2afafdcb39243 (commit)
       via  dc47740c400c120852c09c4e43e8c66712d01a9b (commit)
      from  a0672e4f7e600f4ad9b887c11880baa6e9ab4052 (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 5c00d46cc3a2ec75e4773343c27f58b748a23958
Merge: f65022b4 118dcbb3
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Aug 30 08:46:55 2021 -0500

    Merge branch 'master' of https://github.com/Hamlib/Hamlib


commit f65022b4caf1db9b8218710918fdcba4f35cef05
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Mon Aug 30 08:45:56 2021 -0500

    If set_split_freq_mode is called when split=off we'll turn on split based on current vfo selection
    https://github.com/Hamlib/Hamlib/issues/764

diff --git a/src/rig.c b/src/rig.c
index dce1adc0..dba18783 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -4369,6 +4369,19 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
 
     caps = rig->caps;
 
+    // if split is off we'll turn it on
+    if (rig->state.cache.split == 0)
+    {
+        if (rig->state.current_vfo & (RIG_VFO_A | RIG_VFO_MAIN))
+        {
+            rig_set_split_vfo(rig, RIG_VFO_A, 1, RIG_VFO_B);
+        }
+        else
+        {
+            rig_set_split_vfo(rig, RIG_VFO_B, 1, RIG_VFO_A);
+        }
+    }
+
     vfo = vfo_fixup(rig, RIG_VFO_TX, rig->state.cache.split); // get the TX VFO
     rig_debug(RIG_DEBUG_VERBOSE,
               "%s: vfo=%s, tx_freq=%.0f, tx_mode=%s, tx_width=%d\n", __func__,

commit 118dcbb35f4ba0b3fb97eae84001eb519b645d43
Merge: a0672e4f dc47740c
Author: Michael Black <mdb...@ya...>
Date:   Mon Aug 30 08:25:26 2021 -0500

    Merge pull request #779 from cjritola/fcdppAug2021
    
    Map FCDPP LNA and Mixer Gain as PREAMP values. Closes #766


commit 53b67d24ec2730516dff5b5670d2afafdcb39243
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sun Aug 29 23:32:29 2021 -0500

    Fix Startup information in rigctl and rigctld

diff --git a/tests/rigctl.c b/tests/rigctl.c
index 6e027faf..58a2b6b0 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -154,6 +154,7 @@ int main(int argc, char *argv[])
     int ext_resp = 0;
     char resp_sep = '\n';
     int i;
+    char rigstartup[1024];
 
     while (1)
     {
@@ -440,11 +441,11 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d) Startup:", __FILE__, __LINE__);
+    snprintf(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
 
-    for (i = 0; i < argc; ++i) { rig_debug(RIG_DEBUG_VERBOSE, " %s", argv[i]); }
+    for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s", "\n");
+    rig_debug(RIG_DEBUG_VERBOSE, "%s\n", rigstartup);
 
 
     rig_debug(RIG_DEBUG_VERBOSE, "rigctl %s\n", hamlib_version2);
diff --git a/tests/rigctld.c b/tests/rigctld.c
index 508ae8cd..854227e0 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -257,6 +257,7 @@ int main(int argc, char *argv[])
     int uplink = 0;
     char host[NI_MAXHOST];
     char serv[NI_MAXSERV];
+    char rigstartup[1024];
 #if HAVE_SIGACTION
     struct sigaction act;
 #endif
@@ -577,12 +578,11 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d) Startup:", __FILE__, __LINE__);
+    snprintf(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
 
-    for (i = 0; i < argc; ++i) { rig_debug(RIG_DEBUG_VERBOSE, " %s", argv[i]); }
-
-    rig_debug(RIG_DEBUG_VERBOSE, "%s", "\n");
+    for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }
 
+    rig_debug(RIG_DEBUG_VERBOSE, "%s\n", rigstartup);
 
     rig_debug(RIG_DEBUG_VERBOSE, "rigctld %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",

commit dc47740c400c120852c09c4e43e8c66712d01a9b
Author: Chuck Ritola <cjr...@gm...>
Date:   Mon Aug 30 00:18:42 2021 -0400

    Map FCDPP LNA and Mixer Gain as PREAMP values. Closes #766

diff --git a/rigs/kit/funcube.c b/rigs/kit/funcube.c
index 1402471f..b79b5f72 100644
--- a/rigs/kit/funcube.c
+++ b/rigs/kit/funcube.c
@@ -36,10 +36,11 @@
 #include <math.h>
 #include "hamlib/rig.h"
 #include "token.h"
+#include "misc.h"
 
 #include "kit.h"
 
-#define BACKEND_VER "20200112"
+#define BACKEND_VER "20210830"
 
 /*
  * Compile this model only if libusb is available
@@ -56,6 +57,8 @@
 
 #include "funcube.h"
 
+static int funcube_hid_cmd(RIG *rig, unsigned char *au8BufOut, unsigned char *au8BufIn, int inputSize);
+
 static int funcube_init(RIG *rig);
 static int funcubeplus_init(RIG *rig);
 static int funcube_cleanup(RIG *rig);
@@ -180,23 +183,17 @@ const struct rig_caps funcubeplus_caps =
 
     .has_get_func =     RIG_FUNC_NONE,
     .has_set_func =     RIG_FUNC_NONE,
-    .has_get_level =    RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | RIG_LEVEL_RF, // RIG_LEVEL_ATT: Mixer gain on/off
-    // RIG_LEVEL_PREAMP: LNA gain on/off
+    .has_get_level =    RIG_LEVEL_PREAMP | RIG_LEVEL_RF,
+    // RIG_LEVEL_PREAMP: 10dB=LNAon MixGainOff.   20dB=LNAoff, MixGainOn.  30dB=LNAOn, MixGainOn
     // RIG_LEVEL_RF 0..1 : IF gain 0 .. 59 dB
-
-
-    .has_set_level =    RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | RIG_LEVEL_RF, // RIG_LEVEL_ATT: Mixer gain on/off
-    // RIG_LEVEL_PREAMP: LNA gain on/off
-    // RIG_LEVEL_RF 0..1 : IF gain 0 .. 59 dB
-    // so values have to be mapped
+    .has_set_level =    RIG_LEVEL_PREAMP | RIG_LEVEL_RF,
     .has_get_parm =     RIG_PARM_NONE,
     .has_set_parm =     RIG_PARM_NONE,
     .level_gran =       {},
     .parm_gran =        {},
     .ctcss_list =       NULL,
     .dcs_list =     NULL,
-    //.preamp =     { 5, 10, 15, 20, 25, 30, RIG_DBLST_END, },
-    //.attenuator =     { 0, 1, 2, RIG_DBLST_END, },
+    .preamp =    { 10, 20, 30, RIG_DBLST_END, },
     .max_rit =      Hz(0),
     .max_xit =      Hz(0),
     .max_ifshift =      Hz(0),
@@ -638,6 +635,7 @@ int funcube_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
     return RIG_OK;
 }
+
 int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
     libusb_device_handle *udh = rig->state.rigport.handle;
@@ -761,44 +759,12 @@ int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
     return RIG_OK;
 }
-int funcubepro_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
+
+int funcube_hid_cmd(RIG *rig, unsigned char *au8BufOut, unsigned char *au8BufIn, int inputSize)
 {
     libusb_device_handle *udh = rig->state.rigport.handle;
     int ret;
     int actual_length;
-    unsigned char au8BufOut[64] = { 0 }; // endpoint size
-    unsigned char au8BufIn[64] = { 0 };  // endpoint size
-
-    switch (level)
-    {
-    case RIG_LEVEL_PREAMP:
-        au8BufOut[0] = REQUEST_SET_LNA_GAIN; // Command to set LNA gain
-        au8BufOut[1] = val.i & 0x1;
-        break;
-
-    case RIG_LEVEL_ATT:
-        au8BufOut[0] = REQUEST_SET_MIXER_GAIN; // Command to Mixer gain
-        au8BufOut[1] = val.i & 0x1;
-        break;
-
-    case RIG_LEVEL_RF:
-        au8BufOut[0] = REQUEST_SET_IF_GAIN; // Command to set IF gain
-        au8BufOut[1] = (int)(val.f * 100) ;
-
-        if (au8BufOut[1] > 59)
-        {
-            au8BufOut[1] = 59;
-        }
-
-        break;
-
-
-    default:
-        rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__,
-                  rig_strlevel(level));
-        return -RIG_EINVAL;
-    }
-
     rig_debug(RIG_DEBUG_TRACE, "%s: HID packet set to %02x%02x%02x%02x\n",
               __func__, au8BufOut[0] & 0xFF, au8BufOut[1] & 0xFF, au8BufOut[2] & 0xFF,
               au8BufOut[3] & 0xFF);
@@ -813,10 +779,10 @@ int funcubepro_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
                   libusb_error_name(ret));
     }
 
-    ret = libusb_interrupt_transfer(udh, INPUT_ENDPOINT, au8BufIn, sizeof(au8BufIn),
+    ret = libusb_interrupt_transfer(udh, INPUT_ENDPOINT, au8BufIn, inputSize,
                                     &actual_length, rig->state.rigport.timeout);
 
-    if (ret < 0 || actual_length != sizeof(au8BufIn))
+    if (ret < 0 || actual_length != inputSize)
     {
         rig_debug(RIG_DEBUG_ERR, "%s: libusb_interrupt_transfer failed (%d): %s\n",
                   __func__, ret,
@@ -828,85 +794,140 @@ int funcubepro_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
     if (au8BufIn[1] != FUNCUBE_SUCCESS)
     {
-        rig_debug(RIG_DEBUG_ERR, "%s: REQUEST_GET_FREQ_HZ not supported\n",
-                  __func__);
+        rig_debug(RIG_DEBUG_ERR, "%s: failed to perform FUNCube HID command %d.\n",
+                  __func__, au8BufOut[0]);
         return -RIG_EIO;
     }
 
     return RIG_OK;
 }
-int funcubepro_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
+
+int funcubepro_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 {
-    libusb_device_handle *udh = rig->state.rigport.handle;
+    ENTERFUNC;
     int ret;
-    int actual_length;
     unsigned char au8BufOut[64] = { 0 }; // endpoint size
     unsigned char au8BufIn[64] = { 0 };  // endpoint size
 
     switch (level)
     {
-    case RIG_LEVEL_ATT:
-        au8BufOut[0] = REQUEST_GET_MIXER_GAIN; // Command to Mixer gain enabled
-        break;
-
     case RIG_LEVEL_PREAMP:
-        au8BufOut[0] = REQUEST_GET_LNA_GAIN;   // Command to get LNA gain enabled
-        break;
+        rig_debug(RIG_DEBUG_TRACE, "%s: Setting PREAMP state to %d.\n",
+              __func__, val.i);
+        au8BufOut[0] = REQUEST_SET_LNA_GAIN; // Command to set LNA gain
+
+        if( val.i == 10 || val.i == 30  )
+        {
+            au8BufOut[1] = 1;
+        }
+        else
+        {
+            au8BufOut[1] = 0;
+        }
+        
+        ret = funcube_hid_cmd(rig, au8BufOut, au8BufIn, sizeof(au8BufIn));
+        
+        if( ret < 0 )
+        {
+            return ret;
+        }
+
+        au8BufOut[0] = REQUEST_SET_MIXER_GAIN; // Set mixer gain
+
+        if( val.i == 20 || val.i == 30  )
+        {
+            au8BufOut[1] = 1;
+        }
+        else
+        {
+            au8BufOut[1] = 0;
+        }
+
+        return funcube_hid_cmd(rig, au8BufOut, au8BufIn, sizeof(au8BufIn));
 
     case RIG_LEVEL_RF:
-        au8BufOut[0] = REQUEST_GET_IF_GAIN;
-        break;
+        au8BufOut[0] = REQUEST_SET_IF_GAIN; // Command to set IF gain
+        au8BufOut[1] = (int)(val.f * 100) ;
+
+        if (au8BufOut[1] > 59)
+        {
+            au8BufOut[1] = 59;
+        }
+
+        return funcube_hid_cmd(rig, au8BufOut, au8BufIn, sizeof(au8BufIn));
 
     default:
         rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__,
                   rig_strlevel(level));
         return -RIG_EINVAL;
     }
+}
 
-    rig_debug(RIG_DEBUG_TRACE, "%s: HID packet set to %02x%02x%02x%02x\n",
-              __func__, au8BufOut[0] & 0xFF, au8BufOut[1] & 0xFF, au8BufOut[2] & 0xFF,
-              au8BufOut[3] & 0xFF);
-
-    ret = libusb_interrupt_transfer(udh, OUTPUT_ENDPOINT, au8BufOut,
-                                    sizeof(au8BufOut), &actual_length, rig->state.rigport.timeout);
+int funcubepro_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
+{
+    ENTERFUNC;
+    int ret;
+    int gain_state;
+    unsigned char au8BufOut[64] = { 0 }; // endpoint size
+    unsigned char au8BufIn[64] = { 0 };  // endpoint size
 
-    if (ret < 0)
+    switch (level)
     {
-        rig_debug(RIG_DEBUG_ERR, "%s: libusb_interrupt_transfer failed (%d): %s\n",
-                  __func__, ret,
-                  libusb_error_name(ret));
-    }
 
-    ret = libusb_interrupt_transfer(udh, INPUT_ENDPOINT, au8BufIn, sizeof(au8BufIn),
-                                    &actual_length, rig->state.rigport.timeout);
+    case RIG_LEVEL_PREAMP:
+        au8BufOut[0] = REQUEST_GET_MIXER_GAIN;   // Command to get mixer gain enabled
+        ret = funcube_hid_cmd(rig, au8BufOut, au8BufIn, sizeof(au8BufIn));
 
-    if (ret < 0 || actual_length != sizeof(au8BufIn))
-    {
-        rig_debug(RIG_DEBUG_ERR, "%s: libusb_interrupt_transfer failed (%d): %s\n",
-                  __func__, ret,
-                  libusb_error_name(ret));
-    }
+        if( ret < 0 )
+        {
+            return ret;
+        }
 
-    rig_debug(RIG_DEBUG_TRACE, "%s: Answer buf=%02x%02x%02x\n",
-              __func__, au8BufIn[0] & 0xFF, au8BufIn[1] & 0xFF, au8BufIn[2] & 0xFF);
+        rig_debug(RIG_DEBUG_TRACE, "%s: Mixer gain state returned %d.\n",
+              __func__, au8BufIn[2] & 0xFF);
 
-    if (au8BufIn[1] != FUNCUBE_SUCCESS)
-    {
-        rig_debug(RIG_DEBUG_ERR, "%s: REQUEST_LEVEL_x failed\n",
-                  __func__);
-        return -RIG_EIO;
-    }
+        gain_state = au8BufIn[2] & 0x1;
 
-    switch (level)
-    {
-    case RIG_LEVEL_PREAMP:
-    case RIG_LEVEL_ATT:
-        val->i = au8BufIn[2] & 0x01;
-        break;
+        au8BufOut[0] = REQUEST_GET_LNA_GAIN;   // Command to get LNA gain enabled
+
+        ret = funcube_hid_cmd(rig, au8BufOut, au8BufIn, sizeof(au8BufIn));
+
+        if( ret < 0 )
+        {
+            return ret;
+        }
+
+        rig_debug(RIG_DEBUG_TRACE, "%s: LNA gain state returned %d.\n",
+              __func__, au8BufIn[2] & 0xFF);
+
+        //Mixer gain is 20dB 0x2
+        gain_state *= 2;
+
+        //Add the LNA gain if present (10dB) 0x1
+        gain_state += ( au8BufIn[2] & 0x1 );
+
+        //Scale it to tens 1->10dB 2->20dB 3->30dB
+        gain_state *= 10;
+
+        rig_debug(RIG_DEBUG_TRACE, "%s: Calculated gain state is %d.\n",
+              __func__, gain_state);
+
+        if( gain_state > 30 || gain_state < 0 || gain_state % 10 != 0)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s: unrecognized composite gain: %d\n", __func__,
+                  gain_state);
+            return -RIG_EINVAL;
+        }
+
+        val->i = gain_state;
+
+        return RIG_OK;
 
     case RIG_LEVEL_RF:
+        au8BufOut[0] = REQUEST_GET_IF_GAIN;
+        ret = funcube_hid_cmd(rig, au8BufOut, au8BufIn, sizeof(au8BufIn));
         val->f = ((float)au8BufIn[2]) / 100.;
-        break;
+        return ret;
 
     default:
         rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__,

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

Summary of changes:
 rigs/kit/funcube.c | 209 +++++++++++++++++++++++++++++------------------------
 src/rig.c          |  13 ++++
 tests/rigctl.c     |   7 +-
 tests/rigctld.c    |   8 +-
 4 files changed, 136 insertions(+), 101 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-08-29 15:02:20

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  a0672e4f7e600f4ad9b887c11880baa6e9ab4052 (commit)
      from  f6b57e147daa2cb1c397d978a061d419dce64165 (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 a0672e4f7e600f4ad9b887c11880baa6e9ab4052
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sun Aug 29 09:59:47 2021 -0500

    Fix rigctl/rigctld interaction regression from issue 773
    https://github.com/Hamlib/Hamlib/issues/778
    https://github.com/Hamlib/Hamlib/issues/773

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index af2fb255..4d350be3 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -1006,10 +1006,10 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             {
                 if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__); }
 
-                arg1[0] = fgetc(fin);
-                arg1[1] = 0;
+                arg2[0] = fgetc(fin);
+                arg2[1] = 0;
 
-                if (prompt && arg1[0]  == 0x0a)
+                if (prompt && arg2[0]  == 0x0a)
                 {
                     if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__); }
 

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

Summary of changes:
 tests/rigctl_parse.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-08-29 13:30:40

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  f6b57e147daa2cb1c397d978a061d419dce64165 (commit)
      from  36387c8af7f8250382b3d98ca3ca212a5b437bac (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 f6b57e147daa2cb1c397d978a061d419dce64165
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sun Aug 29 08:29:26 2021 -0500

    Make kenwood set_split_vfo behave the same as set_vfo in both directions
    https://github.com/Hamlib/Hamlib/issues/746

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 0333b2c7..a03a8ea6 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -1119,7 +1119,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
     snprintf(cmdbuf, sizeof(cmdbuf), "FR%c", vfo_function);
 
     // as we change VFO we will change split to the other VFO
-    // some rigs turn split off with FR command 
+    // some rigs turn split off with FR command
     if (priv->split)
     {
         if (vfo_function == '0')
@@ -1273,6 +1273,18 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
         // So we'll turn it back on just in case
         if (split && vfo_function == '0') { strcat(cmdbuf, ";FT1"); }
 
+        if (priv->split)
+        {
+            if (vfo_function == '0')
+            {
+                strcat(cmdbuf, ";FT1");
+            }
+            else
+            {
+                strcat(cmdbuf, ";FT0");
+            }
+        }
+
         retval = kenwood_transaction(rig, cmdbuf, NULL, 0);
 
         if (retval != RIG_OK)
diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h
index 7c1190fc..e0973afc 100644
--- a/rigs/kenwood/kenwood.h
+++ b/rigs/kenwood/kenwood.h
@@ -28,7 +28,7 @@
 #include "token.h"
 #include "misc.h"
 
-#define BACKEND_VER "20210828"
+#define BACKEND_VER "20210829"
 
 #define EOM_KEN ';'
 #define EOM_TH '\r'

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

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


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

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

From: Michael B. <mdb...@us...> - 2021-08-29 05:04:19

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  36387c8af7f8250382b3d98ca3ca212a5b437bac (commit)
      from  d16fa490d7aa7bfe1bb520fada04db3a3ad88cc1 (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 36387c8af7f8250382b3d98ca3ca212a5b437bac
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sun Aug 29 00:03:27 2021 -0500

    Put rigctl flow debug in if statement
    https://github.com/Hamlib/Hamlib/issues/773

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 9c510621..af2fb255 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -36,6 +36,9 @@
 #include <ctype.h>
 #include <errno.h>
 
+// If true adds some debug statements to see flow of rigctl parsing
+int debugflow = 0;
+
 #ifdef HAVE_LIBREADLINE
 #  if defined(HAVE_READLINE_READLINE_H)
 #    include <readline/readline.h>
@@ -878,18 +881,19 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
         }
 
-        rig_debug(RIG_DEBUG_TRACE, "%s: debug1\n", __func__);
+        if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug1\n", __func__); }
 
         if ((cmd_entry->flags & ARG_IN_LINE)
                 && (cmd_entry->flags & ARG_IN1)
                 && cmd_entry->arg1)
         {
-            rig_debug(RIG_DEBUG_TRACE, "%s: debug2\n", __func__);
+            if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug2\n", __func__); }
 
             if (interactive)
             {
                 char *nl;
-                rig_debug(RIG_DEBUG_TRACE, "%s: debug2a\n", __func__);
+
+                if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug2a\n", __func__); }
 
 
                 if (fgets(arg1, MAXARGSZ, fin) == NULL)
@@ -899,7 +903,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
 
                 if (arg1[0] == 0xa)
                 {
-                    //rig_debug(RIG_DEBUG_TRACE, "%s: debug2b\n", __func__);
+                    if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug2b\n", __func__); }
 
                     if (prompt)
                     {
@@ -948,13 +952,14 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
         }
         else if ((cmd_entry->flags & ARG_IN1) && cmd_entry->arg1)
         {
-            rig_debug(RIG_DEBUG_TRACE, "%s: debug3\n", __func__);
+            if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug3\n", __func__); }
 
             if (interactive)
             {
                 arg1[0] = fgetc(fin);
                 arg1[1] = 0;
-                rig_debug(RIG_DEBUG_TRACE, "%s: debug4 arg1=%c\n", __func__, arg1[0]);
+
+                if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug4 arg1=%c\n", __func__, arg1[0]); }
 
                 if (prompt && arg1[0] == 0x0a)
                 {
@@ -988,25 +993,26 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
         }
 
-        rig_debug(RIG_DEBUG_TRACE, "%s: debug5\n", __func__);
+        if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug5\n", __func__); }
 
         if (p1
                 && p1[0] != '?'
                 && (cmd_entry->flags & ARG_IN2)
                 && cmd_entry->arg2)
         {
-            rig_debug(RIG_DEBUG_TRACE, "%s: debug6\n", __func__);
+            if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug6\n", __func__); }
 
             if (interactive)
             {
-                rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__);
+                if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__); }
 
                 arg1[0] = fgetc(fin);
                 arg1[1] = 0;
 
                 if (prompt && arg1[0]  == 0x0a)
                 {
-                    rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__);
+                    if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__); }
+
                     fprintf_flush(fout, "%s: ", cmd_entry->arg2);
                 }
 
@@ -1020,7 +1026,8 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
             else
             {
-                rig_debug(RIG_DEBUG_TRACE, "%s: debug9\n", __func__);
+                if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug9\n", __func__); }
+
                 retcode = next_word(arg2, argc, argv, 0);
 
                 if (EOF == retcode)
@@ -1038,22 +1045,23 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
         }
 
-        rig_debug(RIG_DEBUG_TRACE, "%s: debug10\n", __func__);
+        if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug10\n", __func__); }
 
         if (p1
                 && p1[0] != '?'
                 && (cmd_entry->flags & ARG_IN3)
                 && cmd_entry->arg3)
         {
-            rig_debug(RIG_DEBUG_TRACE, "%s: debug11\n", __func__);
+            if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug11\n", __func__); }
 
             if (interactive)
             {
-                rig_debug(RIG_DEBUG_TRACE, "%s: debug12\n", __func__);
+                if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug12\n", __func__); }
 
                 if (prompt)
                 {
-                    rig_debug(RIG_DEBUG_TRACE, "%s: debug13\n", __func__);
+                    if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug13\n", __func__); }
+
                     fprintf_flush(fout, "%s: ", cmd_entry->arg3);
                 }
 
@@ -1067,7 +1075,8 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
             else
             {
-                rig_debug(RIG_DEBUG_TRACE, "%s: debug14\n", __func__);
+                if (debugflow) { rig_debug(RIG_DEBUG_TRACE, "%s: debug14\n", __func__); }
+
                 retcode = next_word(arg3, argc, argv, 0);
 
                 if (EOF == retcode)

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

Summary of changes:
 tests/rigctl_parse.c | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-08-29 04:59:31

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  d16fa490d7aa7bfe1bb520fada04db3a3ad88cc1 (commit)
      from  2c8092d21b7e2e39baa9060394404b53c0285897 (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 d16fa490d7aa7bfe1bb520fada04db3a3ad88cc1
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 23:44:35 2021 -0500

    Fix display of arguments for rigctl non-readline version
    https://github.com/Hamlib/Hamlib/issues/773

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 61bac1dd..9c510621 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -878,18 +878,18 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
         }
 
-        //rig_debug(RIG_DEBUG_TRACE, "%s: debug1\n", __func__);
+        rig_debug(RIG_DEBUG_TRACE, "%s: debug1\n", __func__);
 
         if ((cmd_entry->flags & ARG_IN_LINE)
                 && (cmd_entry->flags & ARG_IN1)
                 && cmd_entry->arg1)
         {
-            //rig_debug(RIG_DEBUG_TRACE, "%s: debug2\n", __func__);
+            rig_debug(RIG_DEBUG_TRACE, "%s: debug2\n", __func__);
 
             if (interactive)
             {
                 char *nl;
-                //rig_debug(RIG_DEBUG_TRACE, "%s: debug2a\n", __func__);
+                rig_debug(RIG_DEBUG_TRACE, "%s: debug2a\n", __func__);
 
 
                 if (fgets(arg1, MAXARGSZ, fin) == NULL)
@@ -948,13 +948,13 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
         }
         else if ((cmd_entry->flags & ARG_IN1) && cmd_entry->arg1)
         {
-            //rig_debug(RIG_DEBUG_TRACE, "%s: debug3\n", __func__);
+            rig_debug(RIG_DEBUG_TRACE, "%s: debug3\n", __func__);
 
             if (interactive)
             {
                 arg1[0] = fgetc(fin);
                 arg1[1] = 0;
-                //rig_debug(RIG_DEBUG_TRACE, "%s: debug4 arg1=%c\n", __func__, arg1[0]);
+                rig_debug(RIG_DEBUG_TRACE, "%s: debug4 arg1=%c\n", __func__, arg1[0]);
 
                 if (prompt && arg1[0] == 0x0a)
                 {
@@ -988,22 +988,25 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
         }
 
-        //rig_debug(RIG_DEBUG_TRACE, "%s: debug5\n", __func__);
+        rig_debug(RIG_DEBUG_TRACE, "%s: debug5\n", __func__);
 
         if (p1
                 && p1[0] != '?'
                 && (cmd_entry->flags & ARG_IN2)
                 && cmd_entry->arg2)
         {
-            //rig_debug(RIG_DEBUG_TRACE, "%s: debug6\n", __func__);
+            rig_debug(RIG_DEBUG_TRACE, "%s: debug6\n", __func__);
 
             if (interactive)
             {
-                //rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__);
+                rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__);
 
-                if (prompt)
+                arg1[0] = fgetc(fin);
+                arg1[1] = 0;
+
+                if (prompt && arg1[0]  == 0x0a)
                 {
-                    //rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__);
+                    rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__);
                     fprintf_flush(fout, "%s: ", cmd_entry->arg2);
                 }
 
@@ -1017,7 +1020,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
             else
             {
-                //rig_debug(RIG_DEBUG_TRACE, "%s: debug9\n", __func__);
+                rig_debug(RIG_DEBUG_TRACE, "%s: debug9\n", __func__);
                 retcode = next_word(arg2, argc, argv, 0);
 
                 if (EOF == retcode)
@@ -1035,22 +1038,22 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
         }
 
-        //rig_debug(RIG_DEBUG_TRACE, "%s: debug10\n", __func__);
+        rig_debug(RIG_DEBUG_TRACE, "%s: debug10\n", __func__);
 
         if (p1
                 && p1[0] != '?'
                 && (cmd_entry->flags & ARG_IN3)
                 && cmd_entry->arg3)
         {
-            //rig_debug(RIG_DEBUG_TRACE, "%s: debug11\n", __func__);
+            rig_debug(RIG_DEBUG_TRACE, "%s: debug11\n", __func__);
 
             if (interactive)
             {
-                //rig_debug(RIG_DEBUG_TRACE, "%s: debug12\n", __func__);
+                rig_debug(RIG_DEBUG_TRACE, "%s: debug12\n", __func__);
 
                 if (prompt)
                 {
-                    //rig_debug(RIG_DEBUG_TRACE, "%s: debug13\n", __func__);
+                    rig_debug(RIG_DEBUG_TRACE, "%s: debug13\n", __func__);
                     fprintf_flush(fout, "%s: ", cmd_entry->arg3);
                 }
 
@@ -1064,7 +1067,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
             }
             else
             {
-                //rig_debug(RIG_DEBUG_TRACE, "%s: debug14\n", __func__);
+                rig_debug(RIG_DEBUG_TRACE, "%s: debug14\n", __func__);
                 retcode = next_word(arg3, argc, argv, 0);
 
                 if (EOF == retcode)

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

Summary of changes:
 tests/rigctl_parse.c | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)


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

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

From: Michael B. <mdb...@us...> - 2021-08-29 03:37:06

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  2c8092d21b7e2e39baa9060394404b53c0285897 (commit)
      from  004efafda7de9cea82aaf694f5224f96977c828a (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 2c8092d21b7e2e39baa9060394404b53c0285897
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 22:35:16 2021 -0500

    For kenwood rigs reset split after set_vfo FR command if needed
    Side effect of this change is support of reverse split by changing to VFOB
    https://github.com/Hamlib/Hamlib/issues/746

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 589c2150..0333b2c7 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -1118,6 +1118,20 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
 
     snprintf(cmdbuf, sizeof(cmdbuf), "FR%c", vfo_function);
 
+    // as we change VFO we will change split to the other VFO
+    // some rigs turn split off with FR command 
+    if (priv->split)
+    {
+        if (vfo_function == '0')
+        {
+            strcat(cmdbuf, ";FT1");
+        }
+        else
+        {
+            strcat(cmdbuf, ";FT0");
+        }
+    }
+
     if (RIG_IS_TS50 || RIG_IS_TS940)
     {
         cmdbuf[1] = 'N';
diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h
index a5c0242a..7c1190fc 100644
--- a/rigs/kenwood/kenwood.h
+++ b/rigs/kenwood/kenwood.h
@@ -28,7 +28,7 @@
 #include "token.h"
 #include "misc.h"
 
-#define BACKEND_VER "20210827"
+#define BACKEND_VER "20210828"
 
 #define EOM_KEN ';'
 #define EOM_TH '\r'

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

Summary of changes:
 rigs/kenwood/kenwood.c | 14 ++++++++++++++
 rigs/kenwood/kenwood.h |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)


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

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

From: Michael B. <mdb...@us...> - 2021-08-29 03:22:13

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  004efafda7de9cea82aaf694f5224f96977c828a (commit)
       via  9efa3c7259851326688213e0c1d4f1f4f3039e8f (commit)
       via  996dbbfa1a7cd325d0c5c7efc7f9f5c33733aca5 (commit)
      from  f552e3f0e8900e9285b23770a590e07cbc16b90a (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 004efafda7de9cea82aaf694f5224f96977c828a
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 17:09:27 2021 -0500

    Remove unnecessary set_mode command from TARGETABLE_MODE Icom rigs
    https://github.com/Hamlib/Hamlib/issues/762
    https://github.com/Hamlib/Hamlib/issues/430

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index c4466300..6f3e187c 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1809,7 +1809,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
 
     switch (mode)
     {
-#if 0 // don't think this is needed anymore -- W9MDB 20210828
+
     case RIG_MODE_PKTUSB:
         // xFE xFE x6E xE0 x1A x06 x01 xFD switches mod input from MIC to ACC
         // This apparently works for IC-756ProIII but nobody has asked for it yet
@@ -1827,7 +1827,6 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     case RIG_MODE_PKTAM:
         icom_mode = RIG_MODE_AM;
         break;
-#endif
 
     default:
         icom_mode = mode;
@@ -1837,7 +1836,16 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     rig_debug(RIG_DEBUG_VERBOSE, "%s mode=%d, width=%d, curr_vfo=%s\n", __func__,
               (int)icom_mode,
               (int)width, rig_strvfo(rig->state.current_vfo));
-    retval = icom_set_mode(rig, vfo, icom_mode, width);
+
+    // we only need to change base mode if we aren't using cmd 26 later
+    if (!(rig->caps->targetable_vfo & RIG_TARGETABLE_MODE))
+    {
+        retval = icom_set_mode(rig, vfo, icom_mode, width);
+    }
+    else
+    {
+        retval = RIG_OK;
+    }
 
     hl_usleep(50 * 1000); // pause for possible transceive message which we'll flush
 

commit 9efa3c7259851326688213e0c1d4f1f4f3039e8f
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 10:31:00 2021 -0500

    Fix testcache.c

diff --git a/tests/testcache.c b/tests/testcache.c
index 9451aac2..f0485c24 100644
--- a/tests/testcache.c
+++ b/tests/testcache.c
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
     rig_get_split_vfo(my_rig, RIG_VFO_A, &split, &tx_vfo);
     printf("split=%d, tx_vfo=%s\n", split, rig_strvfo(tx_vfo));
 
-    if (split != RIG_SPLIT_ON || tx_vfo != RIG_VFO_B) { printf("split#2 failed\n"); exit(1); }
+    if (split != RIG_SPLIT_ON || (tx_vfo != RIG_VFO_B && tx_vfo != RIG_VFO_SUB)) { printf("split#2 failed\n"); exit(1); }
 
     printf("All OK\n");
     rig_close(my_rig);

commit 996dbbfa1a7cd325d0c5c7efc7f9f5c33733aca5
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 10:21:16 2021 -0500

    Remove override of PKTUSB mode for Icom rigs -- don't think we need this
    Was causing mode toggling on IC7300 during PTT transitions in JTDX

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 7880b04f..c4466300 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1809,6 +1809,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
 
     switch (mode)
     {
+#if 0 // don't think this is needed anymore -- W9MDB 20210828
     case RIG_MODE_PKTUSB:
         // xFE xFE x6E xE0 x1A x06 x01 xFD switches mod input from MIC to ACC
         // This apparently works for IC-756ProIII but nobody has asked for it yet
@@ -1826,6 +1827,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     case RIG_MODE_PKTAM:
         icom_mode = RIG_MODE_AM;
         break;
+#endif
 
     default:
         icom_mode = mode;
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index b765dcaf..d13f9d65 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210824"
+#define BACKEND_VER "20210828"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

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

Summary of changes:
 rigs/icom/icom.c  | 12 +++++++++++-
 rigs/icom/icom.h  |  2 +-
 tests/testcache.c |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)


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

4 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 11 12 13 14 15 .. 229 > >> (Page 13 of 229)