Commit Graph

3005 Commits

Author SHA1 Message Date
Joe Taylor b7cb4ae9a6 Make test_q65 execute jt9 with the single_decode ('-X 32') flag set. 2021-06-08 11:12:42 -04:00
Joe Taylor f7464c8df6 Protect against bounds error when ntol range goes below 0. 2021-06-03 13:34:22 -04:00
Joe Taylor 4847cf3617 Allow drift compensation with FTol greater than 100 Hz. 2021-05-31 10:23:22 -04:00
Joe Taylor 2e53a8a47d Add GUI controls to set max_drift in both WSJT-X and MAP65. 2021-05-30 12:07:48 -04:00
Joe Taylor 42ab7fcd20 Set max_drift = 10 for Q65-60A, 40 for Q65-15C, otherwise 0. Temporary ?? 2021-05-30 09:25:42 -04:00
Joe Taylor ccf5e0daa7 Add a comment to clarify units for 'drift'. 2021-05-29 13:18:11 -04:00
Joe Taylor 40f1af5af2 Update test_q65 to allow testing larger frequency drifts. 2021-05-29 13:17:09 -04:00
Joe Taylor 47ee40540b Add comments to define units for a(1), a(2). 2021-05-29 13:16:09 -04:00
Joe Taylor a973fa7215 Enable drift compensation only for TRperiod=60, nqd=1, ntol<=100, iavg=0. 2021-05-27 12:25:08 -04:00
Joe Taylor cf87e74d1d First cut at usable AFC (linear drift compensation) for Q65. 2021-05-27 12:20:20 -04:00
Joe Taylor 8a541aa0ab Initialize npasses. 2021-05-20 12:57:41 -04:00
Joe Taylor 0b557adeb1 If q3 decode succeeds, return immediately from q65_dec0(). 2021-05-19 12:16:47 -04:00
Joe Taylor 4dd48551b2 Look for a q[0124] decode in the iavg=0 pass as well as iavg=2. 2021-05-18 16:47:59 -04:00
Joe Taylor bf1d1dace6 Don't inadvertently erase hiscall and hisgrid in a call to q65_hist(). 2021-05-18 16:33:11 -04:00
Joe Taylor 25148a52e3 Remove more timer calls that are essentially moot. 2021-05-13 16:34:47 -04:00
Joe Taylor 8034a006d7 Enable q3 decodes, but only at the QSO freq. 2021-05-13 15:33:52 -04:00
Bill Somerville 6bd50b2444
Automatic FFTW3 wisdom handling for map65 GUI and shmem m65 runs 2021-05-13 12:44:32 +01:00
Steven Franke c414a3261b Move q65 fortran encoding routines to a separate file. 2021-05-06 09:53:04 -05:00
Steven Franke f864257838 Merge branch 'develop' into feat-map65-integration 2021-05-06 08:18:10 -05:00
Steven Franke 4efb2ab28f Define 'q65_encoding' module. 2021-05-06 07:28:48 -05:00
Joe Taylor 3f74137d32 Add Q65 modes and optional Doppler spread to mapsim. 2021-05-04 15:46:00 -04:00
Steven Franke 075e0bfd56 Fix uninitialized variables. 2021-05-04 07:47:15 -05:00
Steven Franke 79140b4430 An all-Fortran implementation of Q65 source encoding, CRC calculation, and LDPC coding, for reference. 2021-05-03 12:54:47 -05:00
Joe Taylor c9b2a3d2cd If no 'hiscall', don't try for a q3 decode. 2021-04-30 08:31:45 -04:00
Joe Taylor 14a67761de Cleanup at end of decoding must take place in q65b, not in map65_mmdec. 2021-04-28 13:29:42 -04:00
Joe Taylor c7af9945d3 m65 noe mostly OK for single-pol mode. Needs more work for xpol. 2021-04-28 10:13:42 -04:00
Joe Taylor 57f48187e7 Display the 'q#' tags for Q65 decodes. 2021-04-28 09:35:40 -04:00
Joe Taylor 8bdaf2dccf First working m65 that calls Q65 subroutines rather than execuring jt9[.exe]. Still needs work. 2021-04-27 17:02:39 -04:00
Joe Taylor be2f48a34c Add map65_mmdec.f90. 2021-04-27 15:20:10 -04:00
Joe Taylor 03e67dff47 Trivial code cleanup in q65.g90. 2021-04-27 15:17:18 -04:00
Joe Taylor 14f8dc76c0 Trivial code cleanup of q65_decode.f90. 2021-04-27 15:13:47 -04:00
k9an b3d15ea0c6 Prevent a divide-by-0 error in ftrsd2.c. 2021-04-26 08:08:27 -05:00
Joe Taylor 516f21b17c Remove temporary hardwiring of the "Fast" decode setting. 2021-04-24 08:22:54 -04:00
Joe Taylor b2a56fec8b Fis a few more compiler warnings. 2021-04-22 14:08:53 -04:00
Joe Taylor e0a20d25db Remove the diagnostic routine chk_samples(). 2021-04-22 13:17:30 -04:00
Joe Taylor cfecb43d34 Cleaning up some build scripts and fixing compiler warnings. 2021-04-22 13:12:55 -04:00
Joe Taylor 83c3dd5482 Comment out several unused definitions. 2021-04-22 09:24:10 -04:00
Joe Taylor ef46e81d3c Initialize several variables (to make valgrind happier). 2021-04-22 08:49:26 -04:00
Joe Taylor a90b58ad40 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-21 17:06:00 -04:00
Bill Somerville 9d19de5cf3
Merge branch 'develop' into feat-map65-integration 2021-04-21 21:02:36 +01:00
Joe Taylor 9e9357b970 Implement sensible loop ranges for Fast/Normal/Deep Q65 decoding. 2021-04-21 15:57:54 -04:00
Joe Taylor 69619dd31e Remove an unused variable. Protect against extreme values leading to FPEs. 2021-04-20 15:35:56 -04:00
Joe Taylor c61e796c50 Fix a possible floating point exception in q65_loops by making s3 allocatable. 2021-04-15 13:52:18 -04:00
Joe Taylor 47332aa9ac Always set emedelay=2.5 for submodes Q65-60[A-E]. 2021-04-12 12:19:49 -04:00
Bill Somerville 769e00ab88
Getting compilation of map65 working with CMake and Qt 5.15 2021-04-09 17:47:49 +01:00
Bill Somerville 96e8908866
Merge branch 'master' of ../map65 into feat-map65-integration 2021-04-09 14:00:10 +01:00
Joe Taylor 71bd5b79e3 Don't attempt a Q65 average decode if it's not selected on Decode menu. 2021-04-02 09:56:50 -04:00
Steven Franke 51f57406d2 Ensure that split77() correctly converts lower case characters to upper case. 2021-03-24 13:48:42 -05:00
Joe Taylor 0508a01950 Merge branch 'release-2.4.0' of bitbucket.org:k1jt/wsjtx into release-2.4.0 2021-03-23 15:18:55 -04:00
Joe Taylor 7bc1efdad3 Update allsim.f90: add FST4-60, replace QRA64 with Q65-60A. 2021-03-23 15:18:06 -04:00
Bill Somerville 74b2037187
Merge branch 'release-2.4.0' of bitbucket.org:k1jt/wsjtx into release-2.4.0 2021-03-23 15:08:34 +00:00
Bill Somerville d35f7a90ac
Guard against callsigns longer that the CW id buffer 2021-03-23 15:07:32 +00:00
Joe Taylor 8e9f43fc03 Cleanup and commenting of q65_hist.f90. 2021-03-19 09:10:04 -04:00
Joe Taylor ac2954ed0d Save f0 and msg for the most recent 100 decodes. Subsequent double-click on waterfall will look up "hiscall" (and possibly "hisgrid") from the list. 2021-03-18 16:33:46 -04:00
Joe Taylor d2b4fdad5f Protect against possible bounds error in Q65 snr calculation. 2021-03-17 09:23:24 -04:00
Joe Taylor 61ba34a0b4 Reduce the range i3:14 testing for max when selecting Q65 candidates. 2021-03-16 13:04:24 -04:00
Joe Taylor 06f7ca7c75 Look for average decodes even when we get a single-sequence decode at nfqso. 2021-03-16 11:39:59 -04:00
Joe Taylor 4596ba05a0 Fix a problem with plotting the Q65 sync curves for Q65-120x and Q65-300x. 2021-03-15 17:00:56 -04:00
Joe Taylor 13b6900373 Add plog to the parameters written to q65_decodes.dat. 2021-03-12 14:44:47 -05:00
Joe Taylor 41ce20101f Q65 sync curves linear up to 10, then logarithmic. AutoClrAvg only for decodes at RxFreq, and never for "lagain" decode attempts. 2021-03-12 14:27:58 -05:00
Steven Franke 1d590b81f5 Prevent a crash when widegraph lower limit is 0 Hz. 2021-03-10 13:10:47 -06:00
Joe Taylor 2048b3fec3 Tweaks to the way orance/red (==> single/avg) sync curves are displayed. 2021-03-09 14:41:36 -05:00
Joe Taylor dda3c9d0cc First cut at displaying a Q65 sync curve for both current sequence and accumulated average. May not be quite right, yet... 2021-03-07 11:41:56 -05:00
Joe Taylor ce839e1d2e Trying to isolate the cause of bad data appearing in red.dat. 2021-03-05 14:57:26 -05:00
Joe Taylor 3f5705ac74 Fix for possible out-of-bounds nutc. 2021-03-05 13:28:14 -05:00
Charlie Suckling 7defc8846d
Adds Single Tone capability to q65sim 2021-03-04 11:15:54 +00:00
Bill Somerville 22f1ba6a6d
Merge branch 'support-2.3.1' into release-2.4.0 2021-03-03 23:58:39 +00:00
Joe Taylor 0e6f536d3e Remove a few more vestiges of ISCAT mode. 2021-03-03 11:59:03 -05:00
Joe Taylor 4573c78acd Remove iscat Fortran routines. 2021-03-03 11:52:36 -05:00
Joe Taylor 333c4da0b4 Re-enable "Save Decoded" for Q65. 2021-02-27 11:50:13 -05:00
Joe Taylor 94b273edc1 Allow blank MyCall when jt9 run from command line. 2021-02-26 11:28:14 -05:00
Joe Taylor b4723d3186 Use Decode = Fast unless file 'ndepth.dat' is present in CWD. 2021-02-25 18:43:44 -05:00
Joe Taylor 7ad8816170 Kludge to allow specifying blank "hiscall" when jt9 is executed from command line. 2021-02-25 15:19:44 -05:00
Joe Taylor 19512c00f1 More tweaks to the Fast?normal/Deep settings in Q65 mode. 2021-02-25 12:45:07 -05:00
Bill Somerville 01dff71070
Re-enable EU VHF Contest mode messages in MSK144 mode
Also bring  message checking utilities up  to date with the  latest EU
VHF Contest mode source encodings.
2021-02-24 02:21:31 +00:00
Joe Taylor 94c31572d2 More tweaks to the Fast/Normal/Deep parameters. 2021-02-23 16:13:46 -05:00
Joe Taylor 0765a1cc06 Working on tweaks to the Fast/Normal/Deep decoding options. 2021-02-23 11:32:38 -05:00
Joe Taylor a8200fdfdd Rempove remaining QRA64 code and direcories. 2021-02-23 09:20:46 -05:00
k9an 4b1077f897 Fix a mis-spelled warning message. 2021-02-20 08:39:53 -06:00
Joe Taylor 7192f53e68 Code cleanup. 2021-02-19 09:47:30 -05:00
Joe Taylor b156ecd3a1 New method for measuring SNR of decoded Q65 signals. 2021-02-19 09:44:03 -05:00
Steven Franke b194cc1a14 FST4: Do not bail out of blanker loop after 1st decode. 2021-02-18 14:26:56 -06:00
Joe Taylor 23eb287449 Correct a typo. 2021-02-16 12:55:59 -05:00
Joe Taylor 10e08b0e94 Much better algorithm for detecting and removing birdies in Q65. 2021-02-12 13:26:22 -05:00
Joe Taylor 1aad2fdbda Q65: Supppress birdies and don't display decode lines with blank message. 2021-02-11 11:30:35 -05:00
Joe Taylor 3962a1eeba Merge branch 'release-2.4.0' of bitbucket.org:k1jt/wsjtx into release-2.4.0 2021-02-10 13:56:56 -05:00
Joe Taylor 6395087e6f Tweak the averaging scheme: now straight avg up to N=4, then expenential with ntc=4. 2021-02-10 11:14:46 -05:00
Charlie Suckling b58ce90a9f
Now generates a filename for 15s periods that works with averaging 2021-02-09 13:47:40 +00:00
Charlie Suckling d91404bbb1
Modification to make filenames compatible with Q65 averaging 2021-02-09 13:47:33 +00:00
Joe Taylor a6779ecda3 Use exponential message averaging (ntc=3) rather than simple sums in Q65. 2021-02-08 11:10:02 -05:00
Joe Taylor 3ccf949691 Save nrc (number of q[0124] iterations) to q65_decodes.dat. 2021-02-08 09:24:16 -05:00
Joe Taylor f9a771b422 Q65 parameter ibwa should not be larger in Normal/Deep than in Fast. Corrected. 2021-02-06 09:43:14 -05:00
Joe Taylor ade40fabf5 Be sure that Q65 nsps cannot remain undefined, and can't stop jt9[.exe]. 2021-02-05 14:14:22 -05:00
Joe Taylor 7180c40754 Fix the source of a bounds error in JT4 decoder. (Why was this not a problem in v2.3?) 2021-02-05 14:03:18 -05:00
Joe Taylor ebd41fabcc Don't use CWD writes such as 'fort.33' in production versions! 2021-02-03 15:20:37 -05:00
Joe Taylor 9ca57f9a5c Protect against a possible bounds error. 2021-02-02 11:39:29 -05:00
Joe Taylor 14d18306e6 Use single_decode and lagain as intended in Q65. 2021-02-02 09:58:04 -05:00
Joe Taylor 5850317de0 Speed improvements for Q65 multi-decode. 2021-02-02 09:27:40 -05:00
Joe Taylor 7d069c5617 Don't get too close to the Wide Graps frequency limits. 2021-02-01 15:52:25 -05:00
Joe Taylor 34cb4c502d Eliminate some redundant candidates. 2021-02-01 14:23:49 -05:00
Joe Taylor 72a4158898 First working multi-decode procedure for Q65. 2021-02-01 13:28:59 -05:00
Joe Taylor 86ada8c9d4 Working toward multi-decode capability. 2021-02-01 10:54:04 -05:00
Joe Taylor 6519c07a71 Working toward a good multi-decode solution ... 2021-01-31 15:10:50 -05:00
Joe Taylor f7cde117fe Extens orange sync surve to the full displayed frequency range. 2021-01-31 13:41:32 -05:00
Joe Taylor cae3095174 Allocate and use 2d CCF only within q65_ccf_85(). 2021-01-31 11:39:04 -05:00
Joe Taylor ec6fe749f9 Update the Q65 test program. 2021-01-31 09:06:20 -05:00
Joe Taylor b8ea4c1c2c Zero the red curve in we're not trying for q3 decodes. 2021-01-30 15:23:30 -05:00
Joe Taylor 9e822d1806 Clean up possible cases where rms evaluates to 0.0. 2021-01-30 15:10:05 -05:00
Joe Taylor 2f5c368aad Remove a diagnostic write. 2021-01-30 14:59:55 -05:00
Joe Taylor 14c4164651 Remove the if(snr1.lt.2.8) test, for now. 2021-01-30 14:52:53 -05:00
Joe Taylor 7bd1249452 Code cleanup involving ccf1, ccf2, and plotting thereof. 2021-01-30 14:12:02 -05:00
Joe Taylor 1e7c53e0e4 Fix several comments. 2021-01-30 11:49:08 -05:00
Joe Taylor 791b39fce5 Estimate rms of ccf2 without using the 2-dimensional ccf(). 2021-01-30 11:36:43 -05:00
Joe Taylor 316f41996e Correct a flaw in setting ipk. Better loop ordering in ccf_22. 2021-01-30 10:59:46 -05:00
Joe Taylor 330ff03079 Move writing the red/orange sync curves into a subroutine. 2021-01-29 14:43:06 -05:00
Joe Taylor f056fc99ec Write parameters for successful decodes to file q65_decodes.dat. 2021-01-28 13:01:52 -05:00
Joe Taylor 48713f0f38 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2021-01-28 07:43:14 -05:00
Joe Taylor 4e27b009f0 Code cleanup, looking toward possible implementation of -120F and -300F submodes. 2021-01-27 13:19:39 -05:00
Joe Taylor 29a2737cf7 Clean up spec64, now that QRA64 mode is gone. 2021-01-27 11:12:57 -05:00
Bill Somerville 332ecfebf8
Leave global FFTW3 clean up to main programs 2021-01-26 21:35:13 +00:00
Bill Somerville bd02e367f2
Leave global FFTW3 clean up to main programs 2021-01-26 21:34:10 +00:00
Steven Franke 2335575436
FST4/W: Disable envelope shaping at start and end of transmission when environment variable FST4_NOSHAPING=1. Works for fst4sim too. 2021-01-25 15:52:07 +00:00
Joe Taylor fb13265f37 Make ibwb larger by 1. 2021-01-23 14:14:17 -05:00
Joe Taylor 1489513803 Decodes without "newdat" should not add s1 into s1a again. 2021-01-23 10:58:28 -05:00
Bill Somerville 899a7fd895
Merge branch 'develop' into feat-fst280 2021-01-22 22:27:34 +00:00
Joe Taylor b64520591f Don't smooth at all if nsmo = 1: i.e., set it to nsmo=0. 2021-01-22 15:16:21 -05:00
Joe Taylor 8a436b63dd Separate message averaging for Odd and Even sequences. 2021-01-19 16:06:10 -05:00
Joe Taylor 0cc67bbc59 Separate accumulations of odd/even sequences in s1a. Still need to fix navg ==> navg(0:1). 2021-01-19 15:30:17 -05:00
Joe Taylor 39024253d2 Fix the oddball values of DT and f0 sometimes being displayed. 2021-01-19 14:11:21 -05:00
Joe Taylor d815eb7592 Replace the 'nsmo' smoothing: it is indeed useful, sometimes. (Can we have it both ways?) 2021-01-19 09:24:30 -05:00
Steven Franke 86b0affc56 FST4/W: Disable envelope shaping at start and end of transmission when environment variable FST4_NOSHAPING=1. Works for fst4sim too. 2021-01-18 13:47:54 -06:00
Joe Taylor baa029f4ba Add some descriptive documentation to the q65.f90 module. 2021-01-18 10:18:38 -05:00
Joe Taylor 6d220d46d2 Do not attempt decoding after TRp is increased and Decode button clicked. 2021-01-18 09:25:58 -05:00
Joe Taylor a9bce0dbd3 Don't allow a decode attempt with previous data if TRperiod has increased. 2021-01-17 19:50:58 -05:00
Joe Taylor 2aee8d9d62 Resize s1a when required. 2021-01-17 14:31:56 -05:00
Joe Taylor a53b3dc697 Computing 2d ccf over all freqs takes too long and too much memory. There's a better way! Remove the 'nsmo' smoothing: it's not helpful. 2021-01-16 14:18:15 -05:00
Joe Taylor 20aa3a8e23 Fix ia2 definition. 2021-01-16 12:24:42 -05:00
Joe Taylor 397c31a62d Extend red/orange sync curves to full width. Display navg on status bar. 2021-01-16 12:21:13 -05:00
Joe Taylor b343deb8cd Correct a problem with reporting DT and f0 for Q65 'q3' decodes. 2021-01-16 10:21:34 -05:00
Bill Somerville 455ec12e44
Merge branch 'develop' into feat-fst280 2021-01-15 22:14:36 +00:00
Bill Somerville 63851911b5
Merge branch 'release-2.3.0' into develop 2021-01-15 21:54:14 +00:00
Joe Taylor 1f9eeb52cc Add user option for Auto_Clear_Avg after a decode. 2021-01-15 14:12:52 -05:00
Joe Taylor ada5a60124 All types of Q65 message averaging are now implemented and functional. 2021-01-15 12:40:38 -05:00
Joe Taylor b64c1faba4 Prepare for doing AP=012 decodes from s1a. 2021-01-14 15:52:51 -05:00
Joe Taylor 70a3481a4f Improved organization for obtaining 'q3n' decodes. 2021-01-14 15:39:48 -05:00
Joe Taylor cbb939453f Code cleanup. 2021-01-14 15:19:33 -05:00
Joe Taylor 921831119c Message averaging now working for 'q3n' decodes. 2021-01-14 14:56:37 -05:00
Joe Taylor 02d410d4f7 Send both idec and navg to the q65 callback routine. 2021-01-14 13:23:09 -05:00
Joe Taylor fca6d482f7 Radionalize the reporting of idec values. 2021-01-14 13:13:40 -05:00
Joe Taylor 0abdff0216 Clean up the usage of q65_dec_q3, q65_ccf_85, and q65_ccf_22. 2021-01-14 10:58:11 -05:00