Version 1.4.1

CatRadio.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=CatRadio
+Comment=Radio Control Software
+Icon=/home/pi/CatRadio/catradio.png
+Exec=/home/pi/CatRadio/CatRadio
+Type=Application
+Terminal=false
+Encoding=UTF-8
+Categories=HamRadio;

CatRadio.pro

@@ -57,7 +57,7 @@ INCLUDEPATH += $$PWD/hamlib
 RESOURCES += qdarkstyle/dark/darkstyle.qrc
 # RESOURCES += qdarkstyle/light/lightstyle.qrc
 
-VERSION = 1.4.0
+VERSION = 1.4.1
 
 RC_ICONS = catradio.ico
 

ChangeLog.txt

@@ -2,7 +2,7 @@ CatRadio
 
 (+ New, * Updated, - Removed)
 
-1.4.0 - 2024-mm-dd
+1.4.0 - 2024-03-17
 	+ Auto Connect option
 	+ Auto Power-on option
 	+ High SWR indicator
@@ -13,7 +13,7 @@ CatRadio
 	* Bug fix: Repeater shift
 	* Bug fix: Power status
 	* Bug fix: COM port list
-	* Updated to library Hamlib 4.5.5
+	* Updated to library Hamlib 4.6 beta
 
 1.3.0 - 2022-11-24
 	+ Radio info

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 (*set_conf)(AMP *amp, hamlib_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_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, token_t token, char *val);       /*!< 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 (*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, token_t level, value_t val);  /*!< Pointer to backend implementation of ::amp_set_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
 
 

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.

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 */

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

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.

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 (*set_conf)(ROT *rot, hamlib_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 (*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 (*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, token_t token, value_t *val);   /*!< Pointer to backend implementation of ::rot_get_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 (*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, token_t token, int *status); /*!< Pointer to backend implementation of ::rot_get_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 (*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, token_t token, value_t *val);    /*!< Pointer to backend implementation of ::rot_get_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));
+                                  hamlib_token_t token));
-extern HAMLIB_EXPORT(token_t)
+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
 
 /**

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.
  *

mainwindow.cpp

@@ -1649,7 +1649,7 @@ void MainWindow::on_action_AboutCatRadio_triggered()
     msgBox.setTextFormat(Qt::RichText);
     QString version = QString::number(VERSION_MAJ)+"."+QString::number(VERSION_MIN)+"."+QString::number(VERSION_MIC);
     msgBox.setText("<b>CatRadio</b> <i>Radio control software</i><br/>version "+version+" "+RELEASE_DATE);
-    msgBox.setInformativeText("<p>Copyright (C) 2022-2023 Gianfranco Sordetti IZ8EWD<br/>"
+    msgBox.setInformativeText("<p>Copyright (C) 2022-2024 Gianfranco Sordetti IZ8EWD<br/>"
                               "<a href='https://www.pianetaradio.it' style='color: #668fb8'>www.pianetaradio.it</a></p>"
                               "<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/>"
                               "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br/>"

mainwindow.h

@@ -28,7 +28,7 @@
 #define RELEASE_DATE __DATE__
 #define VERSION_MAJ 1
 #define VERSION_MIN 4
-#define VERSION_MIC 0
+#define VERSION_MIC 1
 
 
 QT_BEGIN_NAMESPACE