From 17a3cf614e1514ed9404c046568e4536691f1865 Mon Sep 17 00:00:00 2001
From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com>
Date: Sun, 17 Mar 2024 16:54:59 +0100
Subject: [PATCH] Hamlib 4.6 beta

---
 hamlib/amplifier.h     |  23 +-
 hamlib/amplist.h       |   5 +
 hamlib/config.h        |  15 +-
 hamlib/libhamlib.dll.a | Bin 327974 -> 345576 bytes
 hamlib/multicast.h     |  45 ++++
 hamlib/rig.h           | 596 +++++++++++++++++++++++++++++++++++------
 hamlib/riglist.h       |  70 ++---
 hamlib/rotator.h       |  45 ++--
 hamlib/rotlist.h       |  54 +++-
 9 files changed, 703 insertions(+), 150 deletions(-)
 create mode 100644 hamlib/multicast.h

diff --git a/hamlib/amplifier.h b/hamlib/amplifier.h
index 8a0b076..3647aee 100644
--- a/hamlib/amplifier.h
+++ b/hamlib/amplifier.h
@@ -18,6 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #ifndef _AMPLIFIER_H
 #define _AMPLIFIER_H 1
@@ -232,9 +233,9 @@ struct amp_caps
   int (*set_freq)(AMP *amp, freq_t val);  /*!< Pointer to backend implementation of ::amp_set_freq(). */
   int (*get_freq)(AMP *amp, freq_t *val); /*!< Pointer to backend implementation of ::amp_get_freq(). */
 
