Commit Graph

93 Commits

Author SHA1 Message Date
Joe Taylor
22340f66e4 Suppress some compiler warnings. (More to come...)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6748 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-09 19:39:48 +00:00
Joe Taylor
27fb2d8126 Minor cleanups and corrections to the JT4 and JT65 decoders when
using deep search and/or averaging.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6696 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-24 16:00:00 +00:00
Joe Taylor
f82ee7c4e3 Correct several VHF/UHF/Microwave items on Rex's list. Specifically:
1. Allow display of JT65 single-line decodes when there is also an
   average decode.
5. Do not call JT4 deep search if Fano decode has succeeded.
7. Fix occasional Fortran error seen with the "#" (nflip=-1) sync.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6678 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-17 17:19:27 +00:00
Bill Somerville
e59af9a781 Strip out callback arguments that are constant and known to the callback implememtation
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6671 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-05 01:32:30 +00:00
Joe Taylor
1af1a2d97e If not in single-decode mode, display only the first character of csync.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6669 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-05 00:00:54 +00:00
Joe Taylor
abb5364581 Fix a minor flaw in the "flip" logic.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6667 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-04 18:44:05 +00:00
Joe Taylor
a402645e75 Remove unused code from sh65.f90. Make csync a 2-character flag.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6666 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-04 18:16:09 +00:00
Joe Taylor
8cef34fe11 Starting to implement decoding of JT65 shorthand messages. Needs testing!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6665 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-03 20:30:49 +00:00
Joe Taylor
4346f0ef97 Enable JT65 decodes with the 'OOO' sync pattern.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6663 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-03 16:10:22 +00:00
Joe Taylor
c7dfc1ee00 1. Protect against wrong ID of f0 being fit by lorentzian(), when Ftol is large.
2. When switching to JT65 mode, go through JT9 first.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6621 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-14 13:22:05 +00:00
Joe Taylor
3b2a918eb0 Rationalize the "NTol" usage in JT65 single-decode modes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6614 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-12 14:24:55 +00:00
Bill Somerville
e565e1796a Clean up some compiler warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6591 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-06 22:37:22 +00:00
Bill Somerville
53308a941b Make flag variables boolean types especially those passed between languages
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6585 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-06 17:11:19 +00:00
Joe Taylor
0e51ca70ac Correct the value of "nadd" in avg65.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6559 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-25 18:19:25 +00:00
Joe Taylor
af0d04ef72 Minor tweaks to logic for displaying Avg and DS decodes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6552 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-23 15:08:00 +00:00
Joe Taylor
66cf899388 Minor tweaks aimed at better fer65 results.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-23 13:55:40 +00:00
Joe Taylor
e798285479 1. Further cleanup of fer65.f90.
2. Abort if DS is requested and CALL3 is short or missing.
3. Minor adjustment of spinner size on Wide Graph. 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6550 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-22 19:30:41 +00:00
Joe Taylor
c54831df14 1. Clean up the behavior of Avg and DS decoding.
2. Specify Navg (max # of transmissions to average) for fer65.
3. Specify DS (0 = no deep search, 1 = deep search) for fer65.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6549 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-22 16:42:59 +00:00
Joe Taylor
e84ce2bad1 First attempt at a smoothing loop inside avg65. Needs testing!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6546 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-21 19:11:38 +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
d41ccb8144 Back to original SNR calc when not using "Single decode".
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6539 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-19 00:16:09 +00:00
Joe Taylor
5afa11653a Back to original logic for decoding JT65A at HF, when "Single decode"
is not checked.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6538 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-18 23:29:10 +00:00
Joe Taylor
767a9452e6 1. Use Lorentzian profile for smoothing (but not yet for message averaging).
2. Add ability to set ndepth and do message averaging ti fer65.
3. Correct SNR values for measured Doppler width.
4. Comment out the "write(62..." diagnostics.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6537 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-18 20:17:17 +00:00
Joe Taylor
533bb81220 Various changes to JT65 decoding, all potentially temporary.
1. Measure Doppler width by fitting a (modified) Lorentzian.
2. Don't call "slope" in sync65().
3. New definition of "sync1".
4. Get snr from sync1.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6536 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-17 18:52:06 +00:00
Joe Taylor
9f388b63dc Many changes in aid of decoding signals with significant Doppler spread
in submodes JT65B, C.  More changes still to come!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6535 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-17 13:28:57 +00:00
Joe Taylor
9e38f0ed9e A few more tweaks to Avg/Smo decoding in JT65. This stuff should
probably be refactored!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6525 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-11 17:03:41 +00:00
Joe Taylor
a35e411409 Further progress on average and smoothed decodes. Not finished, though!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6524 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-11 16:26:06 +00:00
Joe Taylor
1c948c1566 Further progress toward correct message averaging and hinted decoding
in JT65 mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6522 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 20:29:00 +00:00
Joe Taylor
ffcfe97f34 Correct a flaw introduced with changing common/test00?/ to jt65_mod.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6520 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 19:39:24 +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
f670af39e5 Remove diagnostic print.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6517 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 15:18:55 +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
04e765c605 Replace all "common/test00?" with "use jt65_mod", etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6515 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-10 14:25:22 +00:00
Joe Taylor
1288e64137 Further progress on JT65 decoding with averaging and variable smoothing.
Please note: it's far from finished!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6513 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-09 21:01:28 +00:00
Joe Taylor
4c31292b5a First (very basic!) functionality for message averaging in JT65.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6511 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-08 21:04:05 +00:00
Joe Taylor
ef79ab0f49 Minor code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-08 18:36:42 +00:00
Joe Taylor
eb076718f2 First working code that uses wider detection bandwidths for submodes JT65B,C.
Still needs work!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6507 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-07 20:00:23 +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
Joe Taylor
a864cbfdeb Integrate the latest algorithm for hinted decoding.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6365 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-08 20:51:13 +00:00
Joe Taylor
0e15a4cd5c Default parameter settings for JT65 decoding set for HF conditions.
More aggressive parameters are selected with higher values of 
"Aggressive decoding level" on the "Advanced" tab.  With settings
greater than 0, be sure to set Ftol=1000 if you want to decode over 
the whole passband.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6330 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-31 16:22:27 +00:00
Joe Taylor
5bfa43f46f Merge improvements to the FT algorithm into Bill's new structure for
the Fortran routines.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6328 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-31 01:30:31 +00:00
Bill Somerville
d431e2cecd Restructuring in preparation for direct decoder invocation from wsjtx
Re-factor the JT4, JT65 and JT9 decoders as Fortran modules using type
bound  procedures, the  decoder types  implement a  callback procedure
such that he client of the decoder can interpret the decode results as
they need.

The JT4 decoder has a  second callback that delivers message averaging
status.  Also the  previously separate  source files  lib/jt4a.f90 and
lib/avg4.f90 have been merged  into lib/jt4_decode.f90 as private type
bound procedures of the new jt4_decoder type.

Re-factored the lib/decoder.f90 subroutine  to utilize the new decoder
types. Added local procedures to process decodes and averaging results
including the necessary OpenMP synchronization directives for parallel
JT9+JT65 decoding.

Added the  jt65_test module  which is  a basic  test harness  for JT65
decoding. Re-factored  the jt65 utility  to utilize the  new jt65_test
module.

Changed a  few integers  to logical variables  where their  meaning is
clearly binary.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6324 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-29 23:52:55 +00:00
Bill Somerville
d6457af36e Rename some sources in prep for decode callback implementation
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6323 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-29 23:52:46 +00:00