Commit Graph

871 Commits

Author SHA1 Message Date
Bill Somerville
2cfbb15b4f Rig control overhaul to implement generic Doppler shift tracking
The  concept of  a nominal  receive  and transmit  frequency has  been
introduced. This is  used as a base frequency  for Doppler correction,
frequency setting  and reporting. The  start up frequency is  now zero
which is  updated by the first  rig control status report.  This needs
more  work to  accommodate  calling frequency  plus working  frequency
operation as is used for random MS operation etc..

The  main  window  frequency  display  now  shows  the  transmit  dial
frequency while transmitting.

The mode changing logic sequence has been changed such that the rig is
correctly put  into and  taken out  of split mode  as required  by the
target mode.  This also  avoids the "other"  VFO having  its frequency
changed when  entering a mode that  does not use split  operating like
WSPR.

The main window  band combo box edit  may now be used to  input an kHz
offset  from the  current MHz  dial  frequency. This  is intended  for
setting  a sked  or working  frequency on  the VHF  and up  bands. For
example the working frequency for 23cms  might be set to 1296MHz and a
working  frequency of  1296.3MHz would  be selected  by selecting  the
23cms band  with the combo box  drop down list and  then entering 300k
into the band combo box edit widget.

When using JT4 modes a CTRL+Click on the waterfall adjusts the nominal
frequency such  that the frequency  clicked on  becomes the Tx  and Rx
frequency using  the fixed 1000Hz  DF that  JT4 modes use.   This will
probably be extended to all QSO modes when used in VHF & up mode. This
assumes that 1000Hz is an optimal DF  for both Tx and Rx and therefore
one  can "net"  to an  off frequency,  but visible  on the  waterfall,
caller with one click.

Improvements to OmniRig  rig control including use of  the serial port
control lines RTS or DTR, on the  CAT serial port used by OmniRig, for
PTT control.

Incrementing transaction sequence numbers added to messages to and from
the rig control  thread. This enables round trip status  to be tracked
and associated with a request. For  example a command that might cause
several  asynchronous  status  updates  can  now  be  tracked  in  the
originating thread such  that it is clear which updates  are caused by
executing the  request. This in turn  allows updates to be  held until
the request is complete i.e. the  state is consistent with the results
of the request.

Messages  to the  rig control  thread are  now posted  as a  new state
(Transceiver::TransceiverState) object. The  rig control thread tracks
requests and  actions any differences  between the prior  requests and
the new state.

The rig  control thread is now  stored on the  heap so that it  can be
closed down  and released as needed.  Along with this the  rig control
close  down  semantics  are  better defined  avoiding  some  potential
deadlock situations.

If the rig  is placed into split  mode it will be  reverted to simplex
mode when the rig connection is closed.

When  using direct  rig control  via Hamlib,  rigs that  have A/B  VFO
arrangements and  no method to query  the current VFO like  many Icoms
and  the Yaesu  FT-817/857/897(D)  series now  have smarted  frequency
updating requiring no  VFO changes when changing  the frequency.  This
is particularly  important when doing  Tx Doppler correction  to avoid
glitches.

The implementation  of emulated  split operating  mode ("Fake  It") is
simplified and improved.

A dummy  Hamlib transceiver for PTT  control on a separate  port is no
long instantiated if CAT or VOX PTT control is selected.

The resolution and  any rounding of the rig CAT  frequency set and get
commands is determined automatically  upon opening the rig connection.
This is needed to determine the  rate of frequency updates for Doppler
tracking. It also allows the rig to be more accurately controlled.

Frequency  calibration is  calculated separately  for the  receive and
transmit frequencies.

Whether  the  rig  modulation  mode  should be  controlled  is  now  a
constructor  argument rather  than  being passed  with individual  rig
control requests.

Doppler  shift  correction  is   considerably  enhanced  with  simpler
controls and much  better rig control.  A new mode  of tracking called
"receive only" is introduced for those with rigs that cannot be QSY:ed
via  CAT  when transmitting.   Such  rigs  have a  Doppler  correction
calculated  for the  middle of  the next  transmit period  just before
transmission starts. While  using Doppler tracking it  is now possible
to adjust the  sked frequency either using the new  kHz offset feature
of the main  window band combo box  or by directly tuning  the rig VFO
knob while holding down the CTRL key.

The astronomical data window that includes Doppler tracking control is
now opened  and closed using a  checkable menu item to  avoid it being
accidentally closed.

