Commit Graph

2063 Commits

Author SHA1 Message Date
sirhc808 27d4471cde Merge branch 'ft9_refactor' into feat-refactor
# Conflicts:
#	CMakeLists.txt
#	lib/ft4/getcandidates4.f90
#	lib/ft4/sync4d.f90
2019-07-02 12:06:14 -05:00
sirhc808 84fd0ed7c7 clean up a few warnings 2019-07-01 21:10:43 -05:00
Bill Somerville adcf202637
Repair a crash when decoding ISCAT
Passing a  auto stack variable to  a future is  not a good idea  as it
will almost certainly  go out of scope before the  future has finished
executing.
2019-06-30 12:17:17 +01:00
Steve Franke e7889ba11b FT4: candidates within 20 Hz of nfqso are presented to the decoder first. 2019-06-24 11:09:55 -05:00
Steve Franke c68679bd10 Tweak to reduce the number of bad candidates. 2019-06-19 09:07:08 -05:00
Steve Franke efb01d014d Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-06-18 11:36:03 -05:00
Steve Franke 6caf9955a4 Back off to 77 AP bits for RR73 decodes, for now. 2019-06-18 11:35:54 -05:00
Joe Taylor 396bf1a013 Correct a flaw in ft8sim when generating data with large abs(DT). 2019-06-17 11:26:46 -04:00
Steve Franke c26d0b4f29 FT4: Imrovements to sync.
Divide DT search range into 3 segments. Search central segment (near DT=0)
first and try to decode the largest peak. Then find the largest peak in each
of the surrounding segments and try to decode those only if the peak is larger
than the one found in the central segment.

