The ".quit" file that is used to communicate shutdown to the "jt9"
sub-process was not getting deleted under some obscure
circumstances. If "wsjtx" is started with the ".quit" file in place;
"jt9" starts and stops immediately rather than going into it's normal
wait state. Probably some sort of race condition between the two
processes dying and file and/or shared memory locks.
Rather than track the issue down I have added code to ensure that
".quit" is removed before starting "jt9".
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3586 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The filter used for 4 times down-sampling cannot handle sample streams
where the hardware or drivers deliver chunks of data that are not
multiples of 4 frames long. This seems to be prevalent on some Linux
platforms. Also de-interleaving of single channel audio from stereo
streams was no longer supported.
I have changed the input strategy to de-interleave the incoming
sample stream into an intermediate buffer large enough to hold all the
samples required for a single unit of processing (one basic waterfall
interval) and apply the down-sampling filter to the whole intermediate
buffer just prior dispatch to the FFT generator.
This now means that we are now using the ubiquitous 48kHz hardware
sample rate for both input and output of audio across all platforms
and decoding a single channel of a stereo stream is again
supported. The down-sampling to 12kHz is done with a high quality FIR
49-tap low pass filter specifically designed by Joe (K1JT) for
operation in a 4kHz bandwidth.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3585 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Removed commented code left over from previous edits in MainWindow::doubleClickOnCall()
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3584 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
48kHz to 12kHz down sampler routine.
Added assert to disallow stereo processing of i/p samples
until fil4.f90 can deal with interleaved stereo streams.
Added QProcess error to jt9 error handler, not that anything
is done with the error code yet but at least it can be examined
in the debugger if required.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3583 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Please note that I removed the option "-mno-stack-arg-probe" from CFLAGS.
Was there any good reason for it still being there?
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3582 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
By adding the following section to the initialisation file the audio buffer
sizes and audio thread priority may be adjusted.
[Tune]
Audio\InputBufferFrames=1200
Audio\OutputBufferMs=1000
Audio\ThreadPriority=4
The values above are the program defaults that will be used if the
initialisation parameters are omitted.
Thread prioritis are the QThread::Priority enumumeration values.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3576 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Clear the "Name" field after logging a QSO.
3. Add fil4.f90, a subroutine for downsampling from 48000 Hz to 12000 Hz
sample rate. (Not yet incorporated in WSJT-X, but intended to be called
from arounf line 51 in Detector.cpp.)
4. Minor updates to User's Guide.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3570 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. The main window can be expanded wider to allow those with large screens to use larger fonts
3. New class DecodedText handles the formatted text from decoder.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3564 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Change source URLs in teh CMake scripts for the kvasd binaries.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3563 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
initialisation list to avoid a null pointer issue in restoring the
settings on startup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3557 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Remove offending redefinition of "struct timezone" in timeval.h, it's
no longer needed. (Let me know if this breaks anyone's build procedure!!)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3552 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
It's necessary to convey "appDir" from the GUI to jt9, so that jt9
can find the .lock and .quit files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Moved some of the text handling code from MainWindow to Displaytext
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3550 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. The available character count is now updated by catching resizeEvents
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3545 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Detector no longer collects samples when transmitting or not
monitoring. This was causingissues with the waterfall after tx periods
and was a waste of CPU cycles.
Correct the missing window title on the waterfall window.
Stop and restart the output audio stream if the configuration of
device or channels changes in the setup dialog. This defect was
causing spurious transmissions after changing configuration.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3543 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
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
2. Fix jt9 so that decoding starts at fStart (which now may be non-zero).
3. Improved or new Tool Tips for some GUI controls.
4. Updates to User's Guide.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
-changed log to hash table for faster lookup
-improved ADIF compatibility
mainwindow.ui
-fixed typo in menu entry
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3538 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Remove (or comment out) most qDebug() statements.
3. Swap positions of labels 2 and 3 on status bar.
4. In "Split Tx" mode, transmit audio always between 1500 and 2000 Hz.
5. Rearrange positions of WideGraph controls.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3535 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Currently only Qt5 or above is known to work with this code. It may be
possible to backport it to Qt4 if required.
Audio output goes back to a separate thread to try and minimize
stutters in streaming on Windows particularly.
A crash on Linux due to mishandling of stereo audio output has been
fixed and both left and right channels are now correctly synthesised
with identical contents.
Rigs are enumerated directly from hamlib API rather than running a sub
process reading output of rigctl -l. This was initially done to get
rid of some GUI thread blocking in the configuration dialog, but is
generally a better way of doing it anyway.
Some refactoring in MainWindow to accomodate the audio streaming,
modulation and detecting classes.
Exit handling for application refactored to use signals rather than
brute force event loop exit. This was required to get correct thread
shutdown semantics.
The GUI update timer is now stopped during application shutdown which
is necessary to stop crashes when shutting down gracefully with
signals and window close() calls.
There is an outstanding issue with Linux audio streams; the QAudio
Input/Output classes create a new stream name each time a stream is
started. This doesn't play well with PulseAudio utilities such as
pavucontrol to set stream volume as settings are lost every tx
period. I have tried to keep a single stream for all output but there
are problems restarting it that haven't been resolved yet.
The QtCreator project file has been rearranged a little because it
passes all the object files to the linker rather than using an archive
library. Since the GNU linker is single pass; the object files need to
be in a logical order with definitions appearing afer references to
them. This was required to avoid a linking error.
The lib/Makefile.linux has been enhanced to use the fortran compiler
to locate the correct version of the Fortran library to use. This is
necessary on the latest Linux distros because the unversioned symlink
to compiler support libraries is no longer provided. This only an
issue with mixed programming language links where the linker driver
for one language has to link support libraraies for another language.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3532 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Minor adjustments to position of WideGraph controls.
3. Include the palette files. The whole directory "Palettes" should
be copied into the install directory.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3529 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
1. F1 accesses User's Guide for v1.2.
2. Larger font for "S" on the ui->readFreq button.
3. Finish removing the no-longer-used #ifdef's relaied to psk_reporter calls.
4. Set m_ntx=6 (Tx message #6) at program startup.
5. Remove obsolete file soundin_1.cpp.
6. Update credits displayed in the "About" window and in User's Guide.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3527 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
No more need for PSKReporter.dll.
Remove the no-longer-needed "#ifdef WIN32", "#ifdef UNIX" blocks.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3524 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
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
The old Makefile.MinGW has been renamed Makefile.MinGW.qt4.
Be sure to check settings in lines 13-19 of wsjtx.pro.
Soon to come: Permanent changeover from PortAudio to QAudio ?
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3521 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
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
They are restored here.
2. Fix a bug that failed to compute correct audio Tx frequency after
program restart, if Split Tx is enabled.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3516 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
New link to User's Guide for v1.1.1.
Portaudio.h should not be in SVN.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3515 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Add basic proof-of-concept code that uses QAudioInput instead of
PortAudio for sound input. By default, this test code is not active,
and it compiles using PortAudio. To compile using QAudio, uncomment
the line
#DEFINES += QAUDIO_INPUT
in wsjtx.pro. Note that device selection in the QAudio code is presently
hard-wired to use the default input device. You can change this
choice on line 267 in soundin.cpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
the main GUI thread (thanks to G4WJS).
2.. Also, for the record, some example code for using QAudioInput instead
of PortAudio. This code is not presently active, and will need to be
changed to accommodate the changes in #1, above. But the basic ideas
are here...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3509 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Add "S" to freqRead button when "Split Tx" has been selected.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3508 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
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
Running multiple instances now checked out in Linux, as well as Windows.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3496 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
and if CTRL is held down it should set Tx as well as Rx freq. Fixed.
2. Improve the logic for suppressing duplicate JT65 decodes.
3. Disable the "Advanced" item on Setup menu.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3491 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
checked on the previous program termination.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3487 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
to kill running instances of jt9.exe. Note, however, that multiple instances
still won't work, because each wsjtx-jt9 pair needs its own shared memory
region.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3485 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Dont allow SplitTx operation with Ham Radio Deluxe.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3478 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
(JT9 will typically be about 2 kHz higher.)
2. Add a few default Tx macros, as examples.
3. Fix display of correct UTC on decoded lines, when "Shift+D" is used to
do another wideband decode during the next Rx sequence.
4. Clear the "Split Tx" checkbox when CAT is not enabled (but remember
what its state should be, if CAT is re-enabled).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3468 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Use ptt_() function included in getfile.cpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
1. Correct the TxMode label on program startup.
2. Insert TxMode (not RxMode) into the "Transmitting..." lines in ALL.TXT.
3. Put TxMode in wsjtx_status.txt.
4. F4 clears Az, Dist, and all Tx messages as well as DxCall and DxGrid.
5. Make it possible to decode JT9 in the "JT65 region", and vice-versa, with
directed double-click on signal in waterfall.
6. Improved logic for enabling/disabling TestPTT button on setup screen.
7. Do not call getFreq() when TestPTT is activated under CAT control.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3463 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Please note: features added today need more testing that I have yet given
them!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3345 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Added option to retain between QSOs the Comments field for ADIF and
wsjtx logs.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3343 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
If paOutDevice was not a saved setting, use Pa_GetDefaultOutputDevice().
This allows wsjtx to startup with default audio on a new install.
However, it does not set the menu index numbers, so the Config SoundIn/Out
menus do not look correct, until they have been set and saved once.
It would be better if only the device names were saved in settings,
because the index numbers can change, especially if USB soundcards
are added or removed.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3339 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Double-click on a 73 message sets Tx5, rather than Tx6.
3. Clean up a few remaining compiler warnings.
4. Clean up Tab order.
5. Updates to User's Guide
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3320 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
platforms.
2. This might be temporary: set Audio output on unix platforms to stereo,
i.e., channels=2. On my Ubuntu system, at least, this makes it play
correctly on all of the relevant audio devices in the list, including
hardware and virtual (".asoundrc-implemented") devices.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3317 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2. Removed all vestiges of NB code and controls.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3314 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
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
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
The present code is still OK in Qt 4.x. For Qt5, must replace
#include <QtGui> by #include <QtWidgets> in several places, and
uncomment these lines
//#include <QtConcurrent/QtConcurrentMap>
//#include <QtConcurrent/QtConcurrentRun>
in mainwindow.cpp. More work still to do, for Qt5!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3309 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
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
jt9a.F90 in order to suppress a compiler warning.
2. Updated Makefile.linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
*** 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
memory region smaller by some 150 MB.)
2. Some code cleanup (removing unused lstrong, etc.)...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3283 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
