Commit Graph

631 Commits

Author SHA1 Message Date
Joe Taylor
ceb72eb8e9 Better scheme for handling message averaging in fer65.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6545 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-21 17:23:49 +00:00
Joe Taylor
38011d56b1 Compute average nsum in fer65. Fix jt65 to work with message averaging
in simulation tests.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6544 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-21 16:14:20 +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
063bb166f1 Go back to multiple calls to smo121, rather than smolorentz.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6541 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-19 12:41:53 +00:00
Joe Taylor
b002b165bc Do the ismo loop only in "Single decode" mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-19 00:37:37 +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
8d21cdf1c7 Change Doppler spread to Lorentzian shape with cutoff at x=3. Several
tweaks to output format from fer65.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6534 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-15 20:44:03 +00:00
Joe Taylor
0224e76c44 Change the definition of "d" so that width of generated tones is equal
to the requested Doppler spread.  Previously they were wider by the 
factor 2*sqrt(log(2)).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6533 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-15 14:28:07 +00:00
Bill Somerville
4de778c4e7 Reverting r6531 and replacing with correct fix
The WSPR  message is unpacked  into a symbol  per byte array  which is
processed  by  encoding a  whole  number  of  bytes of  message,  this
requires the output  array to be bigger than the  number of symbols to
accommodate  extra values  that are  not part  of the  message due  to
rounding up to whole bytes. I.e.  176 (11*8*2) elements to contain the
162 symbols.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6532 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-15 11:46:26 +00:00
Bill Somerville
e81f018ed5 Fix buffer overrun in WSPR encode
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6531 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-15 11:17:11 +00:00
Joe Taylor
470547537d Simple driver for end-to-end JT65 simulations.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6530 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-14 21:48:58 +00:00
Steven Franke
4a4af7b24f Remove more old stuff.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6529 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-13 05:48:07 +00:00
Steven Franke
31bcf0a783 Remove some cruft.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6528 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-13 04:22:31 +00:00
Steven Franke
733630d7f3 Add updated frame-error-rate script for jt65.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6527 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-12 15:02:35 +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
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
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
Bill Somerville
8b2a665138 Update argument list for JT65 callback in command line jt65
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6514 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-09 22:39:13 +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
3cd53fb073 Should have committed this code, yesterday.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6509 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-08 15:45:15 +00:00
Joe Taylor
f0fdc8822b Working toward best hinted decoding for submodes JT65B and C.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6508 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-07 20:54:12 +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
e7f3a10fa2 Oops! Accidentally removed a required definition of "df".
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6505 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-02 20:14:17 +00:00
Joe Taylor
e762cba31e In submode JT65C, downsample the data twice: once so that sync tone
goes to f=0, once so it goes to -355.297 Hz.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6504 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-03-02 19:44:09 +00:00
Steven Franke
ce24320476 Add mode (A,B,C) command-line option.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6503 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-28 18:08:02 +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
Joe Taylor
aab846154f More code cleanup of test program mskber.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6487 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-23 15:48:03 +00:00
Joe Taylor
ab544e3039 Code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6479 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-22 18:57:17 +00:00
Joe Taylor
b88affa2ee Test program to simulate MSK modulation and coherent reception.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6478 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-22 18:32:39 +00:00
Joe Taylor
ad50294454 Update jtmsk for change in the way narg(12) and narg(13) are compared.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6467 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-04 19:40:47 +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
Joe Taylor
be26c48f91 More progress on decoder for short JTMSK messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-03 19:47:42 +00:00
Joe Taylor
5fc5597652 Improvements to decoder for short JTMSK messages. Still needs work!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6461 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-02 19:49:17 +00:00
Joe Taylor
95259fddfe Actually, those calls to packbits() should send the value "69" as 2nd argument.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6458 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-01 16:15:34 +00:00
Joe Taylor
c32ece12fa Correct a typo and bug (reported by K9AN) in syncmsk.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6457 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-01 15:58:39 +00:00
Bill Somerville
020803e901 Fix an array size parameter error in gen9.f90
Also use assumed shaped for dummy argument arrays where possible.

If a  Fortran procedure has  an interface declaration,  which includes
all procedures exported  from modules, then dummy  arguments should be
declared as assumed shape if possible.  This allows compiler generated
array bounds checking and compile time array shape checking.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6456 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-01 13:41:11 +00:00