Commit Graph

1473 Commits

Author SHA1 Message Date
Bill Somerville
35cde3e35a Install a Hamlib-3 version of rigctld with WSJT-X.
Because  WSJT-X currently  uses Hamlib-3  (statically linked)  it also
needs a  version of  rigctld with Hamlib-3  statically linked  for any
user that  wishes to  use the  "Hamlib NET  rigctld" CAT  interface to
remotly access a rig via IP using the Hamlib network control protocol.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4297 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-10 16:43:24 +00:00
Bill Somerville
2099db5ea9 Tidy up DX Lab and HRD interface implementations
Applied techniques  learned from  dealing with  HRD quirks  and TCP/IP
client   issues   on  Windows   to   the   DX  Lab   Suite   Commander
interface. These changes should hopefully make both the HRD and DX Lab
Suite CAT  interfacing more robust  in the  face of network  and other
latency issues or server failures.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4296 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-10 09:18:41 +00:00
Bill Somerville
098ec3f923 Similar TCP/IP retry mechanism for DX Lab as that used on with HRD.
Assume     the    defect     requiring    occasional     retries    of
QTCPSocket::waitReadReady() is  generic; the  same retry  mechanism as
used in  the HRD interface  has been impelemnted  in the DX  Lab Suite
Commander TCP/IP interface.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4295 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-10 09:18:32 +00:00
Joe Taylor
ff7ffe2943 Update text for mouse commands and keyboard shortcuts.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4282 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-09 14:46:48 +00:00
Joe Taylor
dcafdb6b99 Look for "txboth" as /tmp/txboth.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4271 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-08 14:57:26 +00:00
Bill Somerville
78f398f99c Ensure monitor mode is enabled when tune button clicked.
Monitor mode  was not  being enabled when  clicking the  "Tune" button
which could mean that neither split  mode nor the correct TX frequency
were being set.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-08 10:56:35 +00:00
Bill Somerville
3e5f6d61e4 Fix defect with initial split mode setting.
Split mode  was not being enabled  when enabling monitor mode  for the
first time if the rig split VFO was already at the required frequency.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4269 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-08 10:56:27 +00:00
Bill Somerville
91839b0340 Improved diagnostic messages from Hamlib interface.
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
2014-09-08 10:56:18 +00:00
Bill Somerville
3ea0563e84 Improve socket write handling in HRD interface.
The TCP/IP socket write handling in teh HRD inteface was naive and did
not handle  incomplete writes t all.  This change loops until  all the
payload is written for each command sent.

Also error  handling is improved  so that a  socket in an  error state
cannot get used inadvertenly.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4263 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-07 23:42:10 +00:00
Bill Somerville
127e027671 Fix HRD button and drop down addressing defects.
Checks for existance of one button and one drop down were incorrect.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4257 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-06 21:09:09 +00:00
Bill Somerville
e8e5ffefe9 Change recent HRD retry to only retry reply check.
Because of  a possible Windows or  Qt defect in TCP/IP  received bytes
detection  it  seems  necessary to  retry  QTCPSocket::waitReadReady()
blocking calls after a time out response as there may actually be data
waiting.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4256 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-06 20:30:05 +00:00
Bill Somerville
7e2cf9b9e6 Fix rendering of examples in jt65code man page.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4255 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-05 18:53:55 +00:00
Bill Somerville
684b8edbd8 Reinstate building of jt65code and add jt9code and jt65code to deployment.
These programs are  mentioned in the user guide so  have been added to
the depolyable packages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4254 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-05 18:36:10 +00:00
Bill Somerville
eccd80758a Define WSJT-X manual URL in a single place.
Since the manual URL is used in both the installer and the WSJT-X code
the definition of  the URL (CMake variable  PROJECT_MANUAL) is defined
in  the  CMakeList.txt file  and  propagated  to  the source  via  the
wsjtx_config.h header.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4252 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-05 17:10:01 +00:00
Joe Taylor
4e3afe3a32 Change the URL for User Guide to that for the new v1.4 guide.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4251 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-05 15:55:49 +00:00
Bill Somerville
8e50ba4924 Fix persistence of CAT serial/network port.
Enhanced the  logic for saving  and restoring to/from settings  of the
shared configuration field for CAT serial port and CAT network port so
that  old  values are  not  discarded  and  new values  are  correctly
recovered on restart.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4245 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-04 09:59:27 +00:00
Bill Somerville
8ec955ff37 Do not overwrite CAT/network port name after reading settings.
The CAT/network port name was being overwritten with the CAT port name
during startup so  if the port was  a network device it  was not being
persistent across restarts.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4243 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-03 21:59:04 +00:00
Bill Somerville
390a5d7a97 Add retries to HRD send command mechanism.
It appears  that the  HRD logbook  interferes with  the HRD  IP server
causing it  to fail to  respond to pending commands.  This enhancement
adds a number of retries to the send command to HRD operation.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4241 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-01 17:33:05 +00:00
Bill Somerville
d4e69f0b23 Make temp directory unique in test mode.
The Qt  test mode  that uses  special paths  for writeable  files (via
QtStandardPaths)  doesn't make  a special  temporary file  path.  This
change appends " - test_mode" to the WSJT-X unique temporary file path
so that an application run in test mode will not interact with another
running in normal mode.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4240 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-01 15:55:59 +00:00
Bill Somerville
5d4af665ed Allow for inconsistent Hamlib return codes.
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
2014-09-01 10:27:31 +00:00
Bill Somerville
538132899e Do not fail when HRD functions are not available.
Because some HRD rig interface implementations are lacking features we
need, instead of failing fatally when  a needed feature is missing, we
now do not require the missing feature. This means that some rigs will
not work  correctly, for example  setting split,  PTT or mode  may not
work if no such feature is present in the HRD interface.

