Commit Graph

26 Commits

Author SHA1 Message Date
Bill Somerville 4f4c535c4e Added audio channel support.
Audio input can be mono, left of stereo pair or, right of stereo
pair. Audio output can be mono, left of stereo pair, right of stereo
pair or, both of stereo pair (the same output goes to both channels in
both mode). Settings are remembered between sessions.

Stream channel suport is implemented mainly in the new AudioDevice
class which is now the base class of Modulator and Detector.

Audio channels are selected on the configuration screen. Only
supported channel configurations per device can be selected.

Audio output volume (actually attenuation) is now possible from the
GUI. I have added a slider control to the main window; I don't
necessarily propose this as a final release location for the widget as
I understand that changes to the main screen are sensitive. This
location is just a starting suggestion for a trial. The volume
(attenuation) setting is remembered between sessions and is not device
dependent. This addresses all issues of volume setting on *nix
versions since there is no need to use pavucontrol to set audio
levels. The volume (attenuation) action is logarithmic.

Shaped CW keying has been implemented in Modulator although it is
currently disabled as I am not 100% happy wth the implementation. If
you want to try it define the C++ preprocessor macro WSJT_SOFT_KEYING
in your build.

The Modulator instance has been moved to the same thread as the
SoundOutput instance as it should have been since the output callback
already operates in that thread. Cross thread slots are now correctly
called in a thread safe way as a result.

A number of files where in the SVN repository with DOS line endings
which I have removed. SVN users on Windows need set the config for
native line endings so that DOS line endings are automatically
stripped on checkin.

The DevSetup class now holds it's UI o the heap to reduce imapact on
build dependencies.

The application settings are now passed to objects from the main.cpp
file. Management of settings are moved to the responsible classes (top
level windows). This has involved a few settings moving groups so
users will see some settings reverting to default values on the first
run of an update.

Persistance of top level windows geometry and position is now handled
in the recommened manner (constructor for load, closeEvent for store
in modal windows and, hideEvent for store in modeless dialogs).

The MainWindow class now holds its children as members rather than
global variables.

The LogQSO class now hides its implementation and takes responsibility
for its own settings and widows rendering parameters. A new settings
file group is implemented to persist the LogQSO class settings.

The WideGraph class now hides its implementation and manages its own
settings and window rendering parameters.

  --This line, and those below, will be ignored--

