Merge branch 'release-2.4.0'

CMakeLists.txt

@@ -45,7 +45,7 @@ if (POLICY CMP0075)
 endif ()
 
 project (wsjtx
-  VERSION 2.4.0.0
+  VERSION 2.5.0.0
   LANGUAGES C CXX Fortran
   )
 set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio")
@@ -71,7 +71,7 @@ message (STATUS "******************************************************")
 
 include (set_build_type)
 # RC 0 or omitted is a development build, GA is a General Availability release build
-set_build_type (RC 1)
+set_build_type (RC 2)
 set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}")
 
 #

Transceiver/DXLabSuiteCommanderTransceiver.cpp

@@ -39,7 +39,7 @@ namespace
 
 void DXLabSuiteCommanderTransceiver::register_transceivers (logger_type * /*logger*/,
                                                             TransceiverFactory::Transceivers * registry,
-                                                            int id)
+                                                            unsigned id)
 {
   (*registry)[commander_transceiver_name] = TransceiverFactory::Capabilities {id, TransceiverFactory::Capabilities::network, true};
 }

Transceiver/DXLabSuiteCommanderTransceiver.hpp

@@ -24,7 +24,7 @@ class DXLabSuiteCommanderTransceiver final
   Q_OBJECT;                     // for translation context
 
 public:
-  static void register_transceivers (logger_type *, TransceiverFactory::Transceivers *, int id);
+  static void register_transceivers (logger_type *, TransceiverFactory::Transceivers *, unsigned id);
 
   // takes ownership of wrapped Transceiver
   explicit DXLabSuiteCommanderTransceiver (logger_type *, std::unique_ptr<TransceiverBase> wrapped,

Transceiver/HRDTransceiver.cpp

@@ -25,7 +25,7 @@ namespace
 
 void HRDTransceiver::register_transceivers (logger_type *,
                                             TransceiverFactory::Transceivers * registry,
-                                            int id)
+                                            unsigned id)
 {
   (*registry)[HRD_transceiver_name] = TransceiverFactory::Capabilities (id, TransceiverFactory::Capabilities::network, true, true /* maybe */);
 }

Transceiver/HRDTransceiver.hpp

@@ -30,7 +30,7 @@ class HRDTransceiver final
   Q_OBJECT
 
 public:
-  static void register_transceivers (logger_type *, TransceiverFactory::Transceivers *, int id);
+  static void register_transceivers (logger_type *, TransceiverFactory::Transceivers *, unsigned id);
 
   // takes ownership of wrapped Transceiver
   explicit HRDTransceiver (logger_type *

Transceiver/HamlibTransceiver.hpp

@@ -1,14 +1,11 @@
 #ifndef HAMLIB_TRANSCEIVER_HPP_
 #define HAMLIB_TRANSCEIVER_HPP_
 
-#include <tuple>
-
 #include <QString>
 
-#include <hamlib/rig.h>
-
 #include "TransceiverFactory.hpp"
 #include "PollingTransceiver.hpp"
+#include "pimpl_h.hpp"
 
 // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
 class HamlibTransceiver final
@@ -20,10 +17,11 @@ public:
   static void register_transceivers (logger_type *, TransceiverFactory::Transceivers *);
   static void unregister_transceivers ();
 
-  explicit HamlibTransceiver (logger_type *, int model_number, TransceiverFactory::ParameterPack const&,
+  explicit HamlibTransceiver (logger_type *, unsigned model_number, TransceiverFactory::ParameterPack const&,
                               QObject * parent = nullptr);
   explicit HamlibTransceiver (logger_type *, TransceiverFactory::PTTMethod ptt_type, QString const& ptt_port,
                               QObject * parent = nullptr);
+  ~HamlibTransceiver ();
 
 private:
   int do_start () override;
@@ -35,38 +33,8 @@ private:
 
   void do_poll () override;
 
-  void error_check (int ret_code, QString const& doing) const;
+  class impl;
-  void set_conf (char const * item, char const * value);
+  pimpl<impl> m_;
-  QByteArray get_conf (char const * item);
-  Transceiver::MODE map_mode (rmode_t) const;
-  rmode_t map_mode (Transceiver::MODE mode) const;
-  std::tuple<vfo_t, vfo_t> get_vfos (bool for_split) const;
-
-  struct RIGDeleter {static void cleanup (RIG *);};
-  QScopedPointer<RIG, RIGDeleter> rig_;
-
-  bool ptt_only_;               // we can use a dummy device for PTT
-  bool back_ptt_port_;
-  bool one_VFO_;
-  bool is_dummy_;
-
-  // these are saved on destruction so we can start new instances
-  // where the last one left off
-  static freq_t dummy_frequency_;
-  static rmode_t dummy_mode_;
-
-  bool mutable reversed_;
-
-  bool freq_query_works_;
-  bool mode_query_works_;
-  bool split_query_works_;
-  bool tickle_hamlib_;          // Hamlib requires a
-                                // rig_set_split_vfo() call to
-                                // establish the Tx VFO
-  bool get_vfo_works_;          // Net rigctl promises what it can't deliver
-  bool set_vfo_works_;          // More rigctl promises which it can't deliver
-
-  static int debug_callback (enum rig_debug_level_e level, rig_ptr_t arg, char const * format, va_list ap);
 };
 
 #endif

Transceiver/OmniRigTransceiver.cpp

@@ -76,7 +76,7 @@ OmniRig::RigParamX OmniRigTransceiver::map_mode (MODE mode)
 
 void OmniRigTransceiver::register_transceivers (logger_type *,
                                                 TransceiverFactory::Transceivers * registry,
-                                                int id1, int id2)
+                                                unsigned id1, unsigned id2)
 {
   (*registry)[OmniRig_transceiver_one_name] = TransceiverFactory::Capabilities {
     id1

Transceiver/OmniRigTransceiver.hpp

@@ -26,7 +26,7 @@ class OmniRigTransceiver final
   Q_OBJECT;
 
 public:
-  static void register_transceivers (logger_type *, TransceiverFactory::Transceivers *, int id1, int id2);
+  static void register_transceivers (logger_type *, TransceiverFactory::Transceivers *, unsigned id1, unsigned id2);
 
   enum RigNumber {One = 1, Two};
 

Transceiver/TransceiverFactory.cpp

@@ -23,7 +23,7 @@ namespace
 {
   enum				// supported non-hamlib radio interfaces
     {
-      NonHamlibBaseId = 9899
+      NonHamlibBaseId = 99899
       , CommanderId
       , HRDId
       , OmniRigOneId

Transceiver/TransceiverFactory.hpp

@@ -35,7 +35,7 @@ public:
   {
     enum PortType {none, serial, network, usb};
 
-    explicit Capabilities (int model_number = 0
+    explicit Capabilities (unsigned model_number = 0
                            , PortType port_type = none
                            , bool has_CAT_PTT = false
                            , bool has_CAT_PTT_mic_data = false
@@ -50,7 +50,7 @@ public:
     {
     }
 
-    int model_number_;
+    unsigned model_number_;
     PortType port_type_;
     bool has_CAT_PTT_;
     bool has_CAT_PTT_mic_data_;