Commit Graph

149 Commits

Author SHA1 Message Date
Bill Somerville
5e7b750ac3 Initialize decode counts before decoding
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6750 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-09 23:39:19 +00:00
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
4bcc4f35a1 Much improved detection of sync in JT4 decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6686 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-19 19:19:47 +00:00
Joe Taylor
1531f3ad3b New format for end-of-line flags in JT4 and JT65; starting work on
establishing sync in JT4.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6685 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-19 16:13:51 +00:00
Joe Taylor
6bbfb0e1f1 Mark JT4 Fano decodes with 'f'.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6680 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-17 19:33:33 +00:00
Joe Taylor
f5cec462d4 Resolve more issues for display of JT4 decodes; improve JT4 sync at low spread.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6679 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-17 18:34:57 +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
a45ea3cdff Adjust decodes displays and processing for extra csync indicator after mode
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6674 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-05 18:53:00 +00:00
Bill Somerville
8bced492e6 Remove premature inclusion of padding space character in JT9 decodes
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6672 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-05 01:32:38 +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
bff84e0e37 Use '$' to flag JT4 mode in the 2-character csync.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6668 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-04 18:59:18 +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
1a9c6b3b6f Correct a problem with flagging supposedly bad data when reference spectrum
is used.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6624 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-18 14:15:09 +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
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
e212367221 First decodes of wide/slow JT9 submodes from within wsjtx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6577 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-05 14:17:34 +00:00
Joe Taylor
cb8eeba835 Add submode to argument list of JT9 subroutine decode().
Add test program fersum; several tweaks to fer65.
Code cleanup in lorentzian, and return chisqr in a(5).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6567 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-04-01 17:57:08 +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
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
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
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
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
Joe Taylor
1a0cbd4d9d Oops! Did not intend to commit decoder.f90 with diagnostic "write(79..." activated.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6339 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 18:41:41 +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
c7e3fa09e3 Comment out the "write(79)..." lines.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6332 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-01 15:35:00 +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
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
0bc01a19b1 Fix JT4 averaging regression
Fell  into the  Fortran  trap for  C/C++  programmers, automatic  SAVE
attribute on default initialized variables.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6326 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-30 14:57:50 +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
f416a52def Make Fortran profiling timer function a callback with a default null implementation
Groundwork for calling the decoders directly from C/C++ threads.

To  access   the  timer   module  timer_module   must  now   be  used.
Instrumented code need  only use the module function  'timer' which is
now a  procedure pointer that  is guaranteed to be  associated (unless
null()  is assigned  to it,  which should  not be  done). The  default
behaviour of 'timer' is to do nothing.

If a  Fortran program  wishes to  profile code it  should now  use the
timer_impl module  which contains a default  timer implementation. The
main program should call 'init_timer([filename])' before using 'timer'
or     calling     routines     that     are     instrumented.      If
'init_timer([filename])'.  If it is called  then an optional file name
may  be  provided  with  'timer.out'  being used  as  a  default.  The
procedure 'fini_timer()' may be called to close the file.

The default  timer implementation is  thread safe if used  with OpenMP
multi-threaded code  so long as  the OpenMP  thread team is  given the
copyin(/timer_private/) attribute  for correct operation.   The common
block /timer_private/ should  be included for OpenMP  use by including
the file 'timer_common.inc'.

The module 'lib/timer_C_wrapper.f90' provides  a Fortran wrapper along
with 'init' and 'fini' subroutines  which allow a C/C++ application to
call timer instrumented  Fortran code and for it  to receive callbacks
of 'timer()' subroutine invocations.  No C/C++ timer implementation is
provided at this stage.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6320 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-27 15:40:57 +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
Joe Taylor
256feedd95 Correct the second calling sequence to jt65a().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6286 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-17 00:47:55 +00:00
Joe Taylor
9af174642b Send mycall, hiscall, hisgrid downstream to extract.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6283 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-16 19:31:12 +00:00
Joe Taylor
b87c77ddf1 Make erasure pattern exponents work, the intended way. :-)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6280 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-16 01:07:07 +00:00
Steven Franke
f281d082bf Make odd erasure pattern exponents work.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6279 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-16 00:49:47 +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
Bill Somerville
eb1004ec76 Remove more KVASD remnants
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6173 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-24 19:46:59 +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
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
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
Bill Somerville
34f8924cfc Reintegrate the wsjtx_exp branch into the trunk
This  merge brings  the WSPR  feature development  into the  main line
ready for release in a future v1.6 release.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5424 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-27 13:08:28 +00:00
Bill Somerville
a51c5c4251 Reintegrate Joe's experimental VHF & up features
As at ^/branches/wsjtx_exp@5271



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-22 17:48:03 +00:00