This allows low CAT functionality SDRs like the AE9RB Peaberry v2 to
be controlled.
Merged from ^/branches/wsjtx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.6@6224 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The HDSDR software returns invalid responses to mode query commands
MD. This change detects that and does no more mode queries. This means
mode management is not possible with this rig until it is fixed.
Merged from ^/branches/wsjtx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.6@6203 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This change allows serial control lines to be forced high or low (DTR
or RTS) while using the other (RTS, DTR) for PTT on the CAT serial
port. It is only needed for some very obscure and rare serial line
powered interfaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5869 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
r5297 | bsomervi | 2015-04-26 17:26:54 +0100 (Sun, 26 Apr 2015) | 49 lines
Various defect repairs and ambigous behaviour clarifications
A regression introduced in v1.5.0-rc1 where PTT on an alternate serial
port when using no CAT control is resolved.
A regression introduced in v1.5.0-rc1 where the network server field
was not being restored in the settings dialog has been resolved.
In settings the "Test PTT" button is now styled by checked state.
The "Test PTT" button is enabled without needing click "Test CAT"
first when no CAT rig control is selected.
Various parts of the settings dialog are now disabled when no CAT rig
control is selected. These are the "Mode" group, the "Split Operation"
group and the "Monitor returns to last used frequency" check box. None
of these have any visible impact nor make sense without CAT rig
control.
Initialization and teardown of rig control internals has been revised
to avoid several problems related to timing and when switching between
different CAT settings. This includes improvements in having the
operating frequency restored between sessions when not using CAT rig
control.
The initialization of OmniRig connections has been improved,
unfortunately it is still possible to get an exception when clicking
the "Test CAT" button where just clicking "OK" and leaving the
settings dialog will probably work.
Some unnecessary CAT commands output during direct rig control have
been elided to reduce the level of traffic a little.
The handling of some automatically generated free text messages used
when the station is a type 2 compound callsign or is working a type 2
compound callsign has been improved. This is related to how a double
click on a message of the form "DE TI4/N0URE 73" is double
clicked. The new behaviour depends on whether the current "DX Call"
matches the call in the message. This resolves the ambiguity as to
whether this message is a sign off at the end of a QSO with current
operator (a 73 message is generated) or a tail end opportunity where
the message should be treated the same as a CQ or QRZ message (WSJT-X
QSYs to the frequency, generates messages and selects message one
ready to call). This still leaves some potential ambiguous behaviors
in this complex area but selecting "Clear DX call and grid after
logging" should resolve most of them.
Rig control trace messages have been cleaned up and are now more
helpful, less verbose and, tidier in the source code.
------------------------------------------------------------------------
Merged from the wsjtx-1.5 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5298 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Release builds were incrorrectly selecting a high level of Hamlib
trace verbosity.
Added a new CMake option to turn on maximum Hamlib trace verbosity
when required (WSJT_HAMLIB_VERBOSE_TRACE default=OFF). The current
WSJT_HAMLIB_TRACE (default=OFF) now only turns on tracing at warning
level and above, this option must be set ON before the
WSJT_HAMLIB_VERBOSE_TRACE option becomes available. Release
configuration builds use a Hamlib trace level of error or above by
default.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5261 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Made the force control lines group box in the Configuration UI
checkable which allows the DTR and RTS checkboxes to mean either force
low or force high.
Also improved UI control logic to only allow valid setting
combintions. Disabled network port text edit for OmniRig. Cleared
network port combo box list for network interfaces like HRD and DXLab
Commander, was erroneously showing COM ports.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5222 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Hamlib conflates mode and bandwidth which sometimes make it impossible
to change mode without forcing a bandwidth change. Unfortunately
Hamlib has no bandwidth value that is documented to leave the
bandwidth as is, despite this being easy to implement. Many Hamlib rig
back ends do interpret RIG_PASSBAND_NORMAL as "don't explicitly change
the bandwidth".
Some rigs like the Tentec Jupiter have a widest bandwidth of 8kHz
which is larger than desired for this application so the old behaviour
of setting the default wide bandwidth is not very friendly. Also many
rig back ends in Hamlib do not do the required bandwidth setting
correctly due to the CAT protocol having no way of discovering user
defined bandwidth allocations.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5151 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Because setting frequency can change mode and setting mode can change
frequency on various rigs it is necessary to set a frequency by first
setting a frequency which gets to the correct band and potentially
band stack register. Then to set the mode to ensure that any band
remembered mode is cleared. Then set frequency again in case the prior
mode change moved the frequency (e.g. CW correction). Then set mode
again because some rigs set the mode according to frequency.
Who would have thought setting the rig frequency via CAT could be so
complicated :( TODO: Even this is flawed on some Yaesu rigs that must
be band changed to select some settings like aerial socket and pre-amp
settings.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4997 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Some Hamlib back ends clain to support split queries but they don't
work. The existing code to only try a split query once per session if
it fails has been extended to any error from Hamlib returned from a
split query.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4972 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
We have to ensure that the band and mode along with the frequency of
both VFOs is set before attempting to enable split mode.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4879 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Also cleaned up duplicate trace output.
Using the DX Lab Suite Commander CAT interface with rigs like the
TS-2000 requires that split mode be set after changing the Tx
frequency. This is because setting teh Tx frequency disables split
mode.
With some Icom rigs the rig must be in split mode before setting the
Tx frequency otherwise the Tx frequency change will not be honoured.
To fix this the sequence set-split, set-tx-frequency, set-split must
always be used to change the Tx frequency.
Support for new DX Lab Suite Commander TCP/IP commands
Dave AA6YQ has added two new commands to the Commander server to allow
more reliable control.
Requires DX Lab Suite Commander 11.1.4 or later.
Ensure split Tx frequency agrees with UI before transmitting
Ensure split works on Yaesu via Hamlib without breaking others
Also improved class HamlibTransceiver debug trace messages.
Merged r4776-r4779 from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4780 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Some rigs always receive on the same VFO, the
HamlibTransceiver::init_rig() method was not allowing for this. It
needs to simply do nothing and assume VFO MAIN/A is current at
startup.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4450 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Because PowerSDR for the FlexRadio rigs doesn't implement split or VFO
B, querying the TX VFO in transceiver polls causes an error with
them. This query is unecessary. Removing it will cause a delay of one
poll period after split is set for the Tx frequency to appear. This
should be harmless, if not then there is a possibility of querying
split before the Tx frequency. This seems obvious but I believe the
order matters with some rigs so it needs more investigation.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4435 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Cleaned up and standardized many the diagnostic messages from the
Hamlib interface and added a few new ones for clarification.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4268 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
It appears that Hamlib uses two different return codes to indicate
missing functionality and doesn't use them consistently. The Hamlib
rig control code now checks for either code when testing for function
availability.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4239 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The Hamlib backe end capabilities table is not reliable when the back
end is the Hamlib Net one. This is because that back end claims all
functions available but a call may fail on execution due to the actual
remote back end target not supporting it.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4234 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Hamlib knows for each rig back-end which type of PTT switching is
available, we don't need to set it as the default is always
correct. Setting it to "RIG" was disabling the ability to use the rear
audio input select version of CAT PTT on rigs that support it
e.g. Kenwood TS-590s.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4224 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Fake split mode attempts to take the rig out of split mode on
initialization and this caused an error when the rig doesn't support
split control via CAT. This specfic error is now ignored to allow fake
split mode to start cleanly.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4174 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Enhanced TransceiverBase error exception type to allow for language
translatable messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4033 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This allows writable files to be located in the "correct"
location for each platform rather than in the directory of
the executable which, in general, is not recommended or
allowed in some cases.
A preprocessor macro WSJT_STANDARD_FILE_LOCATIONS is used to
switch be tween old and new functionality, currently it is on
by default. It can be turned off by defining it to a false
value (0) or more simply with cmake-gui setting the option
with the same name. JTAlert can only work with the old
non-standard file locations until Laurie VK3AMA chooses to
support the new file locations.
Even if the above is not enabled; the QSettings file is
written to a user specific location so it will be shared by
all instances of the program (i.e. across upgrades). See
below for multiple concurrent instance support changes.
Added a command line parser module for Fortran.
Added 'lib/options.f90' to facilitate more complex argument
passing to jt9 to cover explicit file locations.
Changed the way multiple concurrent instances are handled.
This is to allow the program to be run multiple times from
the same installation directory.
A new wsjtx command line optional argument is available "-r"
or "--rig" which enables multiple concurrent instance
support. The parameter of the new option is a unique name
signifying a rig or equivalent. The name is used as the
shared memory segment key and in window titles. The name is
also used to access unique settings files and writable data
files like ALL.TXT and log files. No attempt has been made
to share these files between concurrent instances.
If "-r" or "--rig" is used without a parameter it still
enables multiple concurrent instance support for that
instance. All instances must use a unique parameter, one of
which may be empty.
The rig name is appended the
QCoreApplication::applicationName() for convenient usage like
window titles.
Set non Qt locale to "C".
This ensures that C library functions give consistent results
whatever the system locale is set to. QApplication follows
the system locale as before. Thus using QApplication and its
descendants like widgets and QString for all user visible
formating will give correct l10n and using C/C++ library will
give consistent formatting across locales.
Added top level C++ exception handling to main.cpp.
Because the new transceiver framework uses exceptions
internally, the main function now handles any exceptions that
aren't caught.
Retired devsetup, replaced with Configuration.
Configuration is a class that encapsulates most of the
configuration behavior. Because rig configuration is so
closely coupled with rig operation, Configuration serves as a
proxy for access to the rig control functions. See
Configuration.hpp for more details of the Configuration
interface.
Menu changes.
Various checkable menu actions moved from main menu to the
Configuration dialog. The whole settings menu has been
retired with the single "Settings..." action moved to the
file menu for consistency on Mac where it appears as
"Preferences" in line with Mac guidelines.
New data models for data used by the application.
ADIF amateur band parameters, free text message macros, spot
working frequencies and, station information (station
descriptions and transverter offsets per band) each implement
the QAbstractItemModel interface allowing them to be used
directly with Qt view widgets (Bands.hpp, FrequencyList.hpp
and, StationList.hpp). Configuration manages maintenance of
an instance of all but the former of the above models. The
ADIF band model is owned by Configuration but requires no
user maintenance as it is immutable.
Band combo box gets more functionality.
This widget is now an editable QComboBox with some extra
input capabilities.
The popup list is still the list of spot working frequencies,
now showing the actual frequency decorated with the band
name. This allows multiple spot frequencies on a band if
required.
The line edit allows direct frequency entry in mega-Hertz
with a completer built in to suggest the available spot
working frequencies. It also allows band name entry where
the first available spot working frequency is selected.
Recognized band names are those that are defined by the ADIF
specification and can be found in in the implementation of
the ADIF bands model (Bands.cpp).
If an out of band frequency is chosen, the line edit shows a
warning red background and the text "OOB". Out of band is
only defined by the ADIF band limits which in general are
wider than any entities regulations.
Qt 5.2 now supports default audio i/p and o/p devices.
These devices are placeholders for whatever the user defines
as the default device. Because of this they need special
treatment as the actual device used is chosen at open time
behind the scenes.
Close-down behavior is simplified.
The close-down semantics were broken such that some objects
were not being shut down cleanly, this required amendments to
facilitate correct close down of threads.
User font selection added to Configuration UI.
Buttons to set the application font and the font for the band
and Rx frequency activity widgets have been added to the
Configuration UI to replace the file based font size control.
Free text macros now selected directly.
The free text line edit widgets are now editable combo boxes
that have the current free text macro definitions as their
popup list. The old context menu to do this has been
retired.
Astronomical data window dynamically formatted and has font a chooser.
This window is now autonomous, has its own font chooser and,
dynamically resizes to cover the contents.
Double click to Tx enabled now has its own widget in the status bar.
QDir used for portable path and file name handling throughout.
The "Monitor", "Decode", "Enable Tx" and, "Tune" buttons are now
checkable.
Being checkable allows these buttons control their own state
and rendering.
Calls to PSK Reporter interface simplified.
In mainwindow.cpp the calls to this interface are
rationalized to just 3 locations.
Manipulation of ALL.TXT simplified.
Moved, where possible, to common functions.
Elevated frequency types to be Qt types.
Frequency and FrequencyDelta defined as Qt types in their
meta-type system (Radio.hpp). They are integral types for
maximum accuracy.
Re-factored rig control calls in mainwindow.cpp.
The new Configuration proxy access to rig control required
many changes (mostly simplifications) to the MainWindow rig
control code. Some common code has been gathered in member
functions like qsy(), monitor(), band_changed() and
auto_tx_mode().
Rig control enhancements.
The rig control for clients interface is declared as an
abstract interface (See Transceiver.hpp). Concrete
implementations of this interface are provided for the Hamlib
rig control library, DX Lab Suite Commander via a TCP/IP
command channel, Ham Radio Deluxe also via a TCP/IP command
channel and, OmniRig via its Windows COM server interface.
Concrete Transceiver implementations are expected to be moved
to a separate thread after construction since many operations
are blocking and not suitable for running in a GUI thread.
To facilitate this all instantiation of concrete Transceiver
instances are handled by Configuration using a factory class
(TransceiverFactory) for configuration parameter based
instantiation.
Various common functionality shared by different rig
interface implementations are factored out into helper base
classes that implement or delegate parts of the Transceiver
interface. They are TransceiverBase which caches state to
minimize expensive rig commands, it also maps the Transceiver
interface into a more convenient form for implementation
(template methods). PollingTransceiver that provides a state
polling mechanism that only reports actual changes.
EmulateSplitTransceiver that provides split operation by
QSYing on PTT state changes.
EmulateSplitTransceiver can be used with any implementation
as it follows the GoF Decorator pattern and can wrap any
Transceiver implementation.
OmniRigTransceiver is derived directly from TransceiverBase
since it doesn't require polling due to its asynchronous
nature. OmniRigTransceiver is only built on Windows as it is
a COM server client. To build it you must first install the
OmniRig client on the development machine
(http://www.dxatlas.com/omnirig/).
DXLabSuiteCommanderTransceiver derives from
PollingTransceiver since it is a synchronous communications
channel. No third party library is required for this
interface.
HRDTransceiver also derives from PollingTransceiver. The HRD
interface library has been reverse engineered to provide
functionality with all available versions of HRD. No third
party libraries are required.
HamlibTransceiver likewise derives from PollingTransceiver
since the Hamlib asynchronous interface is non-functional.
Although this class will interface with the release version
of Hamlib (1.2.15.3); for correct operation on most rigs it
needs to run with the latest master branch code of Hamlib.
During development many changes to Hamlib have been submitted
and accepted, hence this requirement. Hamlib source can be
obtained from git://git.code.sf.net/p/hamlib/code and at the
time of writing he master branch was at SHA 6e4432.
The Hamlib interface directly calls the "C" interface and the
modified rigclass.{h,cpp} files have been retired.
There is a rig type selection of "None" which may be used for
non-CAT rigs, this is actually a connection to the dummy
Hamlib device.
PollingTransvceiver derives from TransceiverBase and
TransceiverBase derives from the Transceiver interface.
Each interface implementation offers some possibility of PTT
control via a different serial port than the CAT port. We
also support PTT control directly via a second serial port.
This is done by delegating to a dummy Hamlib instance which
is only used for PTT control. This means that
DXLabSuiteCommanderTransceiver, HRDTransceiver and
OmniRigTransceiver always wrap a dummy HamlibTransceiver
instance. The factory class TransceiverFactory manages all
these constructional complexities.
Serial port selection combo boxes are now editable with a
manually entered value being saved to the settings file.
This allows a non-standard port device to be used without
having to edit the settings file manually.
For TCP/IP network CAT interfaces; the network address and
port may be specified allowing the target device to be
located on a different machine from the one running wsjtx if
required. The default used when the address field is left
blank is the correct one for normal usage on the local host.
Selecting a polling interval of zero is no longer possible,
this is because the rig control capability can no longer
support one way connection. This is in line with most other
CAT control software.
In the Configuration dialog there are options to select split
mode control by the software and mode control by the
software. For the former "None", "Rig" and "Fake it" are
available, for the latter "None", "USB" and, "Data" are
available. Because tone generation is implicitly linked to
split mode operation; it is no longer possible to have the
software in split mode and the rig not or vice versa. This
may mean some rigs cannot be used in split mode and therefore
not in dual JT65+JT9 until issues with CAT control with that
rig are resolved. Single mode with VOX keying and no CAT
control are still possible so even the most basic transceiver
setup is supported as before.
Configuration now supports a frequency offset suitable for
transverter operation. The station details model
(StationList.hpp) includes a column to store an offset for
each band if required.
CMake build script improvements.
The CMakeLists.txt from the 'lib' directory has been retired
with its contents merged into the top level CMakeLists.txt.
Install target support has been greatly improved with the
Release build configuration now building a fully standalone
installation on Mac and Windows. The Debug configuration
still builds an installation that has environment
dependencies for external libraries, which is desirable for
testing and debugging.
Package target support is largely complete for Mac, Windows
and, Linux, it should be possible to build release installers
directly from CMake/CPack.
Cmake FindXXXX.cmake modules have been added to improve the
location of fftw-3 and Hamlib packages.
Version numbers are now stored in Versions.cmake and work in
concert with automatic svn revision lookup during build. The
version string becomes 'rlocal'± if there are any uncommitted
changes in the build source tree.
Moved resource like files to Qt resources.
Because location of resource files (when they cannot go into
the installation directory because of packaging rules) is
hard to standardize. I have used the Qt resource system for
all ancillary data files. Some like kvasd.dat are dumped out
to the temp (working directory) because they are accessed by
an external program, others like the audio samples are copied
out so they appear in the data directory under the default
save directory.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3929 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