-  int (*set_conf)(AMP *amp, token_t token, const char *val); /*!< Pointer to backend implementation of ::amp_set_conf(). */
-  int (*get_conf2)(AMP *amp, token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
-  int (*get_conf)(AMP *amp, token_t token, char *val);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
+  int (*set_conf)(AMP *amp, hamlib_token_t token, const char *val); /*!< Pointer to backend implementation of ::amp_set_conf(). */
+  int (*get_conf2)(AMP *amp, hamlib_token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
+  int (*get_conf)(AMP *amp, hamlib_token_t token, char *val);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
 
   /*
    *  General API commands, from most primitive to least.. :()
@@ -244,8 +245,8 @@ struct amp_caps
   int (*reset)(AMP *amp, amp_reset_t reset);                   /*!< Pointer to backend implementation of ::amp_reset(). */
   int (*get_level)(AMP *amp, setting_t level, value_t *val);   /*!< Pointer to backend implementation of ::amp_get_level(). */
   int (*set_level)(AMP *amp, setting_t level, value_t val);    /*!< Pointer to backend implementation of ::amp_get_level(). */
-  int (*get_ext_level)(AMP *amp, token_t level, value_t *val); /*!< Pointer to backend implementation of ::amp_get_ext_level(). */
-  int (*set_ext_level)(AMP *amp, token_t level, value_t val);  /*!< Pointer to backend implementation of ::amp_set_ext_level(). */
+  int (*get_ext_level)(AMP *amp, hamlib_token_t level, value_t *val); /*!< Pointer to backend implementation of ::amp_get_ext_level(). */
+  int (*set_ext_level)(AMP *amp, hamlib_token_t level, value_t val);  /*!< Pointer to backend implementation of ::amp_set_ext_level(). */
   int (*set_powerstat)(AMP *amp, powerstat_t status);          /*!< Pointer to backend implementation of ::amp_set_powerstat(). */
   int (*get_powerstat)(AMP *amp, powerstat_t *status);         /*!< Pointer to backend implementation of ::amp_get_powerstat(). */
 
@@ -335,11 +336,11 @@ amp_cleanup HAMLIB_PARAMS((AMP *amp));
 
 extern HAMLIB_EXPORT(int)
 amp_set_conf HAMLIB_PARAMS((AMP *amp,
-                            token_t token,
+                            hamlib_token_t token,
                             const char *val));
 extern HAMLIB_EXPORT(int)
 amp_get_conf HAMLIB_PARAMS((AMP *amp,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val));
 extern HAMLIB_EXPORT(int)
 amp_set_powerstat HAMLIB_PARAMS((AMP *amp,
@@ -407,7 +408,7 @@ extern HAMLIB_EXPORT(const struct confparams *)
 amp_confparam_lookup HAMLIB_PARAMS((AMP *amp,
                                     const char *name));
 
-extern HAMLIB_EXPORT(token_t)
+extern HAMLIB_EXPORT(hamlib_token_t)
 amp_token_lookup HAMLIB_PARAMS((AMP *amp,
                                 const char *name));
 
@@ -428,12 +429,12 @@ amp_ext_lookup HAMLIB_PARAMS((AMP *amp,
 
 extern HAMLIB_EXPORT(int)
 amp_get_ext_level HAMLIB_PARAMS((AMP *amp,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t *val));
 
 extern HAMLIB_EXPORT(int)
 amp_set_ext_level HAMLIB_PARAMS((AMP *amp,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t val));
 
 extern HAMLIB_EXPORT(const char *) amp_strlevel(setting_t);
@@ -445,6 +446,8 @@ rig_ext_lookup HAMLIB_PARAMS((RIG *rig,
 extern HAMLIB_EXPORT(setting_t) amp_parse_level(const char *s);
 extern HAMLIB_EXPORT(const char *) amp_strlevel(setting_t);
 
+extern HAMLIB_EXPORT(void *) amp_data_pointer(AMP *amp, rig_ptrx_t idx);
+
 //! @endcond
 
 
diff --git a/hamlib/amplist.h b/hamlib/amplist.h
index db6d4b5..fd4581a 100644
--- a/hamlib/amplist.h
+++ b/hamlib/amplist.h
@@ -106,10 +106,15 @@
 //! @endcond
 #define AMP_MODEL_ELECRAFT_KPA1500 AMP_MAKE_MODEL(AMP_ELECRAFT, 1)
 //#define AMP_MODEL_ELECRAFT_KPA500 AMP_MAKE_MODEL(AMP_ELECRAFT, 2)
+
 #define AMP_GEMINI 3
 #define AMP_BACKEND_GEMINI "gemini"
 #define AMP_MODEL_GEMINI_DX1200 AMP_MAKE_MODEL(AMP_GEMINI, 1)
 
+#define AMP_EXPERT 4
+#define AMP_BACKEND_EXPERT "expert"
+#define AMP_MODEL_EXPERT_FA AMP_MAKE_MODEL(AMP_EXPERT, 1)
+
 
 /**
  * \brief Convenience type definition for an amplifier model.
diff --git a/hamlib/config.h b/hamlib/config.h
index 2e2237e..fb25a20 100644
--- a/hamlib/config.h
+++ b/hamlib/config.h
@@ -10,6 +10,15 @@
 /* Frontend ABI version */
 #define ABI_VERSION 4
 
+/* Frontend Major version */
+#define ABI_VERSION_MAJOR 4
+
+/* Frontend Minor version */
+#define ABI_VERSION_MINOR 6
+
+/* Frontend Patch version */
+#define ABI_VERSION_PATCH 0
+
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -367,7 +376,7 @@
 #define PACKAGE_NAME "Hamlib"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Hamlib 4.5.5"
+#define PACKAGE_STRING "Hamlib 4.6~git"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "hamlib"
@@ -376,7 +385,7 @@
 #define PACKAGE_URL "http://www.hamlib.org"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.5.5"
+#define PACKAGE_VERSION "4.6~git"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -416,7 +425,7 @@
 
 
 /* Version number of package */
-#define VERSION "4.5.5"
+#define VERSION "4.6~git"
 
 /* Define to 1 if on MINIX. */
 /* #undef _MINIX */
diff --git a/hamlib/libhamlib.dll.a b/hamlib/libhamlib.dll.a
index 7ad64d06ef48e4de7633ae2211131201d6c13ef0..2814f40c1e60afd03b4310d79b0bafae9b177387 100644
GIT binary patch
delta 18552
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
C?Puu#

delta 15583
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
VC&J3Oon_g|20m7fu4+WN{|}Q-g)smC

diff --git a/hamlib/multicast.h b/hamlib/multicast.h
new file mode 100644
index 0000000..619d598
--- /dev/null
+++ b/hamlib/multicast.h
@@ -0,0 +1,45 @@
+//include <stdio.h>
+//#include <stdlib.h>
+//#include <string.h>
+//#include <errno.h>
+//#include <unistd.h>
+#include <hamlib/rig.h>
+//#include <sys/socket.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifndef MULTICAST_H
+#define MULTICAST_H
+
+struct multicast_vfo
+{
+    char *name;
+    double freq;
+    char *mode;
+    int width;
+    int widthLower;
+    int widthUpper;
+    unsigned char rx; // true if in rx mode
+    unsigned char tx; // true in in tx mode
+};
+
+struct multicast_broadcast
+{
+    char *ID;
+    struct multicast_vfo **vfo;
+};
+
+// returns # of bytes sent
+extern HAMLIB_EXPORT (int) multicast_init(RIG *rig, char *addr, int port);
+extern HAMLIB_EXPORT (int) multicast_send(RIG *rig, const char *msg, int msglen);
+extern HAMLIB_EXPORT (int) multicast_stop(RIG *rig);
+#endif //MULTICAST_H
diff --git a/hamlib/rig.h b/hamlib/rig.h
index 5d59e2e..a99a157 100644
--- a/hamlib/rig.h
+++ b/hamlib/rig.h
@@ -19,25 +19,46 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
-
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #ifndef _RIG_H
 #define _RIG_H 1
 
+// as of 2023-11-23 rig_caps is no longer constant
+// this #define allows clients to test which declaration to use for backwards compatibility
+#define RIGCAPS_NOT_CONST 1
+
 #define BUILTINFUNC 0
 
 // Our shared secret password 
 #define HAMLIB_SECRET_LENGTH 32
 
-#define HAMLIB_TRACE rig_debug(RIG_DEBUG_TRACE,"%s(%d) trace\n", __FILE__, __LINE__)
+#define HAMLIB_TRACE rig_debug(RIG_DEBUG_TRACE,"%s%s(%d) trace\n",spaces(rig->state.depth-1), __FILE__, __LINE__)
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 
 #include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 #include <inttypes.h>
 #include <time.h>
 
+// to stop warnings about including winsock2.h before windows.h
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+// mingw64 still shows __TIMESIZE != 64
+// need to do more testing
+#if 0
+#if __TIMESIZE != 64
+#warning TIMESIZE != 64 -- Please report your OS system to hamlib-developer@lists.sourceforge.net
+#endif
+#endif
+
 // For MSVC install the NUGet pthread package
 #if defined(_MSC_VER)
 #define HAVE_STRUCT_TIMESPEC
@@ -46,6 +67,7 @@
 
 /* Rig list is in a separate file so as not to mess up w/ this one */
 #include <hamlib/riglist.h>
+//#include <hamlib/config.h>
 
 /**
  * \addtogroup rig
@@ -118,6 +140,23 @@
 
 __BEGIN_DECLS
 
+// FIFO currently used for send_morse queue
+#define HAMLIB_FIFO_SIZE 1024
+
+typedef struct
+{
+    char data[HAMLIB_FIFO_SIZE];
+    int head;
+    int tail;
+    int flush;  // flush flag for stop_morse
+#ifdef _PTHREAD_H
+    pthread_mutex_t mutex;
+#else
+    int mutex;
+#endif
+} FIFO_RIG;
+
+
 /**
  * \brief size of cookie request buffer
  * Minimum size of cookie buffer to pass to rig_cookie
@@ -125,6 +164,7 @@ __BEGIN_DECLS
 // cookie is 26-char time code plus 10-char (2^31-1) random number
 #define HAMLIB_COOKIE_SIZE 37
 extern int cookie_use;  // this is global as once one client requests it everybody needs to honor it
+extern int skip_init;  // allow rigctl to skip any radio commands at startup
 
 //! @cond Doxygen_Suppress
 extern HAMLIB_EXPORT_VAR(const char) hamlib_version[];
@@ -164,7 +204,7 @@ enum rig_errcode_e {
     RIG_EDOM,       /*!< 17 Argument out of domain of func */
     RIG_EDEPRECATED,/*!< 18 Function deprecated */
     RIG_ESECURITY,  /*!< 19 Security error */
-    RIG_EPOWER,     /*!, 20 Rig not powered on */
+    RIG_EPOWER,     /*!< 20 Rig not powered on */
     RIG_EEND        // MUST BE LAST ITEM IN LAST
 };
 /**
@@ -260,6 +300,8 @@ typedef unsigned int tone_t;
 
 /**
  * \brief Port type
+ * 
+ * Note: All rigs may use a network:port address ( e.g. tcp/serial adapter)
  */
 typedef enum rig_port_e {
     RIG_PORT_NONE = 0,      /*!< No port */
@@ -341,8 +383,8 @@ enum agc_level_e {
     RIG_AGC_MEDIUM,
     RIG_AGC_AUTO,
     RIG_AGC_LONG,
-    RIG_AGC_ON,             /*< Turns AGC ON -- Kenwood -- restores last level set */
-    RIG_AGC_NONE            /*< Rig does not have CAT AGC control */
+    RIG_AGC_ON,             /*!< Turns AGC ON -- Kenwood -- restores last level set */
+    RIG_AGC_NONE            /*!< Rig does not have CAT AGC control */
 };
 
 
@@ -397,8 +439,8 @@ typedef enum {
  * \brief Split mode
  */
 typedef enum {
-    RIG_SPLIT_OFF = 0,  /*!< Split mode disabled */
-    RIG_SPLIT_ON        /*!< Split mode enabled */
+    RIG_SPLIT_OFF = 0,        /*!< Split mode disabled */
+    RIG_SPLIT_ON,             /*!< Split mode enabled */
 } split_t;
 
 
@@ -537,7 +579,7 @@ typedef unsigned int vfo_t;
 /** \brief \c Macro to tell you if VFO can transmit */
 #define RIG_VFO_TX_VFO(v)   ((v)|RIG_VFO_TX_FLAG)
 
-/** \brief \c TX -- alias for split tx or uplink, of VFO_CURR  */
+/** \brief \c TX -- alias for split tx or uplink, of VFO_CURR */
 #define RIG_VFO_TX          RIG_VFO_TX_VFO(RIG_VFO_CURR)
 
 /** \brief \c RX -- alias for split rx or downlink */
@@ -565,7 +607,7 @@ typedef unsigned int vfo_t;
 #define RIG_TARGETABLE_ANT (1<<10)
 #define RIG_TARGETABLE_ROOFING (1<<11) // roofing filter targetable by VFO
 #define RIG_TARGETABLE_SPECTRUM (1<<12) // spectrum scope targetable by VFO
-#define RIG_TARGETABLE_BAND (1<<13) // Band select -- e.g. Yaeus BS command
+#define RIG_TARGETABLE_BAND (1<<13) // Band select -- e.g. Yaesu BS command
 #define RIG_TARGETABLE_COMMON (RIG_TARGETABLE_RITXIT | RIG_TARGETABLE_PTT | RIG_TARGETABLE_MEM | RIG_TARGETABLE_BANK)
 #define RIG_TARGETABLE_ALL  0x7fffffff
 //! @endcond
@@ -739,6 +781,46 @@ typedef enum { // numbers here reflect the Yaesu values
     RIG_BAND_430MHZ = 16,   /*!< \c 430MHz */
 } hamlib_band_t;
 
+typedef enum { // numbers here reflect generic values -- need to map to rig values
+    RIG_BANDSELECT_UNUSED = CONSTANT_64BIT_FLAG(0),      /*!< \c Unused */
+    RIG_BANDSELECT_2200M  = CONSTANT_64BIT_FLAG(1),      /*!< \c 160M */
+    RIG_BANDSELECT_600M   = CONSTANT_64BIT_FLAG(2),      /*!< \c 160M */
+    RIG_BANDSELECT_160M   = CONSTANT_64BIT_FLAG(3),      /*!< \c 160M */
+    RIG_BANDSELECT_80M    = CONSTANT_64BIT_FLAG(4),      /*!< \c 80M */
+    RIG_BANDSELECT_60M    = CONSTANT_64BIT_FLAG(5),      /*!< \c 60M */
+    RIG_BANDSELECT_40M    = CONSTANT_64BIT_FLAG(6),      /*!< \c 40M */
+    RIG_BANDSELECT_30M    = CONSTANT_64BIT_FLAG(7),      /*!< \c 30M */
+    RIG_BANDSELECT_20M    = CONSTANT_64BIT_FLAG(8),      /*!< \c 20M */
+    RIG_BANDSELECT_17M    = CONSTANT_64BIT_FLAG(9),      /*!< \c 17M */
+    RIG_BANDSELECT_15M    = CONSTANT_64BIT_FLAG(10),      /*!< \c 15M */
+    RIG_BANDSELECT_12M    = CONSTANT_64BIT_FLAG(11),     /*!< \c 12M */
+    RIG_BANDSELECT_10M    = CONSTANT_64BIT_FLAG(12),     /*!< \c 10M */
+    RIG_BANDSELECT_6M     = CONSTANT_64BIT_FLAG(13),     /*!< \c 6M */
+    RIG_BANDSELECT_WFM    = CONSTANT_64BIT_FLAG(14),     /*!< \c IC705 74.8-108 */
+    RIG_BANDSELECT_GEN    = CONSTANT_64BIT_FLAG(15),     /*!< \c 60M */
+    RIG_BANDSELECT_MW     = CONSTANT_64BIT_FLAG(16),     /*!< \c Medium Wave */
+    RIG_BANDSELECT_AIR    = CONSTANT_64BIT_FLAG(17),     /*!< \c Air band */
+    RIG_BANDSELECT_4M     = CONSTANT_64BIT_FLAG(18),     /*!< \c 70MHz */
+    RIG_BANDSELECT_2M     = CONSTANT_64BIT_FLAG(19),     /*!< \c 144MHz */
+    RIG_BANDSELECT_1_25M  = CONSTANT_64BIT_FLAG(20),     /*!< \c 222MHz */
+    RIG_BANDSELECT_70CM   = CONSTANT_64BIT_FLAG(21),     /*!< \c 420MHz */
+    RIG_BANDSELECT_33CM   = CONSTANT_64BIT_FLAG(22),     /*!< \c 902MHz */
+    RIG_BANDSELECT_23CM   = CONSTANT_64BIT_FLAG(23),     /*!< \c 1240MHz */
+    RIG_BANDSELECT_13CM   = CONSTANT_64BIT_FLAG(24),     /*!< \c 2300MHz */
+    RIG_BANDSELECT_9CM    = CONSTANT_64BIT_FLAG(25),     /*!< \c 3300MHz */
+    RIG_BANDSELECT_5CM    = CONSTANT_64BIT_FLAG(26),     /*!< \c 5650MHz */
+    RIG_BANDSELECT_3CM    = CONSTANT_64BIT_FLAG(27),     /*!< \c 10000MHz */
+} hamlib_bandselect_t;
+
+
+#define RIG_BANDSELECT_ALL
+#define RIG_BANDSELECT_LF (RIG_BANDSELECT_2200M | RIG_BANDSELECT_600M)
+#define RIG_BANDSELECT_HF (RIG_BANDSELECT_160M | RIG_BANDSELECT_80M | RIG_BANDSELECT_60M | RIG_BANDSELECT_40M\
+| RIG_BANDSELECT_30M | RIG_BANDSELECT_20M | RIG_BANDSELECT_17M | RIG_BANDSELECT_15M | RIG_BANDSELECT_12M\
+RIG_BANDSELECT_10M | RIG_BANDSELECT_6M)
+#define RIG_BANDSELECT_VHF (RIG_BANDSELECT_AIR | RIG_BANDSELECT_2M| RIG_BANDSELECT_1_25M(
+#define RIG_BANDSELECT_UHF (RIG_BANDSELECT_70CM)
+
 
 /**
  * \brief Rig Scan operation
@@ -764,7 +846,8 @@ typedef enum {
 /**
  * \brief configuration token
  */
-typedef long token_t;
+typedef long hamlib_token_t;
+#define token_t hamlib_token_t
 
 
 //! @cond Doxygen_Suppress
@@ -779,7 +862,7 @@ typedef long token_t;
  *
  *   Current internal implementation
  *   NUMERIC: val.f or val.i
- *   COMBO: val.i, starting from 0.  Points to a table of strings or asci stored values.
+ *   COMBO: val.i, starting from 0.  Points to a table of strings or ASCII stored values.
  *   STRING: val.s or val.cs
  *   CHECKBUTTON: val.i 0/1
  *   BINARY: val.b
@@ -792,7 +875,8 @@ enum rig_conf_e {
     RIG_CONF_NUMERIC,       /*!<    Numeric type integer or real */
     RIG_CONF_CHECKBUTTON,   /*!<    on/off type */
     RIG_CONF_BUTTON,        /*!<    Button type */
-    RIG_CONF_BINARY         /*!<    Binary buffer type */
+    RIG_CONF_BINARY,        /*!<    Binary buffer type */
+    RIG_CONF_INT            /*!<    Integer */
 };
 
 //! @cond Doxygen_Suppress
@@ -804,7 +888,7 @@ enum rig_conf_e {
  * \brief Configuration parameter structure.
  */
 struct confparams {
-    token_t token;          /*!< Conf param token ID */
+    hamlib_token_t token;          /*!< Conf param token ID */
     const char *name;       /*!< Param name, no spaces allowed */
     const char *label;      /*!< Human readable label */
     const char *tooltip;    /*!< Hint on the parameter */
@@ -902,7 +986,7 @@ typedef unsigned int ant_t;
 
 
 //! @cond Doxygen_Suppress
-#define RIG_AGC_LAST -1
+#define RIG_AGC_LAST 99999
 //! @endcond
 
 #if 1 // deprecated
@@ -930,6 +1014,7 @@ enum meter_level_e {
  */
 typedef union {
     signed int i;       /*!< Signed integer */
+    unsigned int u;     /*!< Unsigned integer */
     float f;            /*!< Single precision float */
     char *s;            /*!< Pointer to char string */
     const char *cs;     /*!< Pointer to constant char string */
@@ -1006,8 +1091,8 @@ typedef uint64_t rig_level_e;
 #define RIG_LEVEL_TEMP_METER           CONSTANT_64BIT_FLAG(48)      /*!< \c TEMP_METER -- arg float (C, centigrade) */
 #define RIG_LEVEL_BAND_SELECT          CONSTANT_64BIT_FLAG(49)      /*!< \c BAND_SELECT -- arg enum BAND_ENUM */
 #define RIG_LEVEL_USB_AF               CONSTANT_64BIT_FLAG(50)      /*!< \c ACC/USB AF output level */
-#define RIG_LEVEL_AGC_TIME             CONSTANT_64BIT_FLAG(51)      /*!< \c AGC_TIME -- in seconds, rig dependent */
-#define RIG_LEVEL_52           CONSTANT_64BIT_FLAG(52)      /*!< \c Future use */
+#define RIG_LEVEL_USB_AF_INPUT         CONSTANT_64BIT_FLAG(51)      /*!< \c ACC/USB AF input level */
+#define RIG_LEVEL_AGC_TIME             CONSTANT_64BIT_FLAG(52)      /*!< \c AGC_TIME -- in seconds, rig dependent */
 #define RIG_LEVEL_53           CONSTANT_64BIT_FLAG(53)      /*!< \c Future use */
 #define RIG_LEVEL_54           CONSTANT_64BIT_FLAG(54)      /*!< \c Future use */
 #define RIG_LEVEL_55           CONSTANT_64BIT_FLAG(55)      /*!< \c Future use */
@@ -1021,9 +1106,9 @@ typedef uint64_t rig_level_e;
 #define RIG_LEVEL_63           CONSTANT_64BIT_FLAG(63)      /*!< \c Future use */
 
 //! @cond Doxygen_Suppress
-#define RIG_LEVEL_FLOAT_LIST (RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_APF|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_COMP|RIG_LEVEL_BALANCE|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_SPECTRUM_REF|RIG_LEVEL_TEMP_METER|RIG_LEVEL_USB_AF|RIG_LEVEL_AGC_TIME)
+#define RIG_LEVEL_FLOAT_LIST (RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_APF|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_COMP|RIG_LEVEL_BALANCE|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_SPECTRUM_REF|RIG_LEVEL_TEMP_METER|RIG_LEVEL_USB_AF|RIG_LEVEL_USB_AF_INPUT|RIG_LEVEL_AGC_TIME)
 
-#define RIG_LEVEL_READONLY_LIST (RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_STRENGTH|RIG_LEVEL_RAWSTR|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS)
+#define RIG_LEVEL_READONLY_LIST (RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_STRENGTH|RIG_LEVEL_RAWSTR|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_TEMP_METER|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS)
 
 #define RIG_LEVEL_IS_FLOAT(l) ((l)&RIG_LEVEL_FLOAT_LIST)
 #define RIG_LEVEL_SET(l) ((l)&~RIG_LEVEL_READONLY_LIST)
@@ -1048,7 +1133,15 @@ enum rig_parm_e {
     RIG_PARM_BAT =          (1 << 6),   /*!< \c BAT -- battery level, float [0.0 ... 1.0] */
     RIG_PARM_KEYLIGHT =     (1 << 7),   /*!< \c KEYLIGHT -- Button backlight, on/off */
     RIG_PARM_SCREENSAVER =  (1 << 8),   /*!< \c SCREENSAVER -- rig specific timeouts */
-    RIG_PARM_AFIF =         (1 << 9)    /*!< \c AFIF -- 0=AF audio, 1=IF audio -- see IC-7300/9700/705 */
+    RIG_PARM_AFIF =         (1 << 9),   /*!< \c AFIF -- 0=AF audio, 1=IF audio -- see IC-7300/9700/705 */
+    RIG_PARM_BANDSELECT =   (1 << 10),  /*!< \c BANDSELECT -- e.g. BAND160M, BAND80M, BAND70CM, BAND2CM */
+    RIG_PARM_KEYERTYPE =    (1 << 11)   /*!< \c KEYERTYPE -- 0,1,2 or STRAIGHT PADDLE BUG */
+};
+
+enum rig_keyertype_e {
+    RIG_KEYERTYPE_STRAIGHT = 0,
+    RIG_KEYERTYPE_BUG      = (1 << 0),
+    RIG_KEYERTYPE_PADDLE   = (2 << 0)
 };
 
 /**
@@ -1076,10 +1169,12 @@ enum multicast_item_e {
 };
 
 //! @cond Doxygen_Suppress
-#define RIG_PARM_FLOAT_LIST (RIG_PARM_BACKLIGHT|RIG_PARM_BAT|RIG_PARM_KEYLIGHT)
+#define RIG_PARM_FLOAT_LIST (RIG_PARM_BACKLIGHT|RIG_PARM_BAT|RIG_PARM_KEYLIGHT|RIG_PARM_BACKLIGHT)
+#define RIG_PARM_STRING_LIST (RIG_PARM_BANDSELECT|RIG_PARM_KEYERTYPE)
 #define RIG_PARM_READONLY_LIST (RIG_PARM_BAT)
 
 #define RIG_PARM_IS_FLOAT(l) ((l)&RIG_PARM_FLOAT_LIST)
+#define RIG_PARM_IS_STRING(l) ((l)&RIG_PARM_STRING_LIST)
 #define RIG_PARM_SET(l) ((l)&~RIG_PARM_READONLY_LIST)
 //! @endcond
 
@@ -1179,14 +1274,14 @@ typedef uint64_t setting_t;
 #define RIG_FUNC_DIVERSITY  CONSTANT_64BIT_FLAG (38)   /*!< \c DIVERSITY -- Diversity receive */
 #define RIG_FUNC_DSQL       CONSTANT_64BIT_FLAG (39)   /*!< \c DSQL -- Digital modes squelch */
 #define RIG_FUNC_SCEN       CONSTANT_64BIT_FLAG (40)   /*!< \c SCEN -- scrambler/encryption */
-#define RIG_FUNC_SLICE      CONSTANT_64BIT_FLAG (41)   /*!< \c Rig slice selection -- Flex */
+#define RIG_FUNC_SLICE      CONSTANT_64BIT_FLAG (41)   /*!< \c SLICE -- Rig slice selection -- Flex */
 #define RIG_FUNC_TRANSCEIVE CONSTANT_64BIT_FLAG (42)   /*!< \c TRANSCEIVE -- Send radio state changes automatically ON/OFF */
 #define RIG_FUNC_SPECTRUM   CONSTANT_64BIT_FLAG (43)   /*!< \c SPECTRUM -- Spectrum scope data output ON/OFF */
 #define RIG_FUNC_SPECTRUM_HOLD CONSTANT_64BIT_FLAG (44)   /*!< \c SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF */
 #define RIG_FUNC_SEND_MORSE CONSTANT_64BIT_FLAG (45)   /*!< \c SEND_MORSE -- Send specified characters using CW */
 #define RIG_FUNC_SEND_VOICE_MEM CONSTANT_64BIT_FLAG (46)   /*!< \c SEND_VOICE_MEM -- Transmit in SSB message stored in memory */
 #define RIG_FUNC_OVF_STATUS CONSTANT_64BIT_FLAG (47)   /*!< \c OVF -- Read overflow status 0=Off, 1=On */
-#define RIG_FUNC_BIT48      CONSTANT_64BIT_FLAG (48)   /*!< \c available for future RIG_FUNC items */
+#define RIG_FUNC_SYNC       CONSTANT_64BIT_FLAG (48)   /*!< \c Synchronize VFOS -- FTDX101D/MP for now SY command  */
 #define RIG_FUNC_BIT49      CONSTANT_64BIT_FLAG (49)   /*!< \c available for future RIG_FUNC items */
 #define RIG_FUNC_BIT50      CONSTANT_64BIT_FLAG (50)   /*!< \c available for future RIG_FUNC items */
 #define RIG_FUNC_BIT51      CONSTANT_64BIT_FLAG (51)   /*!< \c available for future RIG_FUNC items */
@@ -1291,12 +1386,12 @@ typedef uint64_t rmode_t;
 #define    RIG_MODE_IQ        CONSTANT_64BIT_FLAG (37)  /*!< \c IQ mode for a couple of kit rigs */
 #define    RIG_MODE_ISBUSB    CONSTANT_64BIT_FLAG (38)  /*!< \c ISB mode monitoring USB */
 #define    RIG_MODE_ISBLSB    CONSTANT_64BIT_FLAG (39)  /*!< \c ISB mode monitoring LSB */
-#define    RIG_MODE_BIT40     CONSTANT_64BIT_FLAG (40)  /*!< \c reserved for future expansion */
-#define    RIG_MODE_BIT41     CONSTANT_64BIT_FLAG (41)  /*!< \c reserved for future expansion */
-#define    RIG_MODE_BIT42     CONSTANT_64BIT_FLAG (42)  /*!< \c reserved for future expansion */
-#define    RIG_MODE_BIT43     CONSTANT_64BIT_FLAG (43)  /*!< \c reserved for future expansion */
-#define    RIG_MODE_BIT44     CONSTANT_64BIT_FLAG (44)  /*!< \c reserved for future expansion */
-#define    RIG_MODE_BIT45     CONSTANT_64BIT_FLAG (45)  /*!< \c reserved for future expansion */
+#define    RIG_MODE_USBD1     CONSTANT_64BIT_FLAG (40)  /*!< \c USB-D1 for some rigs */
+#define    RIG_MODE_USBD2     CONSTANT_64BIT_FLAG (41)  /*!< \c USB-D2 for some rigs */
+#define    RIG_MODE_USBD3     CONSTANT_64BIT_FLAG (42)  /*!< \c USB-D3 for some rigs */
+#define    RIG_MODE_LSBD1     CONSTANT_64BIT_FLAG (43)  /*!< \c LSB-D1 for some rigs */
+#define    RIG_MODE_LSBD2     CONSTANT_64BIT_FLAG (44)  /*!< \c LSB-D1 for some rigs */
+#define    RIG_MODE_LSBD3     CONSTANT_64BIT_FLAG (45)  /*!< \c LSB-D1 for some rigs */
 #define    RIG_MODE_BIT46     CONSTANT_64BIT_FLAG (46)  /*!< \c reserved for future expansion */
 #define    RIG_MODE_BIT47     CONSTANT_64BIT_FLAG (47)  /*!< \c reserved for future expansion */
 #define    RIG_MODE_BIT48     CONSTANT_64BIT_FLAG (48)  /*!< \c reserved for future expansion */
@@ -1323,6 +1418,11 @@ typedef uint64_t rmode_t;
  */
 #define RIG_MODE_SSB    (RIG_MODE_USB|RIG_MODE_LSB)
 
+/**
+ * \brief macro for backends, not to be used by rig_set_mode et al.
+ */
+#define RIG_MODE_PKTSSB (RIG_MODE_PKTUSB|RIG_MODE_PKTLSB)
+
 /**
  * \brief macro for backends, not to be used by rig_set_mode et al.
  */
@@ -1441,7 +1541,7 @@ struct filter_list {
  *
  */
 struct ext_list {
-    token_t token;      /*!< Token ID */
+    hamlib_token_t token;      /*!< Token ID */
     value_t val;        /*!< Value */
 };
 
@@ -1489,6 +1589,7 @@ struct channel {
     char channel_desc[HAMLIB_MAXCHANDESC];     /*!< Name */
     struct ext_list
             *ext_levels;                /*!< Extension level value list, NULL ended. ext_levels can be NULL */
+    char tag[32];               /*!< TAG ASCII for channel name, etc */      
 };
 
 /**
@@ -1530,6 +1631,7 @@ struct channel_cap {
     unsigned flags:         1;  /*!< Channel flags */
     unsigned channel_desc:  1;  /*!< Name */
     unsigned ext_levels:    1;  /*!< Extension level value list */
+    unsigned tag:           1;  /*!< Has tag field e.g. FT991 */
 };
 
 /**
@@ -1556,7 +1658,9 @@ typedef enum {
     RIG_MTYPE_MEMOPAD,      /*!< Memory pad */
     RIG_MTYPE_SAT,          /*!< Satellite */
     RIG_MTYPE_BAND,         /*!< VFO/Band channel */
-    RIG_MTYPE_PRIO          /*!< Priority channel */
+    RIG_MTYPE_PRIO,         /*!< Priority channel */
+	RIG_MTYPE_VOICE,		/*!< Stored Voice Message */
+	RIG_MTYPE_MORSE			/*!< Morse Message */
 } chan_type_t;
 
 
@@ -1574,11 +1678,10 @@ typedef enum {
 \endcode
  */
 struct chan_list {
-    int startc;          /*!< Starting memory channel \b number */
-    int endc;            /*!< Ending memory channel \b number */
-    chan_type_t type;   /*!< Memory type. see chan_type_t */
-    channel_cap_t
-    mem_caps;           /*!< Definition of attributes that can be stored/retrieved */
+    int startc;              /*!< Starting memory channel \b number */
+    int endc;                /*!< Ending memory channel \b number */
+    chan_type_t type;        /*!< Memory type. see chan_type_t */
+    channel_cap_t mem_caps;  /*!< Definition of attributes that can be stored/retrieved */
 };
 
 //! @cond Doxygen_Suppress
@@ -1602,7 +1705,7 @@ typedef struct chan_list chan_t;
  *
  * The granularity is undefined if min = 0, max = 0, and step = 0.
  *
- * For float settings, if min.f = 0 and max.f = 0 (and step.f! = 0), max.f is
+ * For float settings, if min.f = 0 and max.f = 0 (and step.f != 0), max.f is
  * assumed to be actually equal to 1.0.
  *
  * If step = 0 (and min and/or max are not null), then this means step can
@@ -1983,17 +2086,17 @@ struct rig_caps {
     int (*set_parm)(RIG *rig, setting_t parm, value_t val);
     int (*get_parm)(RIG *rig, setting_t parm, value_t *val);
 
-    int (*set_ext_level)(RIG *rig, vfo_t vfo, token_t token, value_t val);
-    int (*get_ext_level)(RIG *rig, vfo_t vfo, token_t token, value_t *val);
+    int (*set_ext_level)(RIG *rig, vfo_t vfo, hamlib_token_t token, value_t val);
+    int (*get_ext_level)(RIG *rig, vfo_t vfo, hamlib_token_t token, value_t *val);
 
-    int (*set_ext_func)(RIG *rig, vfo_t vfo, token_t token, int status);
-    int (*get_ext_func)(RIG *rig, vfo_t vfo, token_t token, int *status);
+    int (*set_ext_func)(RIG *rig, vfo_t vfo, hamlib_token_t token, int status);
+    int (*get_ext_func)(RIG *rig, vfo_t vfo, hamlib_token_t token, int *status);
 
-    int (*set_ext_parm)(RIG *rig, token_t token, value_t val);
-    int (*get_ext_parm)(RIG *rig, token_t token, value_t *val);
+    int (*set_ext_parm)(RIG *rig, hamlib_token_t token, value_t val);
+    int (*get_ext_parm)(RIG *rig, hamlib_token_t token, value_t *val);
 
-    int (*set_conf)(RIG *rig, token_t token, const char *val);
-    int (*get_conf)(RIG *rig, token_t token, char *val);
+    int (*set_conf)(RIG *rig, hamlib_token_t token, const char *val);
+    int (*get_conf)(RIG *rig, hamlib_token_t token, char *val);
 
     int (*send_dtmf)(RIG *rig, vfo_t vfo, const char *digits);
     int (*recv_dtmf)(RIG *rig, vfo_t vfo, char *digits, int *length);
@@ -2003,6 +2106,7 @@ struct rig_caps {
     int (*wait_morse)(RIG *rig, vfo_t vfo);
 
     int (*send_voice_mem)(RIG *rig, vfo_t vfo, int ch);
+    int (*stop_voice_mem)(RIG *rig, vfo_t vfo);
 
     int (*set_bank)(RIG *rig, vfo_t vfo, int bank);
 
@@ -2063,10 +2167,14 @@ struct rig_caps {
                                const unsigned char *frame);
 // this will be used to check rigcaps structure is compatible with client
     char *hamlib_check_rig_caps;   // a constant value we can check for hamlib integrity
-    int (*get_conf2)(RIG *rig, token_t token, char *val, int val_len);
+    int (*get_conf2)(RIG *rig, hamlib_token_t token, char *val, int val_len);
     int (*password)(RIG *rig, const char *key1); /*< Send encrypted password if rigctld is secured with -A/--password */
     int (*set_lock_mode)(RIG *rig, int mode);
     int (*get_lock_mode)(RIG *rig, int *mode);
+    short timeout_retry;    /*!< number of retries to make in case of read timeout errors, some serial interfaces may require this, 0 to use default value, -1 to disable */
+    short morse_qsize;  /* max length of morse */
+//    int (*bandwidth2rig)(RIG  *rig, enum bandwidth_t bandwidth);
+//    enum bandwidth_t (*rig2bandwidth)(RIG  *rig, int rigbandwidth);
 };
 //! @endcond
 
@@ -2074,7 +2182,6 @@ struct rig_caps {
  * \brief Enumeration of all rig_ functions
  *
  */
-//! @cond Doxygen_Suppress
 // all functions enumerated for rig_get_function_ptr
 enum rig_function_e {
     RIG_FUNCTION_INIT,
@@ -2165,27 +2272,27 @@ enum rig_function_e {
     RIG_FUNCTION_IS_ASYNC_FRAME,
     RIG_FUNCTION_PROCESS_ASYNC_FRAME,
     RIG_FUNCTION_GET_CONF2,
+    RIG_FUNCTION_STOP_VOICE_MEM,
 };
 
 /**
  * \brief Function to return pointer to rig_* function
  *
  */
-//! @cond Doxygen_Suppress
 extern HAMLIB_EXPORT (void *) rig_get_function_ptr(rig_model_t rig_model, enum rig_function_e rig_function);
 
 /**
  * \brief Enumeration of rig->caps values
  *
  */
-//! @cond Doxygen_Suppress
 // values enumerated for rig->caps values
 enum rig_caps_int_e {
     RIG_CAPS_TARGETABLE_VFO,
     RIG_CAPS_RIG_MODEL,
     RIG_CAPS_PORT_TYPE,
     RIG_CAPS_PTT_TYPE,
-    RIG_CAPS_HAS_GET_LEVEL
+    RIG_CAPS_HAS_GET_LEVEL,
+    RIG_CAPS_HAS_SET_LEVEL,
 };
 
 enum rig_caps_cptr_e {
@@ -2199,14 +2306,12 @@ enum rig_caps_cptr_e {
  * \brief Function to return int value from rig->caps
  * Does not support > 32-bit rig_caps values
  */
-//! @cond Doxygen_Suppress
-extern HAMLIB_EXPORT (long long) rig_get_caps_int(rig_model_t rig_model, enum rig_caps_int_e rig_caps);
+extern HAMLIB_EXPORT (uint64_t) rig_get_caps_int(rig_model_t rig_model, enum rig_caps_int_e rig_caps);
 
 /**
  * \brief Function to return char pointer value from rig->caps
  *
  */
-//! @cond Doxygen_Suppress
 extern HAMLIB_EXPORT (const char *) rig_get_caps_cptr(rig_model_t rig_model, enum rig_caps_cptr_e rig_caps);
 
 struct hamlib_async_pipe;
@@ -2280,8 +2385,8 @@ typedef struct hamlib_port {
             int value;      /*!< Toggle PTT ON or OFF */
         } gpio;             /*!< GPIO attributes */
     } parm;                 /*!< Port parameter union */
-    int client_port;      /*!< client socket port for tcp connection */
-    RIG *rig;             /*!< our parent RIG device */
+    int client_port;        /*!< client socket port for tcp connection */
+    RIG *rig;               /*!< our parent RIG device */
     int asyncio;            /*!< enable asynchronous data handling if true -- async collides with python keyword so _async is used */
 #if defined(_WIN32)
     hamlib_async_pipe_t *sync_data_pipe;         /*!< pipe data structure for synchronous data */
@@ -2292,6 +2397,8 @@ typedef struct hamlib_port {
     int fd_sync_error_write;    /*!< file descriptor for writing synchronous data error codes */
     int fd_sync_error_read;     /*!< file descriptor for reading synchronous data error codes */
 #endif
+    short timeout_retry;    /*!< number of retries to make in case of read timeout errors, some serial interfaces may require this, 0 to disable */
+// DO NOT ADD ANYTHING HERE UNTIL 5.0!!
 } hamlib_port_t;
 
  
@@ -2364,11 +2471,62 @@ typedef hamlib_port_t_deprecated port_t_deprecated;
 typedef hamlib_port_t port_t;
 #endif
 
+/* Macros to access data structures/pointers
+ * Make it easier to change location in preparation
+ *   for moving them out of rig->state.
+ * See https://github.com/Hamlib/Hamlib/issues/1445
+ *     https://github.com/Hamlib/Hamlib/issues/1452
+ *     https://github.com/Hamlib/Hamlib/issues/1420
+ *     https://github.com/Hamlib/Hamlib/issues/536
+ *     https://github.com/Hamlib/Hamlib/issues/487
+ */
+// Note: Experimental, and subject to change!!
+#if defined(IN_HAMLIB)
+/* These are for internal use only */
+#define RIGPORT(r) (&r->state.rigport)
+#define PTTPORT(r) (&r->state.pttport)
+#define DCDPORT(r) (&r->state.dcdport)
+#define CACHE(r) (&r->state.cache)
+#define AMPPORT(a) (&a->state.ampport)
+#define ROTPORT(r) (&r->state.rotport)
+#define ROTPORT2(r) (&r->state.rotport2)
+#define STATE(r) (&r->state)
+/* Then when the rigport address is stored as a pointer somewhere else(say,
+ *  in the rig structure itself), the definition could be changed to
+ *  #define RIGPORT(r) r->somewhereelse
+ *  and every reference is updated.
+ */
+#else
+/* Define external unique names */
+#define HAMLIB_RIGPORT(r) ((hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_RIGPORT))
+#define HAMLIB_PTTPORT(r) ((hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_PTTPORT))
+#define HAMLIB_DCDPORT(r) ((hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_DCDPORT))
+#define HAMLIB_CACHE(r) ((struct rig_cache *)rig_data_pointer(r, RIG_PTRX_CACHE))
+#define HAMLIB_AMPPORT(a) ((hamlib_port_t *)amp_data_pointer(a, RIG_PTRX_AMPPORT))
+#define HAMLIB_ROTPORT(r) ((hamlib_port_t *)rot_data_pointer(r, RIG_PTRX_ROTPORT))
+#define HAMLIB_ROTPORT2(r) ((hamlib_port_t *)rot_data_pointer(r, RIG_PTRX_ROTPORT2))
+#define HAMLIB_STATE(r) ((struct rig_state *)rig_data_pointer(r, RIG_PTRX_STATE))
+#endif
+
+typedef enum {
+    RIG_PTRX_NONE=0,
+    RIG_PTRX_RIGPORT,
+    RIG_PTRX_PTTPORT,
+    RIG_PTRX_DCDPORT,
+    RIG_PTRX_CACHE,
+    RIG_PTRX_AMPPORT,
+    RIG_PTRX_ROTPORT,
+    RIG_PTRX_ROTPORT2,
+    RIG_PTRX_STATE,
+// New entries go directly above this line====================
+    RIG_PTRX_MAXIMUM
+} rig_ptrx_t;
+
 #define HAMLIB_ELAPSED_GET 0
 #define HAMLIB_ELAPSED_SET 1
 #define HAMLIB_ELAPSED_INVALIDATE 2
 
-#define HAMLIB_CACHE_ALWAYS (-1) /*< value to set cache timeout to always use cache */
+#define HAMLIB_CACHE_ALWAYS (-1) /*!< value to set cache timeout to always use cache */
 
 typedef enum {
     HAMLIB_CACHE_ALL, // to set all cache timeouts at once
@@ -2389,6 +2547,7 @@ typedef enum {
  * \brief Rig cache data
  *
  * This struct contains all the items we cache at the highest level
+ * DO NOT MODIFY THIS STRUCTURE AT ALL -- we need a new cache that is a pointer rather than a structure
  */
 struct rig_cache {
     int timeout_ms;  // the cache timeout for invalidating itself
@@ -2464,6 +2623,38 @@ struct rig_cache {
     int satmode; // if rig is in satellite mode
 };
 
+/**
+ * \brief Multicast data items the are unique per rig instantiation
+ * This is meant for internal Hamlib use only
+ */
+#include <hamlib/multicast.h>
+struct multicast_s
+{
+    int multicast_running;
+    int sock;
+    int seqnumber;
+    int runflag; // = 0;
+    pthread_t threadid;
+    // this mutex is needed to control serial access
+    // as of 2023-05-13 we have main thread and multicast thread needing it
+    // eventually we should be able to use cached info only in the main thread to avoid contention
+    pthread_mutex_t mutex;
+    int mutex_initialized;
+//#ifdef HAVE_ARPA_INET_H
+    //struct ip_mreq mreq; // = {0};
+    struct sockaddr_in dest_addr; // = {0};
+    int port;
+//#endif
+};
+
+typedef unsigned int rig_comm_status_t;
+
+#define RIG_COMM_STATUS_OK            0x00
+#define RIG_COMM_STATUS_CONNECTING    0x01
+#define RIG_COMM_STATUS_DISCONNECTED  0x02
+#define RIG_COMM_STATUS_TERMINATED    0x03
+#define RIG_COMM_STATUS_WARNING       0x04
+#define RIG_COMM_STATUS_ERROR         0x05
 
 /**
  * \brief Rig state containing live data and customized fields.
@@ -2472,7 +2663,7 @@ struct rig_cache {
  * that may be updated (ie. customized)
  *
  * It is NOT fine to move fields around as it can break share library offset
- * As of 2021-03-03  vfo_list is the last known item being reference externally
+ * As of 2024-03-03  freq_event_elapsed is the last known item being reference externally
  * So any additions or changes to this structure must be at the end of the structure
  */
 struct rig_state {
@@ -2584,12 +2775,215 @@ struct rig_state {
     /********* DO NOT ADD or CHANGE anything (or than to rename) ABOVE THIS LINE *********/
     /********* ENSURE ANY NEW ITEMS ARE ADDED AFTER HERE *********/
     /* flags instructing the rig_get routines to use cached values when asyncio is in use */
-    int use_cached_freq; /*<! flag instructing rig_get_freq to use cached values when asyncio is in use */
-    int use_cached_mode; /*<! flag instructing rig_get_mode to use cached values when asyncio is in use */
-    int use_cached_ptt;  /*<! flag instructing rig_get_ptt to use cached values when asyncio is in use */
-    int depth; /*<! a depth counter to use for debug indentation and such */
-    int lock_mode; /*<! flag that prevents mode changes if ~= 0 -- see set/get_lock_mode */
-    powerstat_t powerstat; /*<! power status */
+    int use_cached_freq; /*!< flag instructing rig_get_freq to use cached values when asyncio is in use */
+    int use_cached_mode; /*!< flag instructing rig_get_mode to use cached values when asyncio is in use */
+    int use_cached_ptt;  /*!< flag instructing rig_get_ptt to use cached values when asyncio is in use */
+    int depth; /*!< a depth counter to use for debug indentation and such */
+    int lock_mode; /*!< flag that prevents mode changes if ~= 0 -- see set/get_lock_mode */
+    powerstat_t powerstat; /*!< power status */
+    char *tuner_control_pathname;  /*!< Path to external tuner control program that get 0/1 (Off/On) argument */
+    char client_version[32];  /*!<! Allow client to report version for compatibility checks/capability */
+    freq_t offset_vfoa; /*!< Offset to apply to VFOA/Main set_freq */
+    freq_t offset_vfob; /*!< Offset to apply to VFOB/Sub set_freq */
+    struct multicast_s *multicast; /*!< Pointer to multicast server data */
+    // Adding a number of items so netrigctl can see the real rig information
+    // Eventually may want to add these so that rigctld can see more of the backend
+    // But that will come later if requested -- for now they just fill out dumpstate.c
+    rig_model_t rig_model;      /*!< Rig model. */
+    const char *model_name;     /*!< Model name. */
+    const char *mfg_name;       /*!< Manufacturer. */
+    const char *version;        /*!< Driver version. */
+    const char *copyright;      /*!< Copyright info. */
+    enum rig_status_e status;   /*!< Driver status. */
+    int rig_type;               /*!< Rig type. */
+    ptt_type_t ptt_type;        /*!< Type of the PTT port. */
+    dcd_type_t dcd_type;        /*!< Type of the DCD port. */
+    rig_port_t port_type;       /*!< Type of communication port. */
+    int serial_rate_min;        /*!< Minimum serial speed. */
+    int serial_rate_max;        /*!< Maximum serial speed. */
+    int serial_data_bits;       /*!< Number of data bits. */
+    int serial_stop_bits;       /*!< Number of stop bits. */
+    enum serial_parity_e serial_parity;         /*!< Parity. */
+    enum serial_handshake_e serial_handshake;   /*!< Handshake. */
+    int write_delay;            /*!< Delay between each byte sent out, in mS */
+    int post_write_delay;       /*!< Delay between each commands send out, in mS */
+    int timeout;                /*!< Timeout, in mS */
+    int retry;                  /*!< Maximum number of retries if command fails, 0 to disable */
+    int targetable_vfo;         /*!< Bit field list of direct VFO access commands */
+    int async_data_supported;       /*!< Indicates that rig is capable of outputting asynchronous data updates, such as transceive state updates or spectrum data. 1 if true, 0 otherwise. */
+    int agc_level_count; /*!< Number of supported AGC levels. Zero indicates all modes should be available (for backwards-compatibility). */
+    enum agc_level_e agc_levels[HAMLIB_MAX_AGC_LEVELS]; /*!< Supported AGC levels */
+    tone_t *ctcss_list;   /*!< CTCSS tones list, zero ended */
+    tone_t *dcs_list;     /*!< DCS code list, zero ended */
+    vfo_op_t vfo_ops;           /*!< VFO op bit field list */
+    scan_t scan_ops;            /*!< Scan bit field list */
+    int transceive;             /*!< \deprecated Use async_data_supported instead */
+    int bank_qty;               /*!< Number of banks */
+    int chan_desc_sz;           /*!< Max length of memory channel name */
+    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 */
+    freq_range_t tx_range_list2[HAMLIB_FRQRANGESIZ];   /*!< Transmit frequency range list #2 */
+    freq_range_t rx_range_list3[HAMLIB_FRQRANGESIZ];   /*!< Receive frequency range list #3 */
+    freq_range_t tx_range_list3[HAMLIB_FRQRANGESIZ];   /*!< Transmit frequency range list #3 */
+    freq_range_t rx_range_list4[HAMLIB_FRQRANGESIZ];   /*!< Receive frequency range list #4 */
+    freq_range_t tx_range_list4[HAMLIB_FRQRANGESIZ];   /*!< Transmit frequency range list #4 */
+    freq_range_t rx_range_list5[HAMLIB_FRQRANGESIZ];   /*!< Receive frequency range list #5 */
+    freq_range_t tx_range_list5[HAMLIB_FRQRANGESIZ];   /*!< Transmit frequency range list #5 */
+    struct rig_spectrum_scope spectrum_scopes[HAMLIB_MAX_SPECTRUM_SCOPES]; /*!< Supported spectrum scopes. The array index must match the scope ID. Last entry must have NULL name. */
+    enum rig_spectrum_mode_e spectrum_modes[HAMLIB_MAX_SPECTRUM_MODES]; /*!< Supported spectrum scope modes. Last entry must be RIG_SPECTRUM_MODE_NONE. */
+    freq_t spectrum_spans[HAMLIB_MAX_SPECTRUM_SPANS];                   /*!< Supported spectrum scope frequency spans in Hz in center mode. Last entry must be 0. */
+    struct rig_spectrum_avg_mode spectrum_avg_modes[HAMLIB_MAX_SPECTRUM_AVG_MODES]; /*!< Supported spectrum scope averaging modes. Last entry must have NULL name. */
+    int spectrum_attenuator[HAMLIB_MAXDBLSTSIZ];    /*!< Spectrum attenuator list in dB, 0 terminated */
+    volatile int morse_data_handler_thread_run;
+    void *morse_data_handler_priv_data;
+    FIFO_RIG *fifo_morse;
+    int doppler;         /*!< True if doppler changing detected */
+    char *multicast_data_addr;  /*!< Multicast data UDP address for publishing rig data and state */
+    int multicast_data_port;  /*!< Multicast data UDP port for publishing rig data and state */
+    char *multicast_cmd_addr;  /*!< Multicast command server UDP address for sending commands to rig */
+    int multicast_cmd_port;  /*!< Multicast command server UDP port for sending commands to rig */
+    volatile int multicast_receiver_run;
+    void *multicast_receiver_priv_data;
+    rig_comm_status_t comm_status; /*!< Detailed rig control status */
+    char device_id[HAMLIB_RIGNAMSIZ];
+    int dual_watch; /*!< Boolean DUAL_WATCH status */
+    int post_ptt_delay;         /*!< delay after PTT to allow for relays and such */
+    struct timespec freq_event_elapsed;
+    int freq_skip; /*!< allow frequency skip for gpredict RX/TX freq set */
+// New rig_state items go before this line ============================================
+};
+
+/**
+ * \brief Deprecated Rig state containing live data and customized fields.
+ * Due to DLL problems this remains in-place in the rig_caps structure but is no longer referred to
+ * A new rig_state has been added at the end of the structure instead of the middle
+ *
+ * This struct contains no data and is just a place holder for DLL alignment
+ *
+ * It is NOT fine to touch this struct AT ALL!!!
+ */
+struct rig_state_deprecated {
+    /********* ENSURE YOU DO NOT EVER MODIFY THIS STRUCTURE *********/
+    /********* It will remain forever to provide DLL backwards compatiblity ******/
+    /*
+     * overridable fields
+     */
+    // moving the hamlib_port_t to the end of rig_state and making it a pointer
+    // this should allow changes to hamlib_port_t without breaking shared libraries
+    // these will maintain a copy of the new port_t for backwards compatibility
+    // to these offsets -- note these must stay until a major version update is done like 5.0
+    hamlib_port_t_deprecated rigport_deprecated;  /*!< Rig port (internal use). */
+    hamlib_port_t_deprecated pttport_deprecated;  /*!< PTT port (internal use). */
+    hamlib_port_t_deprecated dcdport_deprecated;  /*!< DCD port (internal use). */
+
+    double vfo_comp;        /*!< VFO compensation in PPM, 0.0 to disable */
+
+    int deprecated_itu_region;         /*!< ITU region to select among freq_range_t */
+    freq_range_t rx_range_list[HAMLIB_FRQRANGESIZ];    /*!< Receive frequency range list */
+    freq_range_t tx_range_list[HAMLIB_FRQRANGESIZ];    /*!< Transmit frequency range list */
+
+    struct tuning_step_list tuning_steps[HAMLIB_TSLSTSIZ]; /*!< Tuning step list */
+
+    struct filter_list filters[HAMLIB_FLTLSTSIZ];      /*!< Mode/filter table, at -6dB */
+
+    cal_table_t str_cal;            /*!< S-meter calibration table */
+
+    chan_t chan_list[HAMLIB_CHANLSTSIZ];   /*!< Channel list, zero ended */
+
+    shortfreq_t max_rit;        /*!< max absolute RIT */
+    shortfreq_t max_xit;        /*!< max absolute XIT */
+    shortfreq_t max_ifshift;    /*!< max absolute IF-SHIFT */
+
+    ann_t announces;            /*!< Announces bit field list */
+
+    int preamp[HAMLIB_MAXDBLSTSIZ];    /*!< Preamp list in dB, 0 terminated */
+    int attenuator[HAMLIB_MAXDBLSTSIZ];    /*!< Preamp list in dB, 0 terminated */
+
+    setting_t has_get_func;     /*!< List of get functions */
+    setting_t has_set_func;     /*!< List of set functions */
+    setting_t has_get_level;    /*!< List of get level */
+    setting_t has_set_level;    /*!< List of set level */
+    setting_t has_get_parm;     /*!< List of get parm */
+    setting_t has_set_parm;     /*!< List of set parm */
+
+    gran_t level_gran[RIG_SETTING_MAX]; /*!< level granularity */
+    gran_t parm_gran[RIG_SETTING_MAX];  /*!< parm granularity */
+
+
+    /*
+     * non overridable fields, internal use
+     */
+
+    int transaction_active;    /*!< set to 1 to inform the async reader thread that a synchronous command transaction is waiting for a response, otherwise 0 */
+    vfo_t current_vfo;  /*!< VFO currently set */
+    int vfo_list;       /*!< Complete list of VFO for this rig */
+    int comm_state;     /*!< Comm port state, opened/closed. */
+    rig_ptr_t priv;     /*!< Pointer to private rig state data. */
+    rig_ptr_t obj;      /*!< Internal use by hamlib++ for event handling. */
+
+    int async_data_enabled;     /*!< Whether async data mode is enabled */
+    int poll_interval;          /*!< Rig state polling period in milliseconds */
+    freq_t current_freq;        /*!< Frequency currently set */
+    rmode_t current_mode;       /*!< Mode currently set */
+    //rmode_t current_modeB;      /*!< Mode currently set VFOB */
+    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
+    // 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
+                                     don't do CAT while in Tx */
+    freq_t lo_freq;             /*!< Local oscillator frequency of any transverter */
+    time_t twiddle_time;        /*!< time when vfo twiddling was detected */
+    int twiddle_timeout;        /*!< timeout to resume from twiddling */
+    // uplink allows gpredict to behave better by no reading the uplink VFO
+    int uplink;                 /*!< uplink=1 will not read Sub, uplink=2 will not read Main */
+    struct rig_cache cache;
+    int vfo_opt;                /*!< Is -o switch turned on? */
+    int auto_power_on;          /*!< Allow Hamlib to power on rig
+                                   automatically if supported */
+    int auto_power_off;          /*!< Allow Hamlib to power off rig
+                                   automatically if supported */
+    int auto_disable_screensaver; /*!< Allow Hamlib to disable the
+                                   rig's screen saver automatically if
+                                   supported */
+    int ptt_share;              /*!< Share ptt port by open/close during get_ptt, set_ptt hogs the port while active */
+    int power_now;              /*!< Current RF power level in rig units */
+    int power_min;              /*!< Minimum RF power level in rig units */
+    int power_max;              /*!< Maximum RF power level in rig units */
+    unsigned char disable_yaesu_bandselect; /*!< Disables Yaesu band select logic */
+    int twiddle_rit;            /*!< Suppresses VFOB reading (cached value used) so RIT control can be used */
+    int twiddle_state;          /*!< keeps track of twiddle status */
+    vfo_t rx_vfo;               /*!< Rx VFO currently set */
+
+    volatile unsigned int snapshot_packet_sequence_number;
+
+    volatile int multicast_publisher_run;
+    void *multicast_publisher_priv_data;
+    volatile int async_data_handler_thread_run;
+    void *async_data_handler_priv_data;
+    volatile int poll_routine_thread_run;
+    void *poll_routine_priv_data;
+    pthread_mutex_t mutex_set_transaction;
+    hamlib_port_t rigport;  /*!< Rig port (internal use). */
+    hamlib_port_t pttport;  /*!< PTT port (internal use). */
+    hamlib_port_t dcdport;  /*!< DCD port (internal use). */
+    /********* DO NOT ADD or CHANGE anything (or than to rename) ABOVE THIS LINE *********/
+    /********* ENSURE ANY NEW ITEMS ARE ADDED AFTER HERE *********/
+    /* flags instructing the rig_get routines to use cached values when asyncio is in use */
+    int use_cached_freq; /*!< flag instructing rig_get_freq to use cached values when asyncio is in use */
+    int use_cached_mode; /*!< flag instructing rig_get_mode to use cached values when asyncio is in use */
+    int use_cached_ptt;  /*!< flag instructing rig_get_ptt to use cached values when asyncio is in use */
+    int depth; /*!< a depth counter to use for debug indentation and such */
+    int lock_mode; /*!< flag that prevents mode changes if ~= 0 -- see set/get_lock_mode */
+    powerstat_t powerstat; /*!< power status */
+    char *tuner_control_pathname;  /*!< Path to external tuner control program that get 0/1 (Off/On) argument */
+    char client_version[32];  /*!<! Allow client to report version for compatibility checks/capability */
+    freq_t offset_vfoa; /*!< Offset to apply to VFOA/Main set_freq */
+    freq_t offset_vfob; /*!< Offset to apply to VFOB/Sub set_freq */
+    struct multicast_s *multicast; /*!< Pointer to multicast server data */
 };
 
 //! @cond Doxygen_Suppress
@@ -2631,6 +3025,7 @@ typedef int (*spectrum_cb_t)(RIG *,
  * \sa rig_set_freq_callback(), rig_set_mode_callback(), rig_set_vfo_callback(),
  *     rig_set_ptt_callback(), rig_set_dcd_callback()
  */
+// Do NOT add/remove from this structure -- it will break DLL backwards compatiblity
 struct rig_callbacks {
     freq_cb_t freq_event;   /*!< Frequency change event */
     rig_ptr_t freq_arg;     /*!< Frequency change argument */
@@ -2661,8 +3056,11 @@ struct rig_callbacks {
  */
 struct s_rig {
     struct rig_caps *caps;          /*!< Pointer to rig capabilities (read only) */
-    struct rig_state state;         /*!< Rig state */
+    // Do not remove the deprecated structure -- it will mess up DLL backwards compatibility
+    struct rig_state_deprecated state_deprecated; /*!< Deprecated Rig state */
     struct rig_callbacks callbacks; /*!< registered event callbacks */
+    // state should really be a pointer but that's a LOT of changes involved
+    struct rig_state state;         /*!< Rig state */
 };
 
 
@@ -2679,21 +3077,39 @@ extern HAMLIB_EXPORT(int) rig_open HAMLIB_PARAMS((RIG *rig));
  *  List Set/Get functions pairs
  */
 
+extern HAMLIB_EXPORT(int)
+rig_flush_force(hamlib_port_t *port, int flush_async_data);
+
 extern HAMLIB_EXPORT(int)
 rig_flush(hamlib_port_t *port);
 
+extern HAMLIB_EXPORT(void)
+rig_lock(RIG *rig, int lock);
+
 #if BUILTINFUNC
-#define rig_set_freq(r,v, f) rig_set_vfo(r,v,f,__builtin_FUNCTION())
+#define rig_set_freq(r,v,f) rig_set_freq(r,v,f,__builtin_FUNCTION())
+extern HAMLIB_EXPORT(int)
+rig_set_freq HAMLIB_PARAMS((RIG *rig,
+                            vfo_t vfo,
+                            freq_t freq, const char*));
 #else
 extern HAMLIB_EXPORT(int)
 rig_set_freq HAMLIB_PARAMS((RIG *rig,
                             vfo_t vfo,
                             freq_t freq));
 #endif
+#if BUILTINFUNC
+#define rig_get_freq(r,v,f) rig_get_freq(r,v,f,__builtin_FUNCTION())
+extern HAMLIB_EXPORT(int)
+rig_get_freq HAMLIB_PARAMS((RIG *rig,
+                            vfo_t vfo,
+                            freq_t *freq, const char*));
+#else
 extern HAMLIB_EXPORT(int)
 rig_get_freq HAMLIB_PARAMS((RIG *rig,
                             vfo_t vfo,
                             freq_t *freq));
+#endif
 
 extern HAMLIB_EXPORT(int)
 rig_set_mode HAMLIB_PARAMS((RIG *rig,
@@ -2915,16 +3331,16 @@ rig_get_parm HAMLIB_PARAMS((RIG *rig,
 
 extern HAMLIB_EXPORT(int)
 rig_set_conf HAMLIB_PARAMS((RIG *rig,
-                            token_t token,
+                            hamlib_token_t token,
                             const char *val));
 // deprecating rig_get_conf
 extern HAMLIB_EXPORT(int)
 rig_get_conf HAMLIB_PARAMS((RIG *rig,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val));
 extern HAMLIB_EXPORT(int)
 rig_get_conf2 HAMLIB_PARAMS((RIG *rig,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val,
                             int val_len));
 
@@ -2942,32 +3358,32 @@ rig_reset HAMLIB_PARAMS((RIG *rig,
 extern HAMLIB_EXPORT(int)
 rig_set_ext_level HAMLIB_PARAMS((RIG *rig,
                                  vfo_t vfo,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t val));
 extern HAMLIB_EXPORT(int)
 rig_get_ext_level HAMLIB_PARAMS((RIG *rig,
                                  vfo_t vfo,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t *val));
 
 extern HAMLIB_EXPORT(int)
 rig_set_ext_func HAMLIB_PARAMS((RIG *rig,
                                  vfo_t vfo,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  int status));
 extern HAMLIB_EXPORT(int)
 rig_get_ext_func HAMLIB_PARAMS((RIG *rig,
                                  vfo_t vfo,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  int *status));
 
 extern HAMLIB_EXPORT(int)
 rig_set_ext_parm HAMLIB_PARAMS((RIG *rig,
-                                token_t token,
+                                hamlib_token_t token,
                                 value_t val));
 extern HAMLIB_EXPORT(int)
 rig_get_ext_parm HAMLIB_PARAMS((RIG *rig,
-                                token_t token,
+                                hamlib_token_t token,
                                 value_t *val));
 
 extern HAMLIB_EXPORT(int)
@@ -2995,8 +3411,8 @@ rig_ext_lookup HAMLIB_PARAMS((RIG *rig,
 
 extern HAMLIB_EXPORT(const struct confparams *)
 rig_ext_lookup_tok HAMLIB_PARAMS((RIG *rig,
-                                  token_t token));
-extern HAMLIB_EXPORT(token_t)
+                                  hamlib_token_t token));
+extern HAMLIB_EXPORT(hamlib_token_t)
 rig_ext_token_lookup HAMLIB_PARAMS((RIG *rig,
                                     const char *name));
 
@@ -3010,7 +3426,7 @@ rig_token_foreach HAMLIB_PARAMS((RIG *rig,
 extern HAMLIB_EXPORT(const struct confparams *)
 rig_confparam_lookup HAMLIB_PARAMS((RIG *rig,
                                     const char *name));
-extern HAMLIB_EXPORT(token_t)
+extern HAMLIB_EXPORT(hamlib_token_t)
 rig_token_lookup HAMLIB_PARAMS((RIG *rig,
                                 const char *name));
 
@@ -3094,6 +3510,10 @@ rig_send_voice_mem HAMLIB_PARAMS((RIG *rig,
                               vfo_t vfo,
                               int ch));
 
+extern HAMLIB_EXPORT(int)
+rig_stop_voice_mem HAMLIB_PARAMS((RIG *rig,
+                              vfo_t vfo));
+
 extern HAMLIB_EXPORT(int)
 rig_set_bank HAMLIB_PARAMS((RIG *rig,
                             vfo_t vfo,
@@ -3245,7 +3665,7 @@ rig_set_uplink HAMLIB_PARAMS((RIG *rig,
 extern HAMLIB_EXPORT(const char *)
 rig_get_info HAMLIB_PARAMS((RIG *rig));
 
-extern HAMLIB_EXPORT(const struct rig_caps *)
+extern HAMLIB_EXPORT(struct rig_caps *)
 rig_get_caps HAMLIB_PARAMS((rig_model_t rig_model));
 
 extern HAMLIB_EXPORT(const freq_range_t *)
@@ -3282,6 +3702,9 @@ rig_idx2setting(int i);
 extern HAMLIB_EXPORT(void)
 rig_set_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level));
 
+extern HAMLIB_EXPORT(void)
+rig_get_debug HAMLIB_PARAMS((enum rig_debug_level_e *debug_level));
+
 extern HAMLIB_EXPORT(void)
 rig_set_debug_time_stamp HAMLIB_PARAMS((int flag));
 
@@ -3306,7 +3729,7 @@ extern HAMLIB_EXPORT_VAR(char) debugmsgsave3[DEBUGMSGSAVE_SIZE];  // last-2 debu
 
 // Measuring elapsed time -- local variable inside function when macro is used
 #define ELAPSED1 struct timespec __begin; elapsed_ms(&__begin, HAMLIB_ELAPSED_SET);
-#define ELAPSED2 rig_debug(RIG_DEBUG_TRACE, "%.*s%d:%s: elapsed=%.0lfms\n", rig->state.depth, spaces(), rig->state.depth, __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET));
+#define ELAPSED2 rig_debug(RIG_DEBUG_VERBOSE, "%s%d:%s: elapsed=%.0lfms\n", spaces(rig->state.depth-1), rig->state.depth, __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET));
 
 // use this instead of snprintf for automatic detection of buffer limit
 #define SNPRINTF(s,n,...) { snprintf(s,n,##__VA_ARGS__);if (strlen(s) > n-1) fprintf(stderr,"****** %s(%d): buffer overflow ******\n", __func__, __LINE__); }
@@ -3323,13 +3746,13 @@ extern HAMLIB_EXPORT(FILE *)
 rig_set_debug_file HAMLIB_PARAMS((FILE *stream));
 
 extern HAMLIB_EXPORT(int)
-rig_register HAMLIB_PARAMS((const struct rig_caps *caps));
+rig_register HAMLIB_PARAMS((struct rig_caps *caps));
 
 extern HAMLIB_EXPORT(int)
 rig_unregister HAMLIB_PARAMS((rig_model_t rig_model));
 
 extern HAMLIB_EXPORT(int)
-rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(const struct rig_caps *, rig_ptr_t),
+rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(struct rig_caps *, rig_ptr_t),
                                 rig_ptr_t data));
 
 extern HAMLIB_EXPORT(int)
@@ -3364,7 +3787,7 @@ extern HAMLIB_EXPORT(const char *) rig_strfunc(setting_t);
 extern HAMLIB_EXPORT(const char *) rig_strlevel(setting_t);
 extern HAMLIB_EXPORT(const char *) rig_strparm(setting_t);
 extern HAMLIB_EXPORT(const char *) rig_stragclevel(enum agc_level_e level);
-extern HAMLIB_EXPORT(enum agc_level_e)  rig_levelagcstr (char *agcString);
+extern HAMLIB_EXPORT(enum agc_level_e)  rig_levelagcstr (const char *agcString);
 extern HAMLIB_EXPORT(enum agc_level_e)  rig_levelagcvalue (int agcValue);
 extern HAMLIB_EXPORT(value_t) rig_valueagclevel (enum agc_level_e agcLevel);
 extern HAMLIB_EXPORT(const char *) rig_strptrshift(rptr_shift_t);
@@ -3373,6 +3796,7 @@ extern HAMLIB_EXPORT(const char *) rig_strscan(scan_t scan);
 extern HAMLIB_EXPORT(const char *) rig_strstatus(enum rig_status_e status);
 extern HAMLIB_EXPORT(const char *) rig_strmtype(chan_type_t mtype);
 extern HAMLIB_EXPORT(const char *) rig_strspectrummode(enum rig_spectrum_mode_e mode);
+extern HAMLIB_EXPORT(const char *) rig_strcommstatus(rig_comm_status_t vfo);
 
 extern HAMLIB_EXPORT(rmode_t) rig_parse_mode(const char *s);
 extern HAMLIB_EXPORT(vfo_t) rig_parse_vfo(const char *s);
@@ -3430,6 +3854,14 @@ extern HAMLIB_EXPORT(int) rig_get_lock_mode(RIG *rig, int *lock);
 
 extern HAMLIB_EXPORT(int) rig_is_model(RIG *rig, rig_model_t model);
 
+extern HAMLIB_EXPORT(char*) rig_date_strget(char *buf, int buflen, int localtime);
+
+enum GPIO { GPIO1, GPIO2, GPIO3, GPIO4 };
+extern HAMLIB_EXPORT(int) rig_cm108_get_bit(hamlib_port_t *p, enum GPIO gpio, int *bit);
+extern HAMLIB_EXPORT(int) rig_cm108_set_bit(hamlib_port_t *p, enum GPIO gpio, int bit);
+extern HAMLIB_EXPORT(int) rig_band_changed(RIG *rig, hamlib_bandselect_t band);
+
+extern HAMLIB_EXPORT(void *) rig_data_pointer(RIG *rig, rig_ptrx_t idx);
 
 //! @endcond
 
diff --git a/hamlib/riglist.h b/hamlib/riglist.h
index 3c347da..6723445 100644
--- a/hamlib/riglist.h
+++ b/hamlib/riglist.h
@@ -33,6 +33,8 @@
 #define RIG_MAKE_MODEL(a,b) ((a)*MAX_MODELS_PER_BACKEND+(b))
 #define RIG_BACKEND_NUM(a) ((a)/MAX_MODELS_PER_BACKEND)
 
+//! @endcond
+
 /*! \file riglist.h
  *  \brief Hamlib rig(radio) model definitions.
  *
@@ -49,6 +51,13 @@
  *  whishes to use. It is done with the rig_init() API call.
  */
 
+/**
+ * \def RIG_MODEL_NONE
+ * \brief A macro that returns the model number for an unknown model.
+ *
+ * The none backend, as the name suggests, does nothing.  It is mainly for
+ * internal use.
+ */
 #define RIG_MODEL_NONE 0
 
 /*! \def RIG_MODEL_DUMMY
@@ -62,16 +71,21 @@
  *  It has also been expanded to provide support to "virtual" type of rigs
  *  such as the network rig control backend and W1HKJ's Flrig application.
  */
+//! @cond Doxygen_Suppress
 #define RIG_DUMMY 0
 #define RIG_BACKEND_DUMMY "dummy"
+//! @endcond
 #define RIG_MODEL_DUMMY RIG_MAKE_MODEL(RIG_DUMMY, 1)
+//! @cond Doxygen_Suppress
 #define RIG_MODEL_NETRIGCTL RIG_MAKE_MODEL(RIG_DUMMY, 2)
 #define RIG_MODEL_ARMSTRONG RIG_MAKE_MODEL(RIG_DUMMY, 3)
 #define RIG_MODEL_FLRIG RIG_MAKE_MODEL(RIG_DUMMY, 4)
 #define RIG_MODEL_TRXMANAGER_RIG RIG_MAKE_MODEL(RIG_DUMMY, 5)
 #define RIG_MODEL_DUMMY_NOVFO RIG_MAKE_MODEL(RIG_DUMMY, 6)
 #define RIG_MODEL_TCI1X RIG_MAKE_MODEL(RIG_DUMMY, 7)
-
+#define RIG_MODEL_ACLOG RIG_MAKE_MODEL(RIG_DUMMY, 8)
+#define RIG_MODEL_SDRSHARP RIG_MAKE_MODEL(RIG_DUMMY, 9)
+#define RIG_MODEL_QUISK RIG_MAKE_MODEL(RIG_DUMMY, 10)
 
 /*
  * Yaesu
@@ -127,7 +141,8 @@
 #define RIG_MODEL_FT650 RIG_MAKE_MODEL(RIG_YAESU, 47)
 #define RIG_MODEL_FT990UNI RIG_MAKE_MODEL(RIG_YAESU, 48)
 #define RIG_MODEL_FT710 RIG_MAKE_MODEL(RIG_YAESU, 49)
-
+#define RIG_MODEL_FT9000OLD RIG_MAKE_MODEL(RIG_YAESU, 50)
+#define RIG_MODEL_Q900 RIG_MAKE_MODEL(RIG_YAESU, 51)
 
 /*
  * Kenwood
@@ -186,6 +201,9 @@
 #define RIG_MODEL_LAB599_TX500 RIG_MAKE_MODEL(RIG_KENWOOD,50)
 #define RIG_MODEL_SDRUNO RIG_MAKE_MODEL(RIG_KENWOOD,51)
 #define RIG_MODEL_QRPLABS RIG_MAKE_MODEL(RIG_KENWOOD,52)
+#define RIG_MODEL_FX4 RIG_MAKE_MODEL(RIG_KENWOOD,53)
+#define RIG_MODEL_THETIS RIG_MAKE_MODEL(RIG_KENWOOD, 54)
+#define RIG_MODEL_TRUSDX RIG_MAKE_MODEL(RIG_KENWOOD, 55)
 
 /*
  * Icom
@@ -273,7 +291,7 @@
 #define RIG_MODEL_X6100 RIG_MAKE_MODEL(RIG_ICOM, 87)    /* Xiegu X6100 */
 #define RIG_MODEL_G90 RIG_MAKE_MODEL(RIG_ICOM, 88)    /* Xiegu G90 */
 #define RIG_MODEL_X5105 RIG_MAKE_MODEL(RIG_ICOM, 89)    /* Xiegu X5105 -- G90 compatible */
-
+#define RIG_MODEL_IC905 RIG_MAKE_MODEL(RIG_ICOM, 90)    
 
 /*
  * Optoelectronics (CI-V)
@@ -283,7 +301,6 @@
 #define RIG_MODEL_OS535 RIG_MAKE_MODEL(RIG_ICOM, 52)
 #define RIG_MODEL_OS456 RIG_MAKE_MODEL(RIG_ICOM, 53)
 
-
 /*
  * TenTec (CI-V)
  */
@@ -292,7 +309,6 @@
 #define RIG_MODEL_PARAGON2 RIG_MAKE_MODEL(RIG_ICOM, 59)
 #define RIG_MODEL_DELTAII RIG_MAKE_MODEL(RIG_ICOM, 64)
 
-
 /*
  * Icom PCR
  */
@@ -303,7 +319,6 @@
 #define RIG_MODEL_PCR1500 RIG_MAKE_MODEL(RIG_PCR, 3)
 #define RIG_MODEL_PCR2500 RIG_MAKE_MODEL(RIG_PCR, 4)
 
-
 /*
  * AOR
  */
@@ -326,7 +341,6 @@
 #define RIG_MODEL_AR7030P RIG_MAKE_MODEL(RIG_AOR, 15)
 #define RIG_MODEL_SR2200 RIG_MAKE_MODEL(RIG_AOR, 16)
 
-
 /*
  * JRC
  */
@@ -340,7 +354,6 @@
 #define RIG_MODEL_NRD535 RIG_MAKE_MODEL(RIG_JRC, 6)
 #define RIG_MODEL_NRD545 RIG_MAKE_MODEL(RIG_JRC, 7)
 
-
 /*
  * Radio Shack
  * Actually, they might be either Icom or Uniden. TBC --SF
@@ -354,7 +367,6 @@
 #define RIG_MODEL_RS2042 RIG_MAKE_MODEL(RIG_RADIOSHACK, 5)  /* w/ OptoElectronics OS435 Board */
 #define RIG_MODEL_RS2041 RIG_MAKE_MODEL(RIG_RADIOSHACK, 6)  /* PRO-2041 */
 
-
 /*
  * Uniden
  */
@@ -373,7 +385,6 @@
 #define RIG_MODEL_BCD996T RIG_MAKE_MODEL(RIG_UNIDEN, 11)
 #define RIG_MODEL_BC898 RIG_MAKE_MODEL(RIG_UNIDEN, 12)
 
-
 /*
  * Drake
  */
@@ -383,7 +394,6 @@
 #define RIG_MODEL_DKR8A RIG_MAKE_MODEL(RIG_DRAKE, 2)
 #define RIG_MODEL_DKR8B RIG_MAKE_MODEL(RIG_DRAKE, 3)
 
-
 /*
  * Lowe
  */
@@ -394,7 +404,6 @@
 #define RIG_MODEL_HF250 RIG_MAKE_MODEL(RIG_LOWE, 3)
 #define RIG_MODEL_HF235 RIG_MAKE_MODEL(RIG_LOWE, 4)
 
-
 /*
  * Racal
  */
@@ -406,7 +415,6 @@
 #define RIG_MODEL_RA3710 RIG_MAKE_MODEL(RIG_RACAL, 4)
 #define RIG_MODEL_RA3702 RIG_MAKE_MODEL(RIG_RACAL, 5)
 
-
 /*
  * Watkins-Johnson
  */
@@ -417,7 +425,6 @@
 #define RIG_MODEL_WJ8711 RIG_MAKE_MODEL(RIG_WJ, 3)
 #define RIG_MODEL_WJ8888 RIG_MAKE_MODEL(RIG_WJ, 4)
 
-
 /*
  * Rohde & Schwarz--ek
  */
@@ -429,7 +436,6 @@
 #define RIG_MODEL_EK895 RIG_MAKE_MODEL(RIG_EK, 4)
 #define RIG_MODEL_EK070 RIG_MAKE_MODEL(RIG_EK, 5)
 
-
 /*
  * Skanti
  */
@@ -440,7 +446,6 @@
 #define RIG_MODEL_TRP9000 RIG_MAKE_MODEL(RIG_SKANTI, 3)
 #define RIG_MODEL_TRP8255 RIG_MAKE_MODEL(RIG_SKANTI, 4)
 
-
 /*
  * WiNRADiO/LinRADiO
  */
@@ -458,7 +463,6 @@
 #define RIG_MODEL_G305 RIG_MAKE_MODEL(RIG_WINRADIO, 10)
 #define RIG_MODEL_G315 RIG_MAKE_MODEL(RIG_WINRADIO, 11)
 
-
 /*
  * Ten Tec
  */
@@ -477,7 +481,6 @@
 #define RIG_MODEL_RX331 RIG_MAKE_MODEL(RIG_TENTEC, 12)
 #define RIG_MODEL_TT599 RIG_MAKE_MODEL(RIG_TENTEC, 13)  /* Eagle */
 
-
 /*
  * Alinco
  */
@@ -486,7 +489,6 @@
 #define RIG_MODEL_DX77 RIG_MAKE_MODEL(RIG_ALINCO, 1)
 #define RIG_MODEL_DXSR8 RIG_MAKE_MODEL(RIG_ALINCO, 2)
 
-
 /*
  * Kachina
  */
@@ -494,7 +496,6 @@
 #define RIG_BACKEND_KACHINA "kachina"
 #define RIG_MODEL_505DSP RIG_MAKE_MODEL(RIG_KACHINA, 1)
 
-
 /*
  * Gnuradio backend
  */
@@ -506,7 +507,6 @@
 #define RIG_MODEL_GRAUDIOIQ RIG_MAKE_MODEL(RIG_GNURADIO, 4) /* I&Q stereo sound card source */
 #define RIG_MODEL_USRP_G RIG_MAKE_MODEL(RIG_GNURADIO, 5)    /* Universal Software Radio Peripheral */
 
-
 /*
  * Microtune tuners
  */
@@ -516,7 +516,6 @@
 #define RIG_MODEL_MICROTUNE_4702 RIG_MAKE_MODEL(RIG_MICROTUNE, 2)   /* Alan's */
 #define RIG_MODEL_MICROTUNE_4707 RIG_MAKE_MODEL(RIG_MICROTUNE, 3)
 
-
 /*
  * TAPR
  */
@@ -524,7 +523,6 @@
 #define RIG_BACKEND_TAPR "tapr"
 #define RIG_MODEL_DSP10 RIG_MAKE_MODEL(RIG_TAPR, 1)
 
-
 /*
  * Flex-radio
  */
@@ -535,7 +533,6 @@
 #define RIG_MODEL_DTTSP RIG_MAKE_MODEL(RIG_FLEXRADIO, 3)
 #define RIG_MODEL_DTTSP_UDP RIG_MAKE_MODEL(RIG_FLEXRADIO, 4)
 
-
 /*
  * VEB Funkwerk Köpenick RFT
  */
@@ -543,7 +540,6 @@
 #define RIG_BACKEND_RFT "rft"
 #define RIG_MODEL_EKD500 RIG_MAKE_MODEL(RIG_RFT, 1)
 
-
 /*
  * Various kits
  */
@@ -569,7 +565,6 @@
 #define RIG_MODEL_FUNCUBEDONGLEPLUS RIG_MAKE_MODEL(RIG_KIT, 18) /* FunCUBE Dongle Pro+ */
 #define RIG_MODEL_RSHFIQ RIG_MAKE_MODEL(RIG_KIT, 19)            /* RS-HFIQ */
 
-
 /*
  * SW/FM/TV tuner cards supported by Video4Linux,*BSD, ..
  */
@@ -578,7 +573,6 @@
 #define RIG_MODEL_V4L RIG_MAKE_MODEL(RIG_TUNER, 1)
 #define RIG_MODEL_V4L2 RIG_MAKE_MODEL(RIG_TUNER, 2)
 
-
 /*
  * Rohde & Schwarz--rs
  */
@@ -589,7 +583,6 @@
 #define RIG_MODEL_XK2100 RIG_MAKE_MODEL(RIG_RS, 3)
 #define RIG_MODEL_EK89X RIG_MAKE_MODEL(RIG_RS, 4)
 
-
 /*
  * Phillips/Simoco PRM80
  */
@@ -598,7 +591,6 @@
 #define RIG_MODEL_PRM8060 RIG_MAKE_MODEL(RIG_PRM80, 1)
 #define RIG_MODEL_PRM8070 RIG_MAKE_MODEL(RIG_PRM80, 2)
 
-
 /*
  * ADAT by HB9CBU
  *
@@ -608,7 +600,6 @@
 #define RIG_BACKEND_ADAT "adat"
 #define RIG_MODEL_ADT_200A RIG_MAKE_MODEL(RIG_ADAT, 1)
 
-
 /*
  * ICOM Marine
  */
@@ -619,7 +610,6 @@
 #define RIG_MODEL_IC_M710 RIG_MAKE_MODEL(RIG_ICMARINE, 3)
 #define RIG_MODEL_IC_M803 RIG_MAKE_MODEL(RIG_ICMARINE, 4)
 
-
 /*
  * Dorji transceiver modules
  */
@@ -636,6 +626,7 @@
 #define RIG_MODEL_BARRETT_2050 RIG_MAKE_MODEL(RIG_BARRETT, 1)
 #define RIG_MODEL_BARRETT_950 RIG_MAKE_MODEL(RIG_BARRETT, 2)
 #define RIG_MODEL_BARRETT_4050 RIG_MAKE_MODEL(RIG_BARRETT, 3)
+#define RIG_MODEL_BARRETT_4100 RIG_MAKE_MODEL(RIG_BARRETT, 4)
 
 /*
  * Elad
@@ -658,8 +649,14 @@
 #define RIG_GOMSPACE 35
 #define RIG_BACKEND_GOMSPACE "gomspace"
 #define RIG_MODEL_GS100 RIG_MAKE_MODEL(RIG_GOMSPACE, 1)
-//! @endcond
 
+/*
+ * MDS Microwave Data Systems https://en.wikipedia.org/wiki/Microwave_Data_Systems
+ */
+#define RIG_MDS 36
+#define RIG_BACKEND_MDS "MDS"
+#define RIG_MODEL_MDS4710 RIG_MAKE_MODEL(RIG_MDS, 1)
+#define RIG_MODEL_MDS9710 RIG_MAKE_MODEL(RIG_MDS, 2)
 /*
  * TODO:
     RIG_MODEL_KWZ30,    KNEISNER +DOERING
@@ -667,6 +664,15 @@
     etc.
 */
 
+/*
+ * AnyTone rigs
+ */
+#define RIG_ANYTONE 37
+#define RIG_BACKEND_ANYTONE "AnyTone"
+#define RIG_MODEL_ATD578UVIII RIG_MAKE_MODEL(RIG_ANYTONE, 1)
+
+
+//! @endcond
 
 /*! \typedef typedef int rig_model_t
     \brief Convenience type definition for rig model.
diff --git a/hamlib/rotator.h b/hamlib/rotator.h
index 0b67230..7468752 100644
--- a/hamlib/rotator.h
+++ b/hamlib/rotator.h
@@ -18,6 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #ifndef _ROTATOR_H
 #define _ROTATOR_H 1
@@ -413,8 +414,8 @@ struct rot_caps {
     int (*rot_open)(ROT *rot);     /*!< Pointer to backend implementation of ::rot_open(). */
     int (*rot_close)(ROT *rot);    /*!< Pointer to backend implementation of ::rot_close(). */
 
-    int (*set_conf)(ROT *rot, token_t token, const char *val); /*!< Pointer to backend implementation of ::rot_set_conf(). */
-    int (*get_conf)(ROT *rot, token_t token, char *val);       /*!< Pointer to backend implementation of ::rot_get_conf(). */
+    int (*set_conf)(ROT *rot, hamlib_token_t token, const char *val); /*!< Pointer to backend implementation of ::rot_set_conf(). */
+    int (*get_conf)(ROT *rot, hamlib_token_t token, char *val);       /*!< Pointer to backend implementation of ::rot_get_conf(). */
 
     /*
      *  General API commands, from most primitive to least.. :()
@@ -441,19 +442,19 @@ struct rot_caps {
     int (*set_parm)(ROT *rot, setting_t parm, value_t val);    /*!< Pointer to backend implementation of ::rot_set_parm(). */
     int (*get_parm)(ROT *rot, setting_t parm, value_t *val);   /*!< Pointer to backend implementation of ::rot_get_parm(). */
 
-    int (*set_ext_level)(ROT *rot, token_t token, value_t val);    /*!< Pointer to backend implementation of ::rot_set_ext_level(). */
-    int (*get_ext_level)(ROT *rot, token_t token, value_t *val);   /*!< Pointer to backend implementation of ::rot_get_ext_level(). */
+    int (*set_ext_level)(ROT *rot, hamlib_token_t token, value_t val);    /*!< Pointer to backend implementation of ::rot_set_ext_level(). */
+    int (*get_ext_level)(ROT *rot, hamlib_token_t token, value_t *val);   /*!< Pointer to backend implementation of ::rot_get_ext_level(). */
 
-    int (*set_ext_func)(ROT *rot, token_t token, int status);  /*!< Pointer to backend implementation of ::rot_set_ext_func(). */
-    int (*get_ext_func)(ROT *rot, token_t token, int *status); /*!< Pointer to backend implementation of ::rot_get_ext_func(). */
+    int (*set_ext_func)(ROT *rot, hamlib_token_t token, int status);  /*!< Pointer to backend implementation of ::rot_set_ext_func(). */
+    int (*get_ext_func)(ROT *rot, hamlib_token_t token, int *status); /*!< Pointer to backend implementation of ::rot_get_ext_func(). */
 
-    int (*set_ext_parm)(ROT *rot, token_t token, value_t val);     /*!< Pointer to backend implementation of ::rot_set_ext_parm(). */
-    int (*get_ext_parm)(ROT *rot, token_t token, value_t *val);    /*!< Pointer to backend implementation of ::rot_get_ext_parm(). */
+    int (*set_ext_parm)(ROT *rot, hamlib_token_t token, value_t val);     /*!< Pointer to backend implementation of ::rot_set_ext_parm(). */
+    int (*get_ext_parm)(ROT *rot, hamlib_token_t token, value_t *val);    /*!< Pointer to backend implementation of ::rot_get_ext_parm(). */
 
     int (*get_status)(ROT *rot, rot_status_t *status); /*!< Pointer to backend implementation of ::rot_get_status(). */
 
     const char *macro_name;                    /*!< Rotator model macro name. */
-    int (*get_conf2)(ROT *rot, token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::rot_get_conf2(). */
+    int (*get_conf2)(ROT *rot, hamlib_token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::rot_get_conf2(). */
 };
 //! @cond Doxygen_Suppress
 #define ROT_MODEL(arg) .rot_model=arg,.macro_name=#arg
@@ -544,16 +545,16 @@ rot_cleanup HAMLIB_PARAMS((ROT *rot));
 
 extern HAMLIB_EXPORT(int)
 rot_set_conf HAMLIB_PARAMS((ROT *rot,
-                            token_t token,
+                            hamlib_token_t token,
                             const char *val));
 extern HAMLIB_EXPORT(int)
 rot_get_conf HAMLIB_PARAMS((ROT *rot,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val));
 
 extern HAMLIB_EXPORT(int)
 rot_get_conf2 HAMLIB_PARAMS((ROT *rot,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val,
                             int val_len));
 
@@ -635,29 +636,29 @@ rot_get_parm HAMLIB_PARAMS((ROT *rig,
 
 extern HAMLIB_EXPORT(int)
 rot_set_ext_level HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t val));
 extern HAMLIB_EXPORT(int)
 rot_get_ext_level HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t *val));
 
 extern HAMLIB_EXPORT(int)
 rot_set_ext_func HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  int status));
 extern HAMLIB_EXPORT(int)
 rot_get_ext_func HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  int *status));
 
 extern HAMLIB_EXPORT(int)
 rot_set_ext_parm HAMLIB_PARAMS((ROT *rig,
-                                token_t token,
+                                hamlib_token_t token,
                                 value_t val));
 extern HAMLIB_EXPORT(int)
 rot_get_ext_parm HAMLIB_PARAMS((ROT *rig,
-                                token_t token,
+                                hamlib_token_t token,
                                 value_t *val));
 
 extern HAMLIB_EXPORT(const char *)
@@ -700,7 +701,7 @@ extern HAMLIB_EXPORT(const struct confparams *)
 rot_confparam_lookup HAMLIB_PARAMS((ROT *rot,
                                    const char *name));
 
-extern HAMLIB_EXPORT(token_t)
+extern HAMLIB_EXPORT(hamlib_token_t)
 rot_token_lookup HAMLIB_PARAMS((ROT *rot,
                                 const char *name));
 
@@ -729,8 +730,8 @@ rot_ext_lookup HAMLIB_PARAMS((ROT *rot,
 
 extern HAMLIB_EXPORT(const struct confparams *)
 rot_ext_lookup_tok HAMLIB_PARAMS((ROT *rot,
-                                  token_t token));
-extern HAMLIB_EXPORT(token_t)
+                                  hamlib_token_t token));
+extern HAMLIB_EXPORT(hamlib_token_t)
 rot_ext_token_lookup HAMLIB_PARAMS((ROT *rot,
                                     const char *name));
 
@@ -797,6 +798,8 @@ extern HAMLIB_EXPORT(const char *) rot_strlevel(setting_t);
 extern HAMLIB_EXPORT(const char *) rot_strparm(setting_t);
 extern HAMLIB_EXPORT(const char *) rot_strstatus(rot_status_t);
 
+extern HAMLIB_EXPORT(void *) rot_data_pointer(ROT *rot, rig_ptrx_t idx);
+
 //! @endcond
 
 /**
diff --git a/hamlib/rotlist.h b/hamlib/rotlist.h
index a96b9a5..d043a14 100644
--- a/hamlib/rotlist.h
+++ b/hamlib/rotlist.h
@@ -637,9 +637,17 @@
 #define ROT_MODEL_ANDROIDSENSOR ROT_MAKE_MODEL(ROT_ANDROIDSENSOR, 1)
 
 /**
- * \brief A macro that returns the model number of the GRBLTRK backend.
+ * \brief A macro that returns the model number of the ROT_MODEL_GRBLTRK_SER backend.
  *
- * \def ROT_MODEL_GRBLTRK
+ * \def ROT_MODEL_GRBLTRK_SER
+ *
+ * The GRBLTRK backend can be used with rotators that support the GRBL
+ * protocol.
+ */
+/**
+ * \brief A macro that returns the model number of the ROT_MODEL_GRBLTRK_NET backend.
+ *
+ * \def ROT_MODEL_GRBLTRK_NET
  *
  * The GRBLTRK backend can be used with rotators that support the GRBL
  * protocol.
@@ -651,6 +659,48 @@
 #define ROT_MODEL_GRBLTRK_SER ROT_MAKE_MODEL(ROT_GRBLTRK, 1)
 #define ROT_MODEL_GRBLTRK_NET ROT_MAKE_MODEL(ROT_GRBLTRK, 2)
 
+/**
+ * \brief A macro that returns the model number of the FLIR backend.
+ *
+ * \def ROT_MODEL_FLIR
+ *
+ * The FLIR backend can be used with FLIR and DirectedPercepition 
+ * rotators using the PTU protocol (e.g. PTU-D48). Currently only 
+ * the serial interface is supported and no ethernet.
+ */
+//! @cond Doxygen_Suppress
+#define ROT_FLIR 25
+#define ROT_BACKEND_FLIR "flir"
+//! @endcond
+#define ROT_MODEL_FLIR ROT_MAKE_MODEL(ROT_FLIR, 1)
+
+/**
+ * \brief A macro that returns the model number of the APEX backend.
+ *
+ * \def ROT_MODEL_APEX_SHARED_LOOP
+ *
+ * The APEX backend can be used with APEX * rotators. 
+ */
+//! @cond Doxygen_Suppress
+#define ROT_APEX 26
+#define ROT_BACKEND_APEX "apex"
+//! @endcond
+#define ROT_MODEL_APEX_SHARED_LOOP ROT_MAKE_MODEL(ROT_APEX, 1)
+
+/**
+ * \brief A macro that returns the model number of the SAEBRTRACK backend.
+ *
+ * \def ROT_MODEL_SAEBRTRACK
+ *
+ * The SAEBRTRACK backend can be used with SAEBRTRACK * rotators. 
+ */
+//! @cond Doxygen_Suppress
+#define ROT_SAEBRTRACK 27
+#define ROT_BACKEND_SAEBRTRACK "SAEBRTrack"
+//! @endcond
+#define ROT_MODEL_SAEBRTRACK ROT_MAKE_MODEL(ROT_SAEBRTRACK, 1)
+
+
 /**
  * \brief Convenience type definition for a rotator model.
  *