w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-29 23:58:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,274 Commits 5 Branches 98 Tags 208 MiB
630ef640ac
Commit Graph

2306 Commits

Author SHA1 Message Date
Joe Taylor
0926943326 Silence some compiler warnings. 2020-03-17 16:05:02 -04:00
Joe Taylor
0603f52e75 Delete a bunch of obsolete Makefiles. 2020-03-17 15:51:10 -04:00
Joe Taylor
f5e6e7e8ff Silence some compiler warnings. 2020-03-17 15:50:21 -04:00
Steven Franke
0f2793dcbe Update calls to bpdecode174_91. 2020-03-17 12:18:10 -05:00
Steven Franke
8f7221825f First cut at setting up Fast/Normal/Deep parameters. 2020-03-17 08:51:37 -05:00
Joe Taylor
a2c3907b75 Fix a bug that affected jt9 running from command line. 2020-03-16 13:47:41 -04:00
Joe Taylor
5e94de71fd Use tseq rather than ipc1 as test for early bailouts. 2020-03-16 12:11:56 -04:00
Joe Taylor
8b8cadcf3a Fix some comments and do not compare ints with floats. 2020-03-16 11:08:09 -04:00
Joe Taylor
d6cc789f40 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-03-16 10:54:25 -04:00
Bill Somerville
5024cc4e2d
Add missed file to repo 2020-03-16 14:39:42 +00:00
Joe Taylor
fea2d43489 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-03-16 10:35:08 -04:00
Joe Taylor
2653626d45 Replace the changes I removed by executing 'git reset HEAD~'. 2020-03-16 10:27:22 -04:00
Bill Somerville
488c2e8066
Cleanup and refactor Fortran shared memory usage 
also added some missing locking for the ipc(1) value in ft8_decode().
 2020-03-16 13:58:38 +00:00
Joe Taylor
3962aa3c43 Replace hijacked ss(1:3,1) with a separate ipc(3) array. 2020-03-15 14:25:56 -04:00
Bill Somerville
46638f6f07
Add shared memory synchronization to make access safe 2020-03-15 00:25:35 +00:00
Joe Taylor
649a79dfc1 New IPC trial: use shmem instead of .start .stop .quit files. 2020-03-14 17:06:54 -04:00
Bill Somerville
523e9a1a07
Enhanced process control for jt9 executable 
The wsjtx  process creates control  files .start, .stop, or  .quit and
the jt9  process deletes  them.  This  is intended  to avoid  any race
conditions that get the processes out of sync.
 2020-03-14 00:01:54 +00:00
Joe Taylor
8151816c84 Change formats of diagnostic writes so that GUI and Fortran output can be sorted together. 2020-03-13 11:25:22 -04:00
K9AN
f7d7c073c8 Fix a bug. 2020-03-12 15:36:03 -05:00
Joe Taylor
8e7685ea36 Do not alolow bailouts when data were read from disk. 2020-03-12 15:07:56 -04:00
Joe Taylor
0d535f24fb Move the AA and CC diagnostic writes from jt9a() to decoder(). Add ndecodes to BB and CC. 2020-03-12 14:31:02 -04:00
Joe Taylor
f30754bdf5 Remove superfluous part of if() test. 2020-03-12 13:53:57 -04:00
Joe Taylor
68c942a70e Correct the 47-buffer bailout place. Change bailout times 45->46 and 48->49. 2020-03-12 13:00:42 -04:00
Joe Taylor
6e308f0018 More attempts to diagnose or fix the FT8 "hung decoder" issue. 
On the Fortran side:
 - For the nzhsym=41 activation, bail out if m_ihsym reaches 45
 - For the nzhsym=47 activation, bail out if m_ihsym reaches 48
 - Change the format and content of what's written to fort.71
 - Change msdelay from 10 to 1

In mainwindow.cpp:
 - change format and content of what's written to qDebug
 - always start FT8 decoder at m_ihsym = 41, 47, and 50
 2020-03-12 12:33:34 -04:00
Joe Taylor
d69cb49e9a Diagnostic writes to fort.71 in jt9a.f90. 2020-03-11 14:02:19 -04:00
Joe Taylor
199ff3dd3d Experimental work-around for FT8 decoding on slow computers. Important changes: 
- don't start function decode() is decoder is already busy
  - send updated m_ihsym to jt9[.exe] via ss(1,1).  Bill won't like this!
  - jt9 bails out of the 41-buffer pass at m_ihsym=45.
 2020-03-10 16:26:42 -04:00