Debug  configuration  rig  control  diagnostic  messages  now  have  a
facility argument for clearer and more standardized trace messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6590 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-06 17:11:58 +00:00
Joe Taylor
bcdd28a038 Add markers for RO RRR 73 messages on the Wide Graph scale.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6557 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-24 16:46:52 +00:00
Joe Taylor
33581198e6 1. Generate shorthand JT65 messages for RO, RRR, 73.
2. Fix background colors for special message types.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6556 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-24 15:44:48 +00:00
Joe Taylor
3e091fca99 Improved GUI control and display of averaged and hinted decodes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6548 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-22 14:12:59 +00:00
Joe Taylor
846ddf9039 1. Clean up GUI features releted to message averaging and deep search.
2. Make averaging and DS separately selecteble.
3. Clear nftt and avemsg on Clear Avg.
4. Allow fer65 to handle message averaging.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6543 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-21 16:03:11 +00:00
Joe Taylor
331402213a Several changes for single-decode behavior:
1. Use "f" to flag FT decodes, 'h' for hinted decodes.
2. Let "Experience-based" checkboxes activate hinted decoding.
3. Singls-sequence decodes go to left window, average decodes to right.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-20 19:32:08 +00:00
Bill Somerville
e02dc28ce2 Fix compiler error on 64-bit systems
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6523 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 21:54:33 +00:00
Bill Somerville
ab52a7f0ea Tidy up WAV file reading and fix WAV input rate conversion defect
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6521 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 19:48:54 +00:00
Joe Taylor
80873a6040 Implement "Single decode" logic; write to "avemsg.txt" in jt65_decode;
list the correct UTC in decoded text line when using the "Decode" button.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6519 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 18:35:41 +00:00
Joe Taylor
697886465d Fix a bug in read_wav_file() that made it process and return too few
data points when files with sample rate 11025 Hz are read.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6518 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 16:36:31 +00:00
Joe Taylor
dfb8dc7422 Add a "Single decode" checkbox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6516 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 15:13:06 +00:00
Joe Taylor
a0318d3a0a Calibration of the "Degrade S/N of .wav file" requires knowledge of receiver bandwidth.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6491 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-23 19:37:38 +00:00
Bill Somerville
1ec6d07e8f Fix regression when reading WAV files
Decoder needs the number of samples not the number of bytes.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6489 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-23 18:28:37 +00:00
Joe Taylor
764e2f95d5 Fix up message generation when short messages are used and decoded.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6466 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-04 17:30:04 +00:00
Joe Taylor
cca53ff18a Remove diagnostic prints.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-04 16:12:25 +00:00
Joe Taylor
1ee6659101 Further improvements to decoder for short JTMSK messages.
In mainwindow.cpp, return after executing call to fastSink().  ###???###


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6464 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-04 16:10:55 +00:00
Joe Taylor
95a3c00eda Pass naggressive to fast_decode(). Display <...> messages only if naggressive>0.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6463 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-03 20:23:52 +00:00
Bill Somerville
dc69144396 Better debug messages for WSPR spotting issues
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6460 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-02 18:28:12 +00:00
Joe Taylor
adb10ebfa7 Enable generation of JTMSK short messages and reports.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6421 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-22 18:10:39 +00:00
Joe Taylor
a74d000c32 Correct the Tx message length and adjust reported SNR for short JTMSK messages.
Commit some things omitted last time.   


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6420 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-22 17:06:57 +00:00
Bill Somerville
16cec2e7df Fix another CLang++ warning
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6410 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-20 20:50:24 +00:00
Joe Taylor
e1ceeb6d12 Adjust the GUI to accommodate JTMSK shorthand messages. (NB: Tx message
echoed with yellow background is incomplete.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6403 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-15 21:53:27 +00:00
Bill Somerville
f1a3a82bd3 Fix regression from r6383 that broke decode rest in directory
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6390 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-12 14:47:29 +00:00
Bill Somerville
9301347f8a Better naming WavFile ->BWFFile
Broadcast  Wave  Format is  a  backwards  compatible superset  of  teh
Microsoft WAV file  format that has been implemented in  teh hope that
Windows File Explorer might show the WAV file metadta, as it turns out
that is not the case but as it's done anyway.

It appears to be  impossible to write a WAV file  such that MS Windows
File Explorer shows any metadata so  unless we adopt FLAC format audio
files we will have to show metadata with our own software :(

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6384 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-11 15:00:53 +00:00
Bill Somerville
4e6de783b0 Use new WAV file class (BWFFile) read and write WAV files
Saved WAV files now contain some useful metadata.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6383 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-11 15:00:43 +00:00
Bill Somerville
0ba0977aa2 User Guide localization
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6341 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 22:30:12 +00:00
Joe Taylor
4aca6bb594 Clarify text for labels 'Auto-Tx-Enable Armed', etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6338 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 18:36:07 +00:00
Joe Taylor
fecffe8ed8 Force naggressive=0 when in JT9+JT65 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6331 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-01 15:33:48 +00:00
Bill Somerville
459f74ac60 Do not disable Tx or "Enable Tx" when changing band in WSPR mode
The fixes a regression introduced in r6311

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6312 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-24 19:42:36 +00:00
Bill Somerville
3c869e4c53 Reset Tx watchdog when changing bands
Also disable "Enable Tx" when changing bands.

Thanks to Mike W9MDB for contributions to this patch.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6311 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-24 13:33:29 +00:00
Bill Somerville
924e20efa8 Add a sample download dialog and upload sub-system
Samples are  downloaded from a  web server, currently the  SF download
server.   The samples  are  stored in  the  source controlled  samples
directory and the CMake script  there builds a suitable directory tree
for upload to the web  server under samples/web containing the samples
hierarchy and the  generated JSON contents database  file. The samples
CMake script also  defines an 'upload-samples' target  that uses rsync
to efficiently upload  the samples and the  accompanying contents JSON
database file.

Any directory structure under the samples directory may be created, to
add a new sample file simply add  the file to source control and amend
the list of sample files (SAMPLE_FILES) in samples/CMakeLists.txt.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6308 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-24 11:41:05 +00:00
Joe Taylor
3ed60c89eb Reset watchdog counter if a Tx message button is clicked.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-19 01:37:53 +00:00
Bill Somerville
bc3e565ef5 Quote file name passed to wsprd
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6292 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-18 12:44:04 +00:00
Bill Somerville
d5bc774641 Get rid of jt9com and npar common blocks
Also  use correct  C binding  and have  compilers determine  sizes and
offsets.

The wsjtx.exe program now owns the  decoder shared data that is shared
with symspec.  It is now in  struct dec_data, still a  global variable
for now but hopefully a MainWindow member variable soon.

The struct  dec_data (in both C/C++  and Fortran) has a  sub structure
with the decoder  parameters which enables copying  and manipulating a
lot cleaner.

New  of  changed types  of  shared  data  must  still be  modified  in
commons.h and a  new file lib/jt9com.f90, they must stay  in sync as a
pointer to the structure is passed between C and Fortran.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6290 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-17 20:29:55 +00:00
Bill Somerville
523ee92a70 Pwr control refinements
Set tune power with SHIFT + "Pwr"  slider. SHIFT + "Pwr" slider to top
cancels separate  power level  for tune.  Smarter  tool tip  for "Pwr"
slider.

Needs User Guide update if change is acceptable.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6284 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-16 20:55:19 +00:00
Bill Somerville
2aea76777a Remember power level setting used for tune
Patch provided by Mike W9MDB, thanks.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6281 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-16 15:32:11 +00:00
Bill Somerville
81e11c06ad Ensure WF submode gets reverted to A in dual JT9+JT65 mode
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6266 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-12 11:55:41 +00:00
Bill Somerville
4cfefe8893 Allow for -0.0 DT value when matching UDP reply to CQ requests
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6236 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 23:14:32 +00:00
Bill Somerville
ffc43bd353 Abort WSPR band hopping when a rig control failure occurs
This avoids spots being sent with incorrect frequencies.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6214 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 23:24:57 +00:00
Joe Taylor
b8f772d0b9 More massaging of draft paper on the FT dedoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6205 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 00:28:58 +00:00
Joe Taylor
b557035d0c Send parameters for experience-based decoding to jt9[.exe].
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6181 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-25 20:09:57 +00:00
Joe Taylor
4680817a93 Separate variables for the decoding parameters that had been packed into ndepth.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6170 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-24 15:05:45 +00:00
Joe Taylor
475118428e Add facility to degrade S/N of data from .wav files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6165 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-23 18:05:36 +00:00
Steven Franke
c9ad0c3038 Add robust sync checkbox to Advanced setup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6151 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-22 15:27:14 +00:00
Bill Somerville
a3903325a1 Make sure that split doesn't get enabled on WSPR modes
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6150 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-22 14:39:36 +00:00
Joe Taylor
b0f70512f7 Correct the display of Echo-mode label.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6141 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-20 20:26:20 +00:00
Bill Somerville
1a23757b26 Reintegrate merge from wsjtx_exp branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6122 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-18 01:28:12 +00:00
Joe Taylor
ab8098263a Use HK0/ rather than HK0A/ in table of prefixes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6104 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-16 15:55:52 +00:00
Bill Somerville
58fab3474d Add WSPR decodes to UDP message protocol
The message_aggregator (MessageAggregator.cpp) has  been updated to do
something with WSPR decodes.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6101 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-15 23:03:11 +00:00
Bill Somerville
6bf8361850 Add decoding is busy flag to UDP Status message
Updated  message_aggregator reference  application  to  show the  mode
label in the status bar with a cyan background colour when decoding is
busy.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6089 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-13 15:44:11 +00:00