M    Modulator.cpp
M    rigclass.cpp
M    widegraph.cpp
M    signalmeter.cpp
M    soundin.cpp
M    soundout.cpp
M    mainwindow.h
M    main.cpp
M    meterwidget.h
M    devsetup.cpp
M    mainwindow.ui
M    Detector.cpp
M    logqso.h
M    rigclass.h
M    mainwindow.cpp
M    meterwidget.cpp
M    soundin.h
M    devsetup.ui
M    wsjtx.pro
M    devsetup.h
M    logqso.cpp
M    Modulator.hpp
M    psk_reporter.cpp
M    killbyname.cpp
M    Detector.hpp
M    signalmeter.h
M    widegraph.h
M    psk_reporter.h
M    soundout.h
M    PSKReporter.h
M    lib/afc65b.f90
M    lib/gran.c
M    lib/usleep.c
M    lib/afc9.f90
M    lib/wrapkarn.c
A    AudioDevice.hpp


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-10 15:29:55 +00:00
Joe Taylor 61f023ddd1 Most of these changes are thanks to G4WJS. Audio I/O is now done using
Qt's built-in QAudio calls rather than PortAudio.  Also includes some
refactoring of the arrangement for these calls, and more use of C++ style.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3523 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-05 13:57:55 +00:00
Joe Taylor daf6c507ba Updates to User's Guide and credits.
Locale-aware communication with Commander (needs testing).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3519 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-01 14:38:35 +00:00
Joe Taylor 30712a3ce8 1. Full control of DTR and RTS on serial port used for CAT control -- patch
submitted by G4WJS.
2. Improved(???) means of multiple tries when polling radio for frequency.
3. Minor tweaks to widget sizes on devsetup screen.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3500 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-23 17:32:59 +00:00
Joe Taylor 982210157f Fix frequency-setting through Commander so that it works to nearest Hz.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3493 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-18 11:55:29 +00:00
Joe Taylor 4cc9a9be7a Compare dial freq with user's default freq, not the startup default freq.
Also some minor code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3476 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-10 13:57:13 +00:00
Joe Taylor f91f935a78 Fix another bug in setting frequencies through Commander.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3474 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 22:41:15 +00:00
Joe Taylor 3c2e14f838 1. Changes outlined for r3463 are now tested and appear to be OK.
2. Setting frequencies above 100 MHz now OK.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3464 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 23:08:25 +00:00
Joe Taylor 3dc6abc0c1 Merging code for v1.1 back into the main wsjtx branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 13:17:22 +00:00
Joe Taylor fc5d05394e Cleaning up compiler warnings on Linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3319 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-29 13:41:57 +00:00
John T Nogatch ff13e8d4b0 Ham Radio Deluxe is inside ifdef WIN32 conditionals
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3315 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-27 20:27:36 +00:00
Joe Taylor 5068b1254d 1. Keyboard shortcuts Alt+1 to Alt+6 set next Tx message to 1-6.
2. SoundOut buffer size can be set by editing wsjtx.ini.
3. Fixed bug in placement of #ifdef in rigclass.cpp


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3313 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-24 12:36:41 +00:00
Joe Taylor 2feb6bae81 OK, PTT switching via HRD now works, at least for the TS-2000.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3312 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 22:00:12 +00:00
Joe Taylor bf947a5d48 Correct a logic error in activating the PTTtest button.
Disable attempted control of T/R switching via HRD: it does not work, 
as coded.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3311 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 21:42:05 +00:00
Joe Taylor e1c052d058 Silence all compiler warnings from QtCreator.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3306 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 15:05:16 +00:00
Joe Taylor 207116f574 1. Implement PTT control via HRD.
2. Fix two more g95 compiler warnings.
3. Remove some unused code in getfile.cpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3305 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 14:52:51 +00:00
Joe Taylor d7f2ca2bd4 Added "#ifdef WIN32 ... #endif" around HRD interface code.
(Did I get them all??)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3291 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 21:36:34 +00:00
Joe Taylor d27b171368 Minor cleanup of HRD-related code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3290 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 21:31:11 +00:00
Joe Taylor f833e00699 More work on HRD interface.
*** Beware: some code in this revision will surely fail in Linux! ***
*** Some "#ifdef Win32" statements are still to be included.      ***



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3289 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 20:49:40 +00:00
Joe Taylor 22bb94dc02 First attempt at interface to Ham Radio Deluxe (HRD).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3288 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 19:49:41 +00:00
Edson W. R. Pereira 8ea1f5f2a5 Cleaned up remaining exception related code in rigclass.h and .cpp
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3249 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-01 12:21:19 +00:00
Edson W. R. Pereira da1b6ab5b3 Super cleanup on rigclass.h and .cpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3247 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-30 19:55:13 +00:00
Joe Taylor b0bfd5ffea This is test code!!
I have changed the declarations of the Rig class functions we use:

open()
setConf()
getFreq()
setFreq()
setPTT()
close()

... so that each one returns the (negative) error code returned by 
hamlib.  These functions no longer throw exceptions.

Initial tests seem to show things working well.  I have found one
condition that causes a crash.  The rig is initially opened and is
running OK (in this case, with the Polling interval set to 1 s).  Then
the radio is turned off.  The next call to getFreq() never returns.

Probably we need to set a timeout limit?

The code is kinda on the quick-and-dirty side.  Improvements will be 
welcom!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3246 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-30 18:54:11 +00:00
Edson W. R. Pereira ab4aa25cf3 Corrected GUI layout resizing issues on Linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3237 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-28 14:47:45 +00:00
Joe Taylor 66ef466795 Better handling of rig initialization, including suppression of unwanted
verbosity.  Thanks to John, AC6SL!  (Will get you authorized to commit, soon.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3231 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-26 22:06:22 +00:00
Joe Taylor 7fd8e42932 Once again, working to implement direct calls to basic hamlib functiions.
*** This code is not finished, and may not work correctly! ***


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3200 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-23 00:52:51 +00:00