Steven Franke
cf5aab0088 Allow up to 500 pre-candidates. 2020-03-09 14:03:53 -05:00
Steven Franke
d57b84be27 More changes to increase ft8 decoder yield. 2020-03-08 12:03:52 -05:00
Steven Franke
b130479249 Make jt9 work with the 41/47/50 scheme. 2020-03-06 19:03:09 -06:00
Steven Franke
83d87e9654 Fix an apparent typo in ft8_decode. 2020-03-06 19:02:41 -06:00
Steven Franke
fa071324e5 subtractft8: Delete unused variable, i1 2020-03-06 13:21:04 -06:00
Steven Franke
3467ee7924 Make Normal decode the same as Deep except no DT refinement at nearly=47. 2020-03-06 11:54:28 -06:00
Steven Franke
f2266c3c54 1. subtractft8: on the last call to sqf, don't need to do the long FFT. 
2. mainwindow.cpp: based on the time when <DecodeFinished> is received, calculate
mswait to try to place the killFile time at 0.75*m_TRperiod.
 2020-03-06 11:06:44 -06:00
Joe Taylor
f367b6d6b9 Temporary version: decode call at 47 buffers only does subtractions. 2020-03-06 10:38:24 -05:00
Joe Taylor
431ec50212 Progress toward decoding at 41/47/50 buffers. Not yet complete! 2020-03-05 15:37:31 -05:00
Joe Taylor
cd9efc54ea Correct the reported value "ndecoded" for FT8 mode. 2020-03-03 15:18:25 -05:00
Joe Taylor
02eb4fe90b Use a table lookup for exp(i*phi) in gen_ft8wave.f90. 2020-03-03 12:40:27 -05:00
Steven Franke
761ee1cd85 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-02-29 13:47:09 -06:00
Steven Franke
037805ca8f Improve dt estimation in ft8b so that dt refinement procedure in subtractft8.f90 can be done with 4 calls to sqf instead of 7. 2020-02-29 13:46:59 -06:00
Joe Taylor
6c1efac576 Once more, to get the <DecodeFinished> behavior right for realtime monitoring as well as data from disk. 2020-02-28 15:45:51 -05:00
Joe Taylor
8e7a56634b Set nearly=41; don't write <DecodeFinished> after the early decode pass. 2020-02-28 15:03:39 -05:00
Joe Taylor
f9322f2b43 Add calls to timer() around calls to subtractft8(). 2020-02-28 11:25:32 -05:00
Steven Franke
877878ea88 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-02-27 09:10:27 -06:00
Steven Franke
403904089e Re-arrange the fields in the ALL_WSPR.TXT file. 2020-02-27 09:10:17 -06:00
Joe Taylor
b9888a09ff Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-02-26 13:16:12 -05:00
Joe Taylor
00210d1141 Minor code cleanup in subtractft9.f90. 2020-02-26 13:14:49 -05:00
Steven Franke
1dde5fdd6c Fix a minor bug in the unpk_ routine that was introduced in the last commit. 2020-02-25 15:28:57 -06:00
Steven Franke
38bac5e335 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-02-25 10:56:22 -06:00
Steven Franke
0ca6cbb575 wsprd: improve decoding and reduce the number of false decodes 
Hashtable entries now include the 4-digit grid obtained from the most
recent Fano decode of the callsign. The stored grid is used to validate
OSD decodes. OSD decodes of type 1 messages are accepted only if the
callsign is present in the hashtable and if the grid matches the grid
stored in the hashtable.
 2020-02-25 10:48:38 -06:00
