w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-27 06:38:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Bill Somerville 2021-02-02 22:55:45 +00:00
commit e82fefc5f1
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
11 changed files with 940 additions and 911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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}")
#

2
Transceiver/DXLabSuiteCommanderTransceiver.cpp
View File

@ -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};
}

2
Transceiver/DXLabSuiteCommanderTransceiver.hpp
View File

@ -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,

2
Transceiver/HRDTransceiver.cpp
View File

@ -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 */);
}

2
Transceiver/HRDTransceiver.hpp
View File

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

1789
Transceiver/HamlibTransceiver.cpp
View File

File diff suppressed because it is too large Load Diff

42
Transceiver/HamlibTransceiver.hpp
View File

@ -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;
void set_conf (char const * item, char const * value);
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);
class impl;
pimpl<impl> m_;
};
#endif

2
Transceiver/OmniRigTransceiver.cpp
View File

@ -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

2
Transceiver/OmniRigTransceiver.hpp
View File

@ -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};

2
Transceiver/TransceiverFactory.cpp
View File

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

4
Transceiver/TransceiverFactory.hpp
View File

@ -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_;