This came  about due to  the TenTec Omvi  VII HRD interface  having no
split, vfo  selection or,  PTT facilities. With  this change  at least
some basic functionallity is possible.

Not being able to set split  is potentially dangerous since WSJT-X may
set tones assumeing a split TX  frequency. Until the HRD CAT interface
has a mechanisim to signal the missing capability we will have to hope
that users  realise the deficiency  and don't attempt to  enable split
working on such a setup.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4235 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-08-30 20:01:13 +00:00
Bill Somerville
124c0ac70c Allow Hamlib rig_get_ptt call to fail if function unavailable.
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
2014-08-30 19:28:55 +00:00
Joe Taylor
05b7c4680b Tweak the JT65 decoder so that it accepts DT down to -3.3 s.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4225 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-31 17:22:51 +00:00
Bill Somerville
a3502777b9 Use default PTT type in Hamlib when CAT is selected.
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
2014-07-27 21:14:33 +00:00
Bill Somerville
a66780bf0e TXAudioSource was not being saved as an enum in settings.
The TXAudioSource  was being saved as  a boolean value instead  of the
enumeration value.  This caused the  read back from settings  logic to
fail silently.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4220 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-25 22:13:52 +00:00
Joe Taylor
23dced98fe Change title of config window to "Settings" (the name used on the
File menu).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4219 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-25 19:34:48 +00:00
Bill Somerville
7d65d5744c Audio source (mic/data) was not being persisted correctly in settings.
An old settings key was lurking in the Configuration code.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4218 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-25 17:12:37 +00:00
Joe Taylor
4194d1f234 Back to "Settings...", etc., following discussion with G4WJS.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4214 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-24 16:58:58 +00:00
Joe Taylor
f4c7e0a131 Replace the ellipses (...) on certain control labels.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4213 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-24 12:31:19 +00:00
Joe Taylor
c88d694bc3 Minor tweaks to GUI appearance, etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4210 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-23 17:16:35 +00:00
Joe Taylor
32b84196fc Simplify GUI labels.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4206 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-21 20:25:05 +00:00
Joe Taylor
ed6d969f36 Testing a small change to widegraph.ui.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4205 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-21 17:52:45 +00:00
Joe Taylor
1093e07994 Always allow JT65 decoding above the blue line, when in JT9+JT65 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4198 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-09 12:58:12 +00:00
Bill Somerville
245a6902c5 Added CMake option to control experimental features.
Sometimes parts of the application are  not fully ready for release at
release  time.   This  option  allows  such  features  to  be  enabled
conditionally at configure time.

The CMake option WSJT_ENABLE_EXPERIMENTAL_FEATURES  is used to control
this ability.  Normally  you will not need to change  it as it behaves
in a reasonable  way.  The option is ON in  debug build configurations
and OFF in non-debug configuratiuons.

The  option  is   made  available  in  all  source   modules  via  the
WSJT_ENABLE_EXPERIMENTAL_FEATURES macro  which is defined to  1 if the
option is ON and to 0 if it is OFF.