Joe Taylor
65fda32a05 Previous commit was in error. This is the best-performing subtractft8.f90. 2020-02-25 09:04:18 -05:00
Joe Taylor
ff46c5a0c4 In subtractft8.f90: refine DT for early decodes before subtracting them from dd(). 2020-02-24 16:18:42 -05:00
Joe Taylor
1d159a18c7 More cleanup to satisfy fussy gcc 10 compiler. 2020-02-21 13:36:49 -05:00
Joe Taylor
adb7dfcac3 Satisfy fussy compilers like gcc 10: Type mismatch between actual argument at (1) and actual argument at (2) 2020-02-21 09:52:20 -05:00
Steven Franke
ac1d0f837d Comment out diagnostic write statement. 2020-02-17 10:56:47 -06:00
Steven Franke
20b942b802 FT8: Add an experimental 4'th bit metric. Make dupe removal unconditional. 2020-02-17 10:53:52 -06:00
K9AN
207fd05f9f Minor simplification - remove unnecessary nint() functions in get_spectrum_baseline.f90 2020-02-14 16:54:56 -06:00
Joe Taylor
ecb09ba852 Revert "Send "<DecodeFinished>" for FT8 only after the full-length decoding pass." 
This reverts commit 364db768db.
 2020-02-14 17:44:46 -05:00
Steven Franke
09b47b0e8e Change lower limit of analysis window from 200 Hz to 100 Hz. 2020-02-14 15:28:16 -06:00
Joe Taylor
364db768db Send "<DecodeFinished>" for FT8 only after the full-length decoding pass. 2020-02-14 11:49:07 -05:00
Joe Taylor
e25696f4e3 Enable early+normal decoding for FT8 data read from disk, within WSJT-X. 2020-02-14 11:16:54 -05:00
Joe Taylor
cf6ee661ab Fix two bugs (thanks Steve!); add early-decode logic to jt9[.exe] from command line. 2020-02-14 10:15:37 -05:00
Joe Taylor
2823cc3e85 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-02-13 15:34:09 -05:00
Steven Franke
e936a863a8 Fix some bugs related to osd decoding in msk144 and disable it for now. 2020-02-13 14:25:36 -06:00
Joe Taylor
4a4864d2ae FT8 early decoding is now working. 2020-02-13 15:05:37 -05:00
Steven Franke
08baa50a01 Experimental change to enable OSD decoding for MSK144 when ntol .le. 50 Hz 2020-02-13 08:48:51 -06:00
Steven Franke
cf07d478ac Some repairs and tweaks to development-related programs in fsk4hf directory. 2020-02-09 16:13:52 -06:00
Steven Franke
e9160f3c2f Make ldpcsim174_91 work again. Scale SNR2500 assuming coherent BPSK, same Eb as FT8. 2020-02-08 14:49:21 -06:00
Steven Franke
ff109a60ca Implement AP decoding for Hounds when Fox has a compound call with standard base call. 2020-02-03 10:48:51 -06:00
Steven Franke
96ad947a37 Implement decode quality metric for FT4. 2020-01-27 09:55:34 -06:00
Steven Franke
70b84478f0 Add WW_DIGI to the special activities section. Make necessary changes to 
the decoders. Also, an experimental change to the FT4 decoder to base
AP decoding passes on 4-symbol block detection instead of single symbol
detection. This provides about 1 dB improvement on the AWGN channel.
Sensitivity changes on other channels are TBD.
 2020-01-24 11:26:36 -06:00
Steven Franke
9aaffb9252 For FT4 - enable ndeep=4 within 80 Hz of nfqso. 2020-01-11 15:22:48 -06:00
Steven Franke
87b2bd74e2 More work on AP decoding for RU/SCC contests. 2020-01-09 11:44:58 -06:00
Steven Franke
a63e6e1209 - Force the use of standardized CQ modifier for FT4/FT8 contest operation. 
- Pass CQ modifier string to the ft4 decoder.
 2020-01-08 08:41:47 -06:00