Also re-indent ft4_decode.f90 and some other minor tweaks.
2019-06-16 09:46:33 -05:00
Steve Franke b4a318e5a9 Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-06-14 16:29:10 -05:00
Steve Franke 7e9cc9cbc7 FT4: Improve sync performance on disturbed channels. Make jt9 command-line option -d work 2019-06-14 16:28:59 -05:00
Joe Taylor 7bd15246ae Adjustments to utility program rtty_spec.f90 2019-06-13 11:07:29 -04:00
Joe Taylor 7e1eaf3f31 Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-06-12 11:34:41 -04:00
Joe Taylor 9de51ebfa3 Rename and tweak rtty_spec.f90. 2019-06-12 11:31:35 -04:00
Steve Franke fc07bd9287 FT4: minor tweak to avoid passing an unnecessary argument and reject bad candidates sooner. 2019-06-12 08:16:10 -05:00
Steve Franke 89dc109968 Re-enable printing of ?a# decode quality and ap-type annotations, for now. 2019-06-11 09:17:13 -05:00
Steve Franke 8b195a91e9 Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-06-08 08:36:40 -05:00
Steve Franke 3c23a05d1f Move demod and bit metric calculation to a subroutine. This will make
it easier to experiment with alternative schemes for demod.
2019-06-08 08:34:46 -05:00
Bill Somerville 77094c88bf
Merge branch 'release-2.1.0' into f2008 2019-06-07 17:17:01 +01:00
Joe Taylor d4a7a292c0 Implement message type i3=5 (for WWROF contest exchange) in packjt77. 2019-06-06 10:29:58 -04:00
Bill Somerville f346d37fd6
Modernize Fortran interfaces that are called from C/C++
Making Fortran  interfaces called from other  languages fully portable
avoids issues with newer Fortran compilers.
2019-06-06 15:00:47 +01:00
Steve Franke f9e9bc01a1 Update some comments, delete obsolete files. 2019-06-05 10:17:59 -05:00
Steve Franke 054d098d8b Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-06-04 14:53:52 -05:00
Steve Franke 97be1b46b9 Add more protection against the i0 crash that has occurred in getcandidates4.f90. 2019-06-04 14:53:45 -05:00
Joe Taylor 6a2ac44916 Use LU=26 in readwav.f90. 2019-06-04 10:39:43 -04:00
Joe Taylor d3121bfedd Correct the open() statement in readwav.f90. 2019-06-04 10:19:35 -04:00
Steve Franke fc4dcc6d88 Fix a bug that caused FT4 decoding to fail when widegraph Start freq was less than 200 Hz. 2019-05-27 16:34:53 -05:00
Steve Franke f00bcebb9c Enable lapcqonly for FT4. This disables AP for all but CQ messages if 5 minutes or more have elapsed since the last Tx. 2019-05-26 13:25:36 -05:00
Steve Franke 11065c349c Call OSD if Deep decoding is selected. 2019-05-26 12:08:07 -05:00
Steve Franke 8c371d7d66 Remove an obsolete routine. 2019-05-26 09:55:39 -05:00
Steve Franke 7e4de91626 Fix a comment. 2019-05-26 09:52:17 -05:00
Steve Franke 3bc5e538d2 FT4: Implement polynomial baseline fit. 2019-05-25 10:58:04 -05:00
Steve Franke 6dbaa28a01 Fix DT search range so that it includes DT= +/-1.0. 2019-05-24 20:11:20 -05:00
Steve Franke 883c914d29 Make DT=0 mean that the first full symbol starts at t=0.5s. Formerly DT=0 corresponded to the beginning of the ramp-up symbol. Fix a bug that caused signals with large DT to wrap around instead of truncating them. 2019-05-24 20:09:00 -05:00
Joe Taylor 2ab4b59d88 Fix ft4sim_mult for 7.5 s T/R sequences. 2019-05-23 14:06:00 -04:00
Steve Franke 932e100a2c Update jt9.f90 to account for changes to FT4. 2019-05-23 09:55:50 -05:00
Steve Franke a9623703b3 FT4: Change Fortran code to NSPS=576 and make necessary accompanying
changes on the C++ side. Basically works except that Tx audio has
incorrect DT and audio is truncated at the end. Also, command line
decoding using JT9 is not as sensitive as decoding from within WSJT-X.
2019-05-22 17:02:15 -05:00
Steve Franke 80307b64ad Add a temporary research tool. 2019-05-22 17:01:06 -05:00
Joe Taylor 10aaec90e3 FT4 decodes using jt9 from command line now use ndepth=3. 2019-05-21 12:09:17 -04:00
Joe Taylor 2044b736da Fix a bug in calculation of S/N in JT4 mode. 2019-05-20 12:46:36 -04:00
Steven Franke ab1454a24c Try to avoid a crash in freqcal.f90 when data is all zeros. 2019-05-11 09:36:15 -05:00
Steve Franke 0668c4fce0 Improve sync at large DT. 2019-05-08 11:34:16 -05:00
Steve Franke 0795651f0f FT4: Initialize mycall13 and dxcall13 for unpack77. 2019-05-04 08:05:28 -05:00
Bill Somerville 2e5152ad08 Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-05-03 23:34:39 +01:00
Steve Franke 3611be8ba0 Try to avoid an array bounds error that has been reported by a user. Cause unknown. 2019-05-03 10:51:45 -05:00
Steve Franke ab282fae78 Add bLowSidelobes argument to the call to symspec. It is initialized to FALSE. 2019-05-03 09:01:18 -05:00
Bill Somerville 45a1841eec Fix another grid variable length to suit new azdist API 2019-05-02 22:01:31 +01:00
Steve Franke 156f62d2fe 1. Fix array bounds mismatch in subroutine call that was the likely cause of Fortran crashes, and 2. open up DT search range to +/- 0.77s 2019-05-02 11:39:18 -05:00
Steve Franke 8b483620be Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-04-30 20:12:42 -05:00
Steve Franke b5f0cc7ea7 Add a third decoding pass. 2019-04-30 20:02:42 -05:00
Bill Somerville 3916316a1c Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-04-30 15:43:01 +01:00
Bill Somerville b29a6d14ea Workaround for a crash on macOS when compiling with gfortran 8.3 2019-04-30 15:13:26 +01:00
Steve Franke 0a12b34ec5 Avoid a potential out-of-bounds error. 2019-04-30 08:54:42 -05:00
Steve Franke 50eb2914af Change FT4 mode symbol to plus (+). 2019-04-26 16:44:09 -05:00
Steve Franke 561af7f411 Avoid zeroing cwave when it is not going to be used. 2019-04-20 09:37:36 -05:00
Bill Somerville cf2219173a Squash a SEGV 2019-04-20 01:14:23 +01:00
Steve Franke 5814887770 FT4: Wire up Fast/Normal/Deep. 2019-04-19 14:38:54 -05:00
Steve Franke 2746338757 Measure time spent in subtract4.f90. 2019-04-18 17:19:56 -05:00
Steve Franke e8d17a9898 FT4: Subtraction is basically working. 2019-04-18 14:16:39 -05:00
Steve Franke be72461142 FT4: Some groundwork for subtraction. 2019-04-18 14:15:24 -05:00
Joe Taylor 655e0029fd Define the expected file length for FT4 data. 2019-04-17 14:03:27 -04:00
Steve Franke f296e37630 Fix a bug that didn't show up when I compiled on the Mac. 2019-04-12 18:54:33 -05:00
Steve Franke cd8ea16f40 FT8: Use GFSK waveform with BT=4.0 as reference for subtraction, for now. May want to change to BT=2.0 before v2.1 release? 2019-04-12 17:11:26 -05:00
Joe Taylor a545b83bc3 Command-line argument for decoding FT4 files. 2019-04-03 15:40:33 -04:00
Joe Taylor b3f62276e7 Fix the DT values generated in ft4sim_mult. 2019-04-03 12:45:38 -04:00
Joe Taylor 9fe179d396 Fix ft8sim_mult to generate synchronous FT4 signals. 2019-04-03 11:48:57 -04:00
Joe Taylor 50d4120c0c Add timer calls to FT4 decoder. 2019-04-03 10:26:47 -04:00
Joe Taylor 6ea9f4990d Several tweaks to FT4 simulation and decoding procedures. Now -0.5 < DT < 0.5 2019-04-03 10:13:50 -04:00
Joe Taylor 013c06b6ca Fix a probmel with decoding FT4 from .wav files. 2019-04-03 09:25:32 -04:00
Joe Taylor d1c5bbecfe Add the new ft4_decode file. 2019-04-02 12:21:03 -04:00
Joe Taylor e0d4c94cc1 Some very basic functionality for time-synchronized FT4. 2019-04-01 14:23:10 -04:00
Steve Franke c7ec9b1927 Fix indenting. No functional changes. 2019-03-30 16:40:24 -05:00
Steve Franke 68f82c95de FT4: Only do the big FFT once for each candidate. Duh. 2019-03-30 15:55:05 -05:00
Steve Franke 73efc09392 Speed up sync. 2019-03-28 14:34:03 -05:00
Steve Franke 5e1637a5db Fix a bug and remove a redundant sanity check. 2019-03-28 14:01:30 -05:00
Joe Taylor 67b9f327a5 Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-03-28 13:21:02 -04:00
Joe Taylor 54cd97f918 Protect against bad inferred candidate frequencies f0 in FT4 mode. 2019-03-28 13:07:37 -04:00
Steve Franke fe8aa87401 Add some sanity checks to getcandidates4.f90 2019-03-28 11:13:26 -05:00
Steve Franke 3490c0d1e3 Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-03-28 11:02:20 -05:00
Steve Franke 23c54540e7 Increase maximum wav file length to 20s. 2019-03-28 10:59:20 -05:00
Joe Taylor 6f00ec79a2 Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0 2019-03-28 09:47:50 -04:00
Joe Taylor cfb36395e0 Add some better usage examples for ft4sim. 2019-03-28 09:22:29 -04:00
Joe Taylor 580fce8320 Allow oddball file names for input to ft4d. 2019-03-28 09:21:01 -04:00
Steven Franke a605ff4050 For now, limit noise level estimation to [300,2500] Hz. 2019-03-27 20:55:15 -05:00
Joe Taylor 43c38de884 Minor tweaks for FT4 debugging and possible tuning. 2019-03-26 14:00:32 -04:00
Steve Franke 0fef707118 Widen candidate frequency offset window to f0=[10,4990] Hz. 2019-03-21 13:27:10 -05:00
Joe Taylor 0ea485b305 Bring allsim up to date with changes elsewhere. 2019-03-13 11:35:47 -04:00
Joe Taylor e150d003d6 Fix an inforrect constant in ft4_rx() that skipped over first 0.208 s of Rx data. 2019-03-13 10:31:23 -04:00
Steve Franke 7a0823301a Remove some temporary code. 2019-03-09 10:03:01 -06:00
Steve Franke 8ddf3f8acc Change default to DT=0.14 s for simulated wav files. 2019-03-09 09:13:26 -06:00
Steve Franke 1b591e2c8c Make ft4d work with cqstr. 2019-03-04 17:26:24 -06:00
Steve Franke d7012267c0 CQ message type strings are now passed from mainwindow.cpp to ft4_decode.f90, to enable AP decoding of special CQ messages. 2019-03-04 17:10:57 -06:00
Steve Franke 4769bf45d2 Make FT4 AP decoding work in RTTY RU and Field Day activities.
Move Nuttal window to standalone subroutine nuttal_window.f90 and
use Nuttal window in ft4/getcandidates4.f90.
2019-03-03 13:02:22 -06:00
K9AN 3176c1d3ef wsprd Makefile now builds wsprsim too. 2019-03-01 17:48:57 -06:00
K9AN 4d5fa21821 More tweaks to wsprd Makefile. 2019-03-01 17:07:11 -06:00
K9AN 9ff9dc5c42 Make wsprd Makefile work on Linux with gcc/gfortran. 2019-03-01 14:36:26 -06:00
Joe Taylor 5c7e1ba35d Complete the code cleanup in ft4sim. 2019-02-27 09:38:59 -05:00
Joe Taylor 1c617e2367 Minor code cleanup to ft4sim.f90 and ft4sim_mult.f90. 2019-02-27 09:34:40 -05:00
Bill Somerville 278c544a6a Merge branch 'develop' into feat-ft2 2019-02-26 11:52:14 +00:00
Steve Franke fdca7c2dcb Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-02-25 15:03:55 -06:00
Steve Franke 3759198982 Remove ramp-up and ramp-down symbols. Instead, shape the first 1/8th of first and last real symbols. 2019-02-25 15:03:43 -06:00
Joe Taylor fdfb655b06 Option to select "Low sidelobes" or "Most sensitive" for waterfall spectra. 2019-02-25 15:04:05 -05:00
Steve Franke ec2d5b6233 Fix the sign of one of the Nuttal window coefficients. Change BT to 2.0. 2019-02-25 12:57:34 -06:00
Steve Franke 17ac99344c For now, change to BT=1.5 for FT8. This commit enables the waterfall analysis window. This decreases sidelobes significantly in exchange for increased noise bandwidth. Sensitivity to weak tones will be degraded somewhat. 2019-02-23 14:18:22 -06:00
Steve Franke 5d914a1eb1 Make ft8sim_gfsk work with recent changes to gen_ft8wave.f90. 2019-02-22 15:16:29 -06:00
Joe Taylor 25bfa3798a Transmit FT8 using a gaussian-filtered waveform. 2019-02-22 13:39:39 -05:00
Steve Franke d9c99601ae Fix bugs in gen_ft8wave.f90. 2019-02-21 15:56:21 -06:00
Steve Franke 9425bd4d37 Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-02-21 15:48:08 -06:00
Steve Franke 1acb5d5d99 Add routines needed to test FT8 with GFSK pulses. 2019-02-21 15:48:02 -06:00
Joe Taylor d5a1671210 FT4 decoding interval is now 288 ms. Saving of FT4 files is somewhat rationalized. 2019-02-21 10:08:18 -05:00
Joe Taylor a98e1d7f37 Minor code cleanup. 2019-02-15 09:55:27 -05:00
Joe Taylor 41c22b0153 Call fftwf_cleanup() from four2a to free all remaining fftw memory. 2019-02-15 09:38:28 -05:00
Joe Taylor 3c77b720f8 Account for buffer start time in ft4d. 2019-02-15 09:06:41 -05:00
Joe Taylor e5ea814bb9 Destroy FFTW plans when ft4d is finished. 2019-02-15 08:59:41 -05:00
Steve Franke 6c8a204d7e Make sure that message77 is initialized. 2019-02-14 18:54:14 -06:00
Steve Franke 473c7058ff Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-02-14 17:37:48 -06:00
Steve Franke 6ad6d44ffa When doing block detection of symbols, fill in incomplete blocks using
data from shorter block sizes.
2019-02-14 17:34:46 -06:00
Joe Taylor e4ba9f25fd Process one more 3456-sample chunk in ft4d. 2019-02-14 15:21:01 -05:00
Joe Taylor 55e0e32e59 Fix ft4d so that it reads and processed full 15-second files. 2019-02-14 15:10:41 -05:00
Joe Taylor 9a6c82d09b Tweaks to make valgrind somewhat happier. 2019-02-14 14:56:02 -05:00
Joe Taylor 073a22125a Minor cleanup: debugging a problem with FT4 decoding. 2019-02-14 14:09:22 -05:00
Joe Taylor c2cb55a68a Reduce FT4 chunk size fro 500 to 288 ms; suppress duplicate decodes from close to chunk ends. 2019-02-13 14:42:57 -05:00
Bill Somerville 7d66f442d6 Fix up some compiler errors when using gfortran v9 2019-02-10 20:43:51 +00:00
Steve Franke 186482811a Use 91 bits for RR73 messages. 2019-02-09 16:08:39 -06:00
Steve Franke b415faae20 Remove char(0) from mycall and hiscall. 2019-02-08 16:44:18 -06:00
Steve Franke 0f03d02e74 Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-02-08 15:17:52 -06:00
Steve Franke 33498cc10f Disable AP if ncontest=5 or 6 (Fox and Hound). 2019-02-08 15:17:46 -06:00
Steven Franke 7d70c5e9e1 Still trying to make data_dir work under all conditions. This makes it work with ft4d. 2019-02-08 11:24:22 -06:00
Steve Franke e3830dcb27 Remove temporary indent file. 2019-02-07 18:52:51 -06:00
Steve Franke cbfcb76193 AP decoding basically works. Make data_dir setting work on the Mac. 2019-02-07 18:48:38 -06:00
Steve Franke ecbeda5297 Disable sync2 calculation for now. 2019-02-07 10:16:28 -06:00
Steve Franke 60cb4a33aa Re-enable second sync pass. 2019-02-05 19:53:53 -06:00
Steve Franke 71cb6d9f50 Use 4 different Costas arrays to prevent false syncs as received frames move
through the analysis window.

