Commit Graph

57 Commits

Author SHA1 Message Date
Joe Taylor
b88d1567a3 Don't poll radio while decoder is busy.
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
2013-07-10 16:45:13 +00:00
Joe Taylor
8f72b121a5 1. Set the default startup frequencies to reasonable ones for JT65.
(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
2013-07-09 15:44:33 +00:00
Joe Taylor
1fd596ce60 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
e5f777b5ee Warning: these changes have not yet been thoroughly tested!
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
2013-07-08 19:57:01 +00:00
Joe Taylor
8fb483a200 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
d3a8a54fba Add optional antenna description for PSK Reporter. (Presently implemented
only for Windows.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3344 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-06-06 17:40:09 +00:00
John T Nogatch
2415c6a3be Add /dev/ttyS4 - /dev/ttyS7 to list of linux serial devices.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3338 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-06-05 21:19:29 +00:00
Joe Taylor
5b9ec45e74 1. Correct a flaw in setting m_lockFreq in wideGraph.
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
2013-05-29 15:09:04 +00:00
Joe Taylor
a6f2044010 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
Joe Taylor
0b6205d455 1. Oops, inadvertently I clobbered a Win32-only line while editing unix
code.  
2. Add a Setup option "Tx freq locked to Rx freq."  Needs testing!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3318 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-28 19:34:18 +00:00
Joe Taylor
a170d9df1f 1. Correct the listings of Audio In and Audio Out devices, on unix-like
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
2013-05-28 19:16:25 +00:00
Joe Taylor
64c6b94776 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
612504ef27 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
67a99ccbc4 Working toward compiling WSJT-X under Qt5. It doesn't work, yet.
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
2013-05-23 19:35:37 +00:00
Joe Taylor
9321b6da6d 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
f1cc0f7928 Corrected a bug that prevented using Setup | Configuration without an
existing wsjtx.ini file.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3297 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 17:35:52 +00:00
Joe Taylor
30e9b3649d Enable/Disable catPort controls and labels according to need.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3292 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 00:31:53 +00:00
Joe Taylor
2ea895ac11 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
f838ee13b0 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
08fb25a57c 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
Joe Taylor
5307e65ae7 Revert to ComboBox for selecting PTT Port. (Straightened out the bizarre
ordering of items on the drop-down list.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3285 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-20 18:33:06 +00:00
Joe Taylor
921ec1e158 Change PTT Port from a QComboBox to a QlineEdit.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3284 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-20 15:43:56 +00:00
Joe Taylor
ba75745350 1. Correct annoying bug producing infinite "Error rigOpen -1" messages: must
do a rig->Close() if user has done "Test CAT Control" and then hit "Cancel".

2. Remove the "0%" part of Rx noise label; exchange positions of "Rx
Noise" and "QSO Freq" on Status Bar.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3260 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-07 18:19:15 +00:00
Joe Taylor
c9294eb9d6 Save m_pttPort when its comboBox is changed, so that the "Test PTT"
button can act accordingly.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3253 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-03 00:04:44 +00:00
Joe Taylor
0a3398a93e Gray-out the "Polling interval" control if CAT is not enabled.
UPdate Makefile.MinGW.
Much work new on User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3251 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-02 16:19:26 +00:00
Edson W. R. Pereira
1987b94685 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
Joe Taylor
c9e20f6f9d 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
Joe Taylor
d62a045e27 Starting to implement a "polling interval" option. More to come!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3245 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-30 14:34:45 +00:00
Joe Taylor
a75f2e0f10 1. Diasble any irrelevant widgets on Configuration screen.
2. Rationalize tab-order on main window.
3. Tweak the GUI appearance around DxCall, DxGrid.  (Hope it's still OK 
   in Linux!
4. Add helpful displays of Keyboard Shortcuts (F3) and Special Mouse
   Commands (F4).
5. Bump version number to 0.95.
6. Update the Windows packaging script.
7. Update ChangeLog in preparation for possible release of v0.95 r3226.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3226 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-26 16:23:18 +00:00
Joe Taylor
b954f1d85d "Data" and "Mic" options for PTT via CAT control.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3223 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-25 22:57:08 +00:00
Edson W. R. Pereira
34b2fa7251 Some cosmetic adjustments tot he GUI layout.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3222 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-25 18:57:32 +00:00
Joe Taylor
998c3990a4 Comment out diagnostic calls to rig->getVFO().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3221 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-25 18:48:57 +00:00
Joe Taylor
1f2ed5d8d8 1. Better (and faster) logic for Tune button ON/OFF actions.
2. Pink highlighting for empty MyCall and MyGrid fields on Setup screen.
3. Working on better diagnostics for users trying to set up CAT control.  

(More progress still needed, on rig control.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3219 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-25 17:30:20 +00:00
Joe Taylor
1ceba579ff Add a setup checkbox "RTS/DTR Off", to enable proper CAT control of
Elecraft K2 (and possibly other rigs?).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3209 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-24 19:41:58 +00:00
Joe Taylor
876d4dcd26 1. Fixed a bug causing seemingly random crashes when compound callsign
is decoded.
2. Fixed minor bug in the "Test PTT" function.
3. Background of DialFrequency label goes red if frequency differs from
default for this band by mode than 10 kHz.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3208 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-24 17:55:33 +00:00
Joe Taylor
d95e900636 1. Removed all vestiges of rigctl use. Now using calls to hamlib
functions.  

2. Restored "Test CAT Control" and "Test PTT" buttons on the 
Setup | Configuration screen.

These features need thorough testing!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3204 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-23 20:46:04 +00:00
Joe Taylor
3ed5f2ec35 Backed out the changes from r3171 to r3172 -- too buggy at present.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3173 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-15 21:13:31 +00:00
Joe Taylor
b02d298518 1. CAT control now working with calls to hamlib functions.
Needs testing!!!
2. Added "Test CAT Control" and "Test PTT" buttons on 
   Setup | Configuration screen.  (Must fix flaky behavior of calls to ptt().)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3172 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-15 20:20:06 +00:00
Edson W. R. Pereira
fea674de12 1. Added comport list as per OS type
2. Adjusted layout od devsetup dialog


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3100 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 20:42:25 +00:00
Joe Taylor
0516a86dd8 1. Tweak the DialFreq label; remove similar label from Wide Graph window.
2. Add a tab for Default Frequencies on Setup window.
3. Update Makefile.MinGW
4. Bump version number to 0.8.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3097 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 19:13:49 +00:00
Joe Taylor
12523c42a4 Implemented CW ID.
Signal reports 0 dB and above now displayed as "+03", "+16", etc.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3089 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 01:24:47 +00:00
Joe Taylor
17bba63b1f Starting to implement CAT control. Not finished yet, and there may be bugs!
PTT control not yet done...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3078 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-24 12:55:13 +00:00
Joe Taylor
5af5bd6598 Some tweaks to the Tx macro code, and a few small clean-ups.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3070 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-22 19:57:32 +00:00
Joe Taylor
71ca3fc1c0 LogQSO now has a confirmation step where you can edit the log entries.
Tx macros are now enabled.
Bug in decoder fixed.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3068 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-21 22:58:16 +00:00
Joe Taylor
250623517b Import Edson's Linux setup code for audio devices from WSPR-X.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3064 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-21 14:14:26 +00:00
Joe Taylor
2b1fd7dbce Allow COM port numbers up to COM99.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3047 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-13 18:47:34 +00:00
Joe Taylor
922226de7a Starting to implement uploading to PSKReporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3042 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-10 02:45:12 +00:00
Joe Taylor
abe540754b Use correct upper/lower case for MyCall, MyGrid.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2770 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-24 16:30:39 +00:00
Joe Taylor
332bea90f8 Put in some (temporary?) "#ifdef WIN32" statements, so that it will
compile under Linux.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2741 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-16 15:57:42 +00:00
Joe Taylor
0348b93a5e Much code cleanup: remove unised variables and code.
Include # channels in audio device offerings.
Start implementing "msgsent" correctly.  (Not finished!)
Include Date in UTC display.
Use the properly computer snrdb.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2718 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-12 16:33:45 +00:00