Steven Franke
52075fca24 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-01-03 14:29:12 -06:00
Steven Franke
dda393dd81 Fix a typo. Thanks NQ6Z! 2020-01-03 14:28:37 -06:00
Joe Taylor
f069477dbb Bring test28.f90, ft4_testmsg.f90, ft8_testmsg.f90, ft8code.f90 up to date. 2020-01-03 13:34:56 -05:00
Joe Taylor
3cb75a49ec Reorder the FT4 test messages used in ft4code.f90. 2019-12-18 12:14:34 -05:00
Joe Taylor
26d1996eb8 Tweaks to ft4code. 2019-12-18 10:42:08 -05:00
Joe Taylor
3397bf49b4 Add utility program ft4code. 2019-12-18 10:02:00 -05:00
Joe Taylor
7d8cdd200c Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2019-12-11 16:34:34 -05:00
Joe Taylor
7c0bef98bc Update and correct some comments. No actual code changes! 2019-12-11 16:33:33 -05:00
Steve Franke
0f592eb48f Disallow decoded messages with i3.ge.6 as these are not yet defined. 2019-12-11 11:18:37 -06:00
Steve Franke
85b5967d99 Fix ncontest initialization and heap storage conflict. 2019-12-11 10:16:48 -06:00
Joe Taylor
794736043c Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2019-12-04 15:45:36 -05:00
Joe Taylor
61e8cb65d4 Update allsim.f90 and addit.f90 for the new FT8 and FT4 waveforms. 2019-12-04 15:44:38 -05:00
Steve Franke
a0d471cb0b Improve FT8 SNR estimates in two ways: 
(i) SNR no longer saturates at +20 dB
(ii) a large signal in the passband no longer causes the
SNR of weaker signals to be biased low.
 2019-11-27 15:58:52 -06:00
Steve Franke
091b7f03ed Delete un-needed file. 2019-11-27 15:57:40 -06:00
Steve Franke
d1530b0c19 Rename ft8sim files as follows: 
ft8sim_gfsk.f90 => ft8sim.f90
ft8sim.f90 => ft8sim_fsk.f90

This change reflects the fact that the GFSK waveform is now used in WSJT-X
for ft8 and ft4.
 2019-11-27 09:08:17 -06:00
Steve Franke
63e9c21a17 Simplify ft4sim by removing waveform generation code and replacing it with a call to gen_ft4wave.f90. 2019-10-24 10:36:50 -05:00
Bill Somerville
28f5cb0fb9 WSJT-X General Availability Release v2.1.0 wsjtx-2.1.0 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEUELwYiy7vDRM+hTD2GSwbR6BYY8FAl0qXxcACgkQ2GSwbR6B
 YY/ZGAf8Da+a+83dpnj5dnosIKWwSwgpiWHY0JKzm8fp0n3hcs5+rV1/gM81xXKT
 J3lbHWykGzMYlZNoEw3eNwQbXzOCf/7mOaeTKJQnBLukMpTLmsz5b5nYaCjvvRGM
 6HKSddNS3Q4iz4qdakOgWnqdZeYJkRR3Z3XsTmlrG02GsSVlbXzOEyceooqM6EGd
 w5WTkvpls+43OzwcGJ50SHzPlBAJYycE9vrAxxFOxU2fhqRRD/ttMZmUmjRY7Iqa
 jRRQ39K1Io7i9QG/3V6FBZDttqeFfvvlkVzH0/TeMeCUOQiKbzuGxM01PJ6be7D1
 H114v5l06GH56T7qpaF0IB2ZStkbrA==
 =voDy
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEUELwYiy7vDRM+hTD2GSwbR6BYY8FAl0qX30ACgkQ2GSwbR6B
 YY8p0QgAgt8Y/yLCyFw0+wfO2h8yIFyh2j1c8EfBf0+I/2xaIYMUfPPlmC3jkWhw
 mtoCJVKkpCNcxr9mo6wjQp7x90pRUH3k78O0VtzbKWz7lveoN7Vguo+iVHDbEhUA
 a9E6yMwvskH5Mr6+cFiS4EVYyjAsuG/BL+4FFMDUVQOaKXNBbgJuc2mjpHkcnEbK
 C+XUxipcAUElH1Ks90eHT/vLoowAOP9jo0xSR1RqJMJlaKHxWZivsBCfQdI1xxn0
 arlQO3bjIsxyNq/Ru7XWV5C56JmWjoPWCcqt5GRrNJLwGw/haSuDIMURaE/vrMif
 csar293vcm5PzuTADArTQkhqK951pQ==
 =1mJJ
 -----END PGP SIGNATURE-----

Merge tag 'wsjtx-2.1.0' into develop

WSJT-X General Availability Release v2.1.0 wsjtx-2.1.0
 2019-07-13 23:47:18 +01:00