Since this  default behavior is  potentially dangerous because  it can
mean that release builds contain different code from debug builds; the
option may  be set to  OFF in debug  configurations in the  normal way
(cmake-gui,  edit  CMakeCache.txt, etc.)   to  achieve  a debug  build
similar to a default release build.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4182 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-06-19 16:47:49 +00:00
Bill Somerville
0b1c7252a2 Ignore Hamlib error when using fake split without CAT split control.
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
2014-06-16 09:39:04 +00:00
Bill Somerville
154b64b183 Maintain cursor position during free text edits.
The validation processing of the free text line edit field was causing
the cursor position to be lost.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4148 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-22 11:09:21 +00:00
Bill Somerville
99444bce7c Fix issue with non-modal window lifetimes.
Some non-modal help windows were not being automatically closed on
application exit.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4143 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-15 11:41:18 +00:00
Bill Somerville
ea567db752 Make qmake project file more generic.
It is now possible to override the default locations hard coded in
this file with local preferences.

The variables that can be overridden are HAMLIB_DIR and DESTDIR.

To override, add local variable assignments on the intial qmake
command line. E.g.:

qmake HAMLIB_DIR=c:\my\local\hamlib\installation DESTDIR=c:\my\local\install\destination



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4141 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-14 19:14:37 +00:00
Joe Taylor
dbf9faaa21 Fix several problems in wsjtx.pro, for qmake builds.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4140 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-14 17:43:30 +00:00
Bill Somerville
c1312cab88 Fix qmake build issue where CMake generated macros were erroneously
being used in non-CMake builds.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4139 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-14 17:32:31 +00:00
Joe Taylor
04aa994253 Testing the UI mods suggested by W7DLG. Margin widths are reduced
to minimum in several places so that window contents extend to the
edges and widgets are packed more tightly.  Arguably this makes
better use of available screen space.

Comments will be appreciated!  If people don't like these changes,
they can be reverted.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4138 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-14 15:07:51 +00:00
Bill Somerville
9b9749aaab Correct ordering of commands sent to HRD when emulating split mode.
Frequency changes must be made while the rig is in RX mode otherwise
they can end up getting ignored on some rigs.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4137 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-14 12:00:31 +00:00
Bill Somerville
25dee5529c Added some commentary to HRDTRansceiver.{hpp,cpp}.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4136 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-14 12:00:23 +00:00
Bill Somerville
56980a3ef6 Allow for HRD on rigs where more than one mode maps to Tranceiver::MODE.
Some rigs  like the FT-857(D) have  multiple modes that only  have one
representation in the Transceiver class,  e.g. FM, FM(N) and WFM.  The
HRDTransceiver class  now allows  multiple modes to  be mapped  to one
Transceiver::MODE, the  last match  in the HRD  mode dropdown  is used
when  mapping  a Tranceiver::MODE  to  a  HRD  mode setting  which  is
normally the most suitable mode.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4135 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-05-14 12:00:11 +00:00
Bill Somerville
a2dcab3560 Only use QCommandLineParser if Qt 5.2 available.
I had inadvertantly  locked WSJT-X into Qt 5.2 or  later by using this
class  which  only  appeared  in  Qt  5.2.   I  have  made  the  usage
conditional on  Qt version  so that  builds still work  with any  Qt 5
version.

As a result builds against Qt  version < 5.2 no longer support command
line arguments, so multi-instance support now requires Qt 5.2.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4063 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-23 13:56:03 +00:00
Bill Somerville
b25019ed0a Fix a regression introduced in r3986 - no decode after "Halt TX".
The new suspend/resume approach to  the received audio stream causes a
reset to the input sample buffer  on resume. This is desired behaviour
except when the stream in not actually suspended. The monitor function
was not checking this when resuming monitoring and this caused decodes
for a period to be abandonded simply  by using the "Halt TX" button to
turn off automatic transmission mode.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4059 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-21 14:39:39 +00:00
Bill Somerville
e58f9d0c73 Backed out component install changes that inadvertenly got commited as
part of r4046. These caused GUI installer packages to be incomplete.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4058 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-21 12:21:44 +00:00
Bill Somerville
c26c274093 Tidy up error message in manpage sub-project.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4057 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-21 11:49:20 +00:00
Bill Somerville
eef3d6be3d Make manpage generation optional for casual builders.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4056 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-21 11:38:17 +00:00
Bill Somerville
5736c355a4 Another attempt to get sed to work on both Mac and Linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4051 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-20 14:28:02 +00:00