Add a random 77-bit vector to each message so that tone transitions occur
even if the message contains a long string of 0 or 1 (like a CQ).

Add alternative sync calculation as an option (sync2), for testing.

Add basic framework for AP decoding.
2019-02-05 19:18:50 -06:00
Steve Franke 91e3dbdf20 New scheme for finding candidates. Speed up sync. Improved SNR calibration. 2019-02-02 16:29:17 -06:00
Steve Franke 40fd3f6551 Make writing to data_dir work on the Mac. 2019-02-02 11:04:11 -06:00
Joe Taylor 22209030e2 Move files all_ft4.txt and clockit.out to the data_dir directory. 2019-02-01 11:56:08 -05:00
Joe Taylor 98d665c678 Add subroutine clockit() and use it for profiling ft4_decode(). 2019-02-01 10:47:47 -05:00
Joe Taylor 9c2700128c Generation of FT4 Tx waveform from itone() moved to a separate subroutine. 2019-01-31 16:07:07 -05:00
Joe Taylor b32799d2b8 Add xdt to lines printed by ft4sim_mult. 2019-01-31 14:06:05 -05:00
Joe Taylor 04f085bb24 Proper handling of multiple decodes from one call to ft4_decode. 2019-01-31 13:55:21 -05:00
Joe Taylor a80b955fe7 Decode FT4 over the full frequency range displayed in waterfall. 2019-01-31 12:10:58 -05:00
Joe Taylor 0dd4577143 Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-01-31 11:38:55 -05:00
Joe Taylor 7ae1210266 Fix several flaws in the waveforms generated by ft4sim_mult. 2019-01-31 11:37:54 -05:00
Steve Franke fdb84c0e63 Fix an off-by-one error. 2019-01-30 19:19:38 -06:00
Joe Taylor 9f909b6b1b Oops, I left garbage in the file. 2019-01-30 15:49:52 -05:00
Joe Taylor 1261434e84 Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-01-30 15:37:38 -05:00
Joe Taylor 189f538dc0 Add ft4sim_mult, which is basically functional. 2019-01-30 15:33:47 -05:00
Steve Franke 66bb999126 Improve ft4_downsample filter. Improve getcandidates4. 2019-01-30 12:47:01 -06:00
Joe Taylor 3f7fb38e81 More code cleanup -- just comments and formatting. 2019-01-30 12:22:41 -05:00
Joe Taylor 2888c05eff Code cleanup. 2019-01-30 11:20:29 -05:00