Steve Franke
f224790569 Tweak for consistency. 2019-07-12 10:41:09 -05:00
Bill Somerville
60332e799e
Merge branch 'develop' into feat-refactor 2019-07-04 12:34:20 +01:00
Steve Franke
fa44ed84c5 Remove an unused routine. Minor tweaks. 2019-07-03 10:55:13 -05:00
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
Steve Franke
e57df307dd Fix a comment. 2019-01-29 15:42:30 -06:00
Joe Taylor
7e3b153d8b Correct the estimate of SNR for FT4 signals. 2019-01-29 13:56:04 -05:00
Joe Taylor
0a6d67c1d6 Make the simulated data files slightly longer so that WSJT-X can decode them. 2019-01-29 13:55:04 -05:00
Joe Taylor
e98231d4c1 Correct the call to genft4(); fix the displayed time for data from disk. 2019-01-29 10:39:34 -05:00
Steve Franke
d3b1f7e560 Prevent some out-of-bounds problems. 2019-01-27 19:28:41 -06:00
Steve Franke
57cf69e6ad First cut at identifying multiple candidates for decoding. Needs work. 2019-01-27 19:19:47 -06:00
Steve Franke
613bfaf3ee Change ft4 to use (174,91) code and 512 Sa/symbol. 2019-01-26 23:03:54 -06:00
Steve Franke
d9f4a27a3e Create ft4_decode.f90. Change stand-alone decoder ft4d.f90 to use ft4_decode.f90. 2019-01-26 11:42:07 -06:00
Steve Franke
c52f755afc Make Watterson simulator causal. 2019-01-25 16:26:13 -06:00
Steve Franke
9fa08d3838 Un-hardwire sync. 2019-01-25 16:06:45 -06:00
Steve Franke
8baf48701e Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-01-25 16:01:42 -06:00
Steve Franke
66e3f11fba Add ft4 files in lib/ft4. 2019-01-25 16:01:34 -06:00
Joe Taylor
5efa28164c Remove a redundant file reference in CMakeLists.txt. Fix call to unpck77 in genft2.f90 2019-01-25 14:46:17 -05:00
Steve Franke
3bdbf19d1d Make ft4sim and ft4d work. 2019-01-22 11:01:28 -06:00
Steve Franke
b4639b77d0 Fix CMakeLists.txt so that ft2_decode still builds. Fix a bug in ft4d - sync now seems to work. 2019-01-21 19:52:13 -06:00
Steve Franke
7b7857cd77 Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-01-21 19:33:51 -06:00
Steve Franke
f2dc394c84 Add ft4 files; ft4sim works, ft4d is work in progress. 2019-01-21 19:31:54 -06:00
Joe Taylor
486440beb4 Merge branch 'feat-ft2' of bitbucket.org:k1jt/wsjtx into feat-ft2 2019-01-18 16:23:19 -05:00
Joe Taylor
568fc0810e Tx now works, more or less, in FT2 mode. Needs testing! 2019-01-18 16:22:25 -05:00
Joe Taylor
2033a2b33d Add a missing file; tweak the FT2 decoder. 2019-01-18 12:33:45 -05:00
Joe Taylor
5f03d97a9e Implement basic Rx capability for FT2 in WSJT-X. 2019-01-18 11:51:15 -05:00
Joe Taylor
c81af0bbe5 Updates to code for stand-alone ft2[.exe]. 2019-01-18 08:57:46 -05:00
Joe Taylor
c6bc3c64bb Add parameters for FT8 and Ft2 to wavhdr.f90. 2019-01-18 07:45:59 -05:00
Steve Franke
f447fe49e1 Fix some indexing problems. Create subroutine ft2_gfsk_iwave.f90 for use with ft2.exe. Needs testing. 2019-01-17 15:25:06 -06:00
Steve Franke
7701516b43 ft2sim now creates a GFSK waveform with BT=1.0. It also adds raised cosine ramp up and down at the beginning and end of the transmission. 2019-01-17 14:01:40 -06:00
Joe Taylor
9b483d5ee1 Fix ft2 build to accommodate having merged changes from the hotfix branch. 2019-01-16 16:25:31 -05:00
Bill Somerville
074914d607 Fix merge issues 2019-01-16 20:55:01 +00:00
Bill Somerville
aee9c09851 Merge branch 'develop' into feat-ft2 2019-01-16 20:44:44 +00:00
Joe Taylor
0a648a109f Correct broken S/N for tx_once transmissions. 2019-01-16 15:00:12 -05:00
Joe Taylor
3023f7e5c6 Minor tweaks in formatting, etc. 2019-01-16 13:58:56 -05:00
Joe Taylor
dc5d9f1617 Add a comment. 2019-01-16 13:20:13 -05:00
Joe Taylor
12463451e2 Allow upper or lower case for "A" and "L" commands. 2019-01-16 13:16:10 -05:00
Joe Taylor
f194621695 Many improvements to ft2, including: 
- SNR displayed on decode line
 - Separate transmit() subroutine
 - Output sent to all_ft2.txt
 - Display Rx level (hit L to toggle On/Off)
 - Auto-sequencing  (hit A to toggle On/Off)
 2019-01-16 13:10:36 -05:00
