Commit Graph

290 Commits

Author SHA1 Message Date
Joe Taylor
5fe6a539b6 Fix an error in defining dat4(13) in Q65 mode. Not backward compatible! Also fix AP and message averaging for Q65. 2020-11-11 15:06:24 -05:00
Joe Taylor
3068f0c61f Use genwave() to create Q65 audio signal. Send "include averaging" flag to Q65 decoder. 2020-11-11 11:14:02 -05:00
Joe Taylor
56a3201d14 Reactivate Q65 message averaging, and fix the reporting of those decodes. 2020-11-10 10:14:41 -05:00
Joe Taylor
6d8958bce6 Code cleanup. 2020-11-03 15:49:11 -05:00
Joe Taylor
2c51c97b14 Increase the Q65 minimum snr1 from 2.5 to 2.8. 2020-11-03 10:36:19 -05:00
Joe Taylor
fa92799bda OPtimize the 2020-11-02 15:59:10 -05:00
Joe Taylor
1768971931 Add timer calls for two of Nico's routines. 2020-10-31 11:33:01 -04:00
Joe Taylor
b3f0aec407 Q65: compute snr from esnodb, using actual symbol rate. 2020-10-30 14:52:58 -04:00
Joe Taylor
306c0c8633 Limit the Q65 DT search rnge to +/- 1 s for TR=15, 30 s. 2020-10-30 12:02:15 -04:00
Joe Taylor
f974751e42 Q65 AP decoding is now (sort of?) working. Problem with i3 field, and maybe other problems... 2020-10-30 11:07:44 -04:00
Joe Taylor
7786101dcf Add a missing file. 2020-10-28 13:38:06 -04:00
Joe Taylor
b6071d29da Code cleanup. 2020-10-28 12:04:10 -04:00
Joe Taylor
347fb06382 Separate calls to q65_intrinsics_ff() and q65_dec(). 2020-10-28 09:28:50 -04:00
Joe Taylor
494a8fc9a7 More cleanup: Q65 SNRs, reported irc values. 2020-10-27 16:08:50 -04:00
Joe Taylor
bbad483aaf Code cleanup in q65sim.f90. 2020-10-27 15:52:57 -04:00
Joe Taylor
c6424100a2 Code cleanup. 2020-10-27 15:52:26 -04:00
Joe Taylor
9643e8a753 Code cleanup. 2020-10-27 15:51:32 -04:00
Joe Taylor
a41325d596 Use fast fading model in q65_ftn_test. 2020-10-27 15:45:34 -04:00
Joe Taylor
5d904927a0 Decode Q65 using the Lorentzian fast fading model. 2020-10-27 13:56:25 -04:00
Joe Taylor
4d739a31ca Minor cleanup of Q65 decoder sequence. Much more needed! 2020-10-27 13:22:02 -04:00
Joe Taylor
2dad27f1ad First decodes of Q65 from within wsjtx. 2020-10-27 13:08:07 -04:00
Joe Taylor
5a2f9e4f3f Updte q65sim to use the new Q65 code. 2020-10-27 12:04:15 -04:00
Joe Taylor
ccdaf49e3a Must initialize Q65 codec is decode is called before encode. 2020-10-27 12:02:49 -04:00
Joe Taylor
a473cee2ea Move q65sim.f90 to the q65 directory. 2020-10-26 19:42:03 -04:00
Joe Taylor
0d8734de47 Update some path names for QRA64/Q65 files. 2020-10-26 19:25:16 -04:00
Joe Taylor
cc5e0c7f2c Add a Fortran program to test calls to Nico's Q65 codec. 2020-10-26 16:54:05 -04:00
Joe Taylor
11ec2eebf0 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-10-25 21:31:34 -04:00
Joe Taylor
5d352d3068 Declare _q65_mask() as static when first declared, in q65.h. Add qracodes.o to Makefile.Win. 2020-10-25 21:29:44 -04:00
Nico Palermo/IV3NWV
676d3578f1 removed unused qra65 files 2020-10-26 02:20:44 +01:00
Nico Palermo/IV3NWV
1f06fd65fc Initial q65 distrib 2020-10-26 01:10:53 +01:00
Joe Taylor
7a22e6a2e1 Change the Q65 value of nsps from 7680 to 7200. 2020-10-25 14:10:38 -04:00
Joe Taylor
9b452e8f99 Change mode name QRA65 to Q65 everywhere, supposedly. 2020-10-25 13:58:18 -04:00
Joe Taylor
ad70cdeb8a More work on sync tests, etc., of QRA6[45]. 2020-10-13 13:49:09 -04:00
Joe Taylor
c3d8e4dd73 Working on QRA65, including simulator and test program. 2020-09-26 16:49:06 -04:00
Joe Taylor
6ebc700288 Mostly(?) changed QRA66 to QRA65 on the Fortran side. 2020-09-25 12:21:57 -04:00
Joe Taylor
2057600f43 First functioning QRA65 encode and decode. 2020-09-25 10:55:21 -04:00
Joe Taylor
de0476bf3c More changes to allow longer sequences in QRA66 mode. 2020-08-08 16:53:28 -04:00
Joe Taylor
e4fad77fa5 QRA66 now works with qra66sim and jt9 and TR periods 15 30 60 120 300 s. 2020-08-08 13:57:24 -04:00
Joe Taylor
bf38f4416c Modifications to give QRA64 use of longer TR periods and tone-spacing submodes. Noy yet finished, or tested! 2020-08-08 09:14:12 -04:00
Joe Taylor
7256d70016 QRA66: change NSPS from 1920 to 1800. TxT=85*1800/12000=12.75 s. 2020-08-05 11:06:18 -04:00
Joe Taylor
2e893e8994 Add Tx freq as command-line argument for qra66sim. 2020-08-04 13:12:51 -04:00
Joe Taylor
45dac5bd18 Change random number generation in qra66sim so results are exactly repeateble. 2020-08-02 09:42:22 -04:00
Joe Taylor
f45c617422 First working QRA66 decoder. 2020-08-01 09:24:59 -04:00
Joe Taylor
77b7e71424 Enable mode QRA66B in qra66sim. 2020-07-31 11:16:03 -04:00
Joe Taylor
09686b9958 Add a simulator for experimental mode QRA66. 2020-07-31 10:59:05 -04:00
Joe Taylor
9146ce9667 Correct a flaw in qra64sim. 2020-07-31 10:58:30 -04:00
Joe Taylor
5adc211d1a Correct a minor bug in qra64.c. 2019-01-08 13:47:53 -05:00
Joe Taylor
4786fbd866 Patch from W9MDB: adds braces to make code in qra64.c more readable.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7802 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-07-07 12:55:05 +00:00
Joe Taylor
cfede5e9db Comment out the qra64_fastfading_channel function -- used only for tests.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7347 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-29 15:39:15 +00:00
Joe Taylor
5da4ae6363 Set naptype properly; protect nap() index from out-of-range values.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7341 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-27 16:38:39 +00:00
Joe Taylor
4838d97370 New parameters for AP decoding in QRA64. Do not use this revision on the air!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7340 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-27 15:50:47 +00:00
Joe Taylor
341f636232 More editing of User Guide.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7335 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-22 20:33:50 +00:00
Joe Taylor
15c30a628d Change the qra64sim default frequency for single signals to 1000 Hz.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7334 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-22 19:24:01 +00:00
Joe Taylor
d9e91a88ab Tweak an output format in the QRA64 simulator.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7319 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-14 21:04:13 +00:00
Joe Taylor
5299e74bc2 Presently we do need the normrnd header.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7318 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-14 20:29:00 +00:00
Joe Taylor
5afe27e531 Comment out the fast-fading channel simulator, it's not needed in WSJT-X and causes grief for WinXP folks without rand_s.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7317 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-14 20:26:59 +00:00
Joe Taylor
c2df8d3e4a For submodes QRA64D and E, generate one signal at 700 Hz.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7314 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-14 18:13:31 +00:00
Joe Taylor
6258dc8fbf Add text of --help message to qra64example.txt.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7310 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-14 01:52:19 +00:00
Joe Taylor
94ee6ea8a1 Sorry, I did not intend to commit changes to these routines. Revert to 7305.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7307 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-13 20:36:27 +00:00
Joe Taylor
8e1378bce3 If Monitor was OFF at start of band_changed(), return it to OFF when this function returns.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7306 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-13 20:28:53 +00:00
Joe Taylor
80787c0721 New sync pattern for QRA64; implement fast-fading algorithm for QRA64A-C. Several things in QRA64 still need attention, in addition to submodes D and E!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-08 20:11:02 +00:00
Joe Taylor
bf8e290bbd Send required parameters to qra64_dec().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-07 16:58:37 +00:00
Joe Taylor
fe0aa5f9a6 QRA64 decoder is now basically functional with qra64_decode_fastfading(). Currently only submode A. More to come...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-07 16:47:40 +00:00
Bill Somerville
aef04b28ff Fix up system type detection for QRA PRNG
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7296 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-06 13:54:44 +00:00
Joe Taylor
8390bcd798 Add code for QRA64 with fast fading.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7295 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-06 00:53:47 +00:00
Joe Taylor
3d21062751 Use a less aggressive mask, effectively AP68, in place of AP70 and AP72.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7156 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-07 12:27:22 +00:00
Joe Taylor
193cbff60b Don't write Nico's SNR dump!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7061 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-08 12:10:09 +00:00
Joe Taylor
44d2f446a2 Test program for improved sync detection.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6936 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-21 20:30:04 +00:00
Joe Taylor
c7361c66f6 Add APTYPE_CQHISCALL (5), returning 9 [CQ DXcall ?], 10 [CQ DXcall], and
11 [CQ DXcall DXgrid].


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6934 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-21 12:38:26 +00:00
Joe Taylor
ab1e2eaa3c More cleanup and optimization of the QRA64 decoding procedure.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6932 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-20 15:38:29 +00:00
Joe Taylor
76ed1007c4 Cleanup and minor tweaks to QRA64 decoding scheme.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6931 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-19 20:52:51 +00:00
Joe Taylor
f92afadc6c Try APtype 4, 3, 2, 1, 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6929 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-19 15:24:15 +00:00
Joe Taylor
920fd25537 Starting work toward flexible use of AP decoding in QRA64. Beware, this is still in progress!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6928 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-19 13:16:10 +00:00
Joe Taylor
f3703e0241 Nico's additions for new AP decoding modes and improved control of AP decoding.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6926 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-18 12:42:10 +00:00
Joe Taylor
e195b3ce15 Align displayed S/N with S/N in qra64sim.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6851 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-02 15:35:31 +00:00
Joe Taylor
63fa30b0b2 A few more renames, QRA65 --> QRA64.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6849 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-02 12:48:27 +00:00
Joe Taylor
3016ccee01 Many renames: QRA65 --> QRA64, QRA02 --> QRA64.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6848 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-02 12:15:41 +00:00
Joe Taylor
0384d312a6 Temporary mode QRA02 is now basically functional (though buggy).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6833 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-30 20:38:36 +00:00
Joe Taylor
4bc4c11b66 Starting the transition from QRA01 to QRA02.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6824 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-29 19:10:57 +00:00
Joe Taylor
dd2e5fbdda Some cleanup and reformatting of QRA65 code (with apologies to Nico).
I've tried to make code "pretty print" and easier to follow, at least for me.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6808 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-24 19:54:34 +00:00
Joe Taylor
e2ea412e24 Minor tweaks to qra65code to facilitate simple simulations.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6803 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-23 15:50:59 +00:00
Joe Taylor
f146375dd0 More flexibility in QRA65code, including simple S/N simulations.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6802 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-23 13:58:18 +00:00
Bill Somerville
84891dde37 Apply Nico's QRA changes as of 2016/06/23
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6801 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-23 10:36:18 +00:00
Bill Somerville
6a481dd006 Make QRA sources more portable
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6800 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-23 09:31:16 +00:00
Joe Taylor
969efaca14 Add qra65sim.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6796 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-22 20:47:11 +00:00
Joe Taylor
9fe70e8a02 Add routines needed for QRA65code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6795 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-22 20:45:29 +00:00
Joe Taylor
9c19ff3eea Making progress on what will become QRA65 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6794 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-22 20:26:41 +00:00
Joe Taylor
0bd4a2363a Add makefiles for building libqra65.a and qra65sim.exe in Windows.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6790 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-21 17:26:07 +00:00
Joe Taylor
7402cecd9a Remove irrelevant *.vcproj files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6789 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-21 15:10:06 +00:00
Joe Taylor
14f03dca53 Starting to add code for a potential "QRA65" mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6788 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-21 15:07:24 +00:00