Updates Windows Hamlib binaries to v4.4

cjcliffe · Feb 3, 2022 · 1518364 · 1518364
1 parent bbc2e97
commit 1518364
Show file tree

Hide file tree

Showing 13 changed files with 963 additions and 768 deletions.
diff --git a/external/hamlib/32/libhamlib-4.def b/external/hamlib/32/libhamlib-4.def
diff --git a/external/hamlib/32/libhamlib-4.dll b/external/hamlib/32/libhamlib-4.dll
diff --git a/external/hamlib/32/libhamlib-4.exp b/external/hamlib/32/libhamlib-4.exp
diff --git a/external/hamlib/32/libhamlib-4.lib b/external/hamlib/32/libhamlib-4.lib
diff --git a/external/hamlib/64/libhamlib-4.def b/external/hamlib/64/libhamlib-4.def
diff --git a/external/hamlib/64/libhamlib-4.dll b/external/hamlib/64/libhamlib-4.dll
diff --git a/external/hamlib/64/libhamlib-4.exp b/external/hamlib/64/libhamlib-4.exp
diff --git a/external/hamlib/64/libhamlib-4.lib b/external/hamlib/64/libhamlib-4.lib
diff --git a/external/hamlib/Hamlib_deps_on_Windows.txt b/external/hamlib/Hamlib_deps_on_Windows.txt
@@ -7,4 +7,9 @@ and also
 Those dependencies are installed from external/msvc/[x86|x64] dirs.
 
 In addition, Hamlib also uses libusb but since it is a common
-dependency with SoapySDR, it is not included in the external dirs.
+dependency with SoapySDR, it is not included in the external dirs.
+
+For Hamlib v4.x releases, only the export file 'libhamlib-4.def' is provided, so we need to re-generate .lib to work on Visual Studio projects: 
+- Open the 'Developper Command Prompt for VS 2022'
+- For Win32, go to hamlib/32 directory and run 'LIB /DEF:libhamlib-4.def /MACHINE:X86'
+- For Win64, go to hamlib/64 directory and run 'LIB /DEF:libhamlib-4.def /MACHINE:X64'
diff --git a/external/hamlib/hamlib/rig.h b/external/hamlib/hamlib/rig.h
diff --git a/external/hamlib/hamlib/riglist.h b/external/hamlib/hamlib/riglist.h
@@ -70,6 +70,7 @@
 #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)
 
 
 /*
@@ -121,6 +122,7 @@
 #define RIG_MODEL_FTDX10 RIG_MAKE_MODEL(RIG_YAESU, 42)
 #define RIG_MODEL_FT897D RIG_MAKE_MODEL(RIG_YAESU, 43)
 #define RIG_MODEL_FTDX101MP RIG_MAKE_MODEL(RIG_YAESU, 44)
+#define RIG_MODEL_MCHFQRP RIG_MAKE_MODEL(RIG_YAESU, 45)
 
 
 /*

diff --git a/external/hamlib/hamlib/rotator.h b/external/hamlib/hamlib/rotator.h
@@ -497,6 +497,7 @@ struct rot_state {
      * non overridable fields, internal use
      */
     hamlib_port_t rotport;  /*!< Rotator port (internal use). */
+    hamlib_port_t rotport2;  /*!< 2nd Rotator port (internal use). */
 
     int comm_state;         /*!< Comm port state, i.e. opened or closed. */
     rig_ptr_t priv;         /*!< Pointer to private rotator state data. */

diff --git a/external/hamlib/hamlib/rotlist.h b/external/hamlib/hamlib/rotlist.h
@@ -619,6 +619,11 @@
 #define ROT_MODEL_RADANT ROT_MAKE_MODEL(ROT_RADANT, 1)
 
 
+#define ROT_ANDROIDSENSOR 23
+#define ROT_BACKEND_ANDROIDSENSOR "androidsensor"
+#define ROT_MODEL_ANDROIDSENSOR ROT_MAKE_MODEL(ROT_ANDROIDSENSOR, 1)
+
+
 /**
  * \brief Convenience type definition for a rotator model.
  *