Joe Taylor
60fb12dcd4 Add several more messages for testing. 2019-01-15 20:19:18 -05:00
Joe Taylor
4a4a83f021 Correct the logic for PTT control through a Windows COM port. 2019-01-15 19:21:58 -05:00
Joe Taylor
bbbe83ffe5 Progress: ft2.exe is now basically functional in audio-loopback tests. 2019-01-15 15:05:04 -05:00
Joe Taylor
8a6cee7e26 Add files for command-line program ft2[.exe]. 2019-01-14 16:39:50 -05:00
Steve Franke
348e7c8ad5 In principle, ft2d can now decode multiple signals. Not yet tested. 2019-01-13 15:44:16 -06:00
Steve Franke
1fb89929a9 Make ft2d slightly more robust. Still very rough. 2019-01-13 10:58:35 -06:00
Steve Franke
8f1baae048 If delay=0.0 make Watterson use only a single component to simulate flat fading. 2019-01-13 09:25:30 -06:00
Steve Franke
cf1fe6c3d6 More work on FT2. New frame format is 16sync + 128codeword. Data chunk is assumed to be 2.5s long. A rudimentary sync routine is implemented which finds the single strongest signal. 2019-01-12 13:28:10 -06:00
Steve Franke
f63f0301eb Tweak some decoder parameters for better performance. 2019-01-10 10:35:09 -06:00
Steve Franke
e0658f183f Add simulator (ft2sim.f90) and decoder (ft2d.f90) for experimental medium-fast mode. 2019-01-10 10:20:31 -06:00
Joe Taylor
95599a7153 Add a standalone FT8 decoder, for testing. 2019-01-09 12:45:20 -05:00
Joe Taylor
5adc211d1a Correct a minor bug in qra64.c. 2019-01-08 13:47:53 -05:00
Steve Franke
c4d078f55f Remove unnecessary character string space-padding. 2019-01-03 14:02:17 -06:00
Steve Franke
db5c9e1fe9 Make wspr OSD decoding work with type 2 messages (extended callsign + power in dBm). 2018-12-24 12:52:41 -06:00
Steve Franke
1a8ddad307 In ft8apset, mycall and dxcall must be at least 3 characters long, otherwise they are treated as non-existent. 2018-12-24 11:19:07 -06:00
Steve Franke
b44d7b472d Fix a typo. 2018-12-24 10:49:40 -06:00
Steve Franke
318ce0020e Try harder to ensure that we don't waste time trying to do ap decoding that would involve nonstandard calls. Current code does not support ap decoding with non-standard calls. 2018-12-24 10:45:02 -06:00
Bill Somerville
de9990bb60 Fix a mangled edit and an incorrect exit condition 2018-12-24 03:52:06 +00:00
Bill Somerville
8f9fdd29a8 Remove some unnecessary space padding and some compiler warnings 2018-12-24 02:23:56 +00:00
Bill Somerville
e4700b449e Make checks for /P and /R exact and only for trailing suffixes 2018-12-24 02:22:39 +00:00
Steve Franke
b8287eb584 Bring encode77.f90 up to date. 2018-12-23 15:34:00 -06:00
Steve Franke
86bc2cf1fb Merge branch 'hash-collision-handling' into hotfix-2.0.1-rc1 2018-12-23 14:05:37 -06:00
Steve Franke
081a302aca wsprd: further refinement of OSD decode quality check. 2018-12-21 19:24:16 -06:00
Steve Franke
ddd9e8c3fb wsprd: more rigorous quality checking of OSD-produced decodes. For now, discard all OSD decodes that map to an extended callsign. 2018-12-21 16:56:38 -06:00