Commit Graph

2461 Commits

Author SHA1 Message Date
Bill Somerville
22f66795a1
Improved C/Fortran string interoperation, and fix azel.dat updates
The azel.dat file is no  longer written with future Doppler correction
information designed  for rigs  that can't do  CAT QSY  commands while
transmitting.
2020-07-20 15:15:55 +01:00
Joe Taylor
159b8a97f7 Better handling of fSpread in mainwindow.cpp. Makes auto-seq work when plotspec is used. 2020-07-19 13:20:41 -04:00
Steven Franke
510537d4fe Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-07-18 09:02:16 -05:00
Steven Franke
98596a4be7 Choose nfft1 and ndown so that both nfft1 and nfft2 have small prime factors. 2020-07-18 09:02:11 -05:00
Bill Somerville
8b35e744d0
Increase Tx waveform storage & update wide graph nsps for FST240 2020-07-18 10:35:26 +01:00
Bill Somerville
4e0f1103b6
15 and 30 minute T/R periods for FST240 & FST240W 2020-07-17 23:44:14 +01:00
Bill Somerville
cccb38dbef
Pass hints to fst240sim, genfst240, and packjt77::pack77 on WSPR msgs
Due to  an ambiguity with  message encodings between 77-bit  QSO modes
and 50-bit  beacon modes with message  types 13.n3 4.0 and  0.6 a hint
needs to be  passed to ensure the right encoding  is emitted. The hint
only  effects  ambiguous messages,  others  will  be encoded  strictly
according to the message content.
2020-07-17 19:09:21 +01:00
Bill Somerville
c21a60144a
Larger 12kHz sample buffer 2020-07-17 19:08:21 +01:00
Steven Franke
322fd14a6a Use Joe's values for NSPS. 2020-07-17 11:29:21 -05:00
Steven Franke
02b66241d2 Add 15 minute and 30 minute TRperiod option for FST240. 2020-07-17 10:52:27 -05:00
Joe Taylor
7bd797c0e9 Improved estimates of Doppler spread. Comment the code in write_ref(). 2020-07-16 11:47:07 -04:00
Joe Taylor
f61cb1dcbd Better display format for w50 with plotspec. 2020-07-15 16:03:36 -04:00
Joe Taylor
b3882a93c0 Extend write_ref() to compute freq offset and Doppler spread. Also some minor code cleanup. 2020-07-15 15:50:17 -04:00
Joe Taylor
ff0d31986f File 'plotspec' in execution directory ==> save channel-gain spectrum to fort.52. 2020-07-15 13:15:38 -04:00
Bill Somerville
c5ab12d1f4
Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-07-15 01:48:01 +01:00
Bill Somerville
99f419f63c
Initialize prefix store for type 2 50-bit messages 2020-07-15 01:46:52 +01:00
Joe Taylor
ab3630b2e7 Compute spectrum for measuring fspread of a decoded FST240/FST240W signal. 2020-07-14 16:46:28 -04:00
Joe Taylor
c925f6d1cc Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-07-14 11:43:40 -04:00
Joe Taylor
cbeb81b499 Add LF/MF noise blanker capability for FST240 and FST240W. 2020-07-14 11:27:41 -04:00
Steven Franke
c5f0187036 Eliminate an unnecessary variable (NN2) in fst240sim.f90. 2020-07-13 19:59:14 -05:00
Steven Franke
a19d5d1556 Fix end subroutine line for new write_ref subroutine. 2020-07-13 15:10:01 -05:00
Steven Franke
db3e0d8022 Add a disabled option to print the reference waveform to fort.51. 2020-07-13 14:58:50 -05:00
Steven Franke
bac3cc7471 Remove spurious invocation of thresh variable. 2020-07-13 08:53:11 -05:00
Steven Franke
4cb902a4cc Try to get c_bigfft sorted out. 2020-07-11 16:39:31 -05:00
Joe Taylor
5b804d90a3 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-07-11 15:25:37 -04:00
Joe Taylor
3e61688229 Fix the nagging 'KA1R' problem with decoding after change in TRperiod. 2020-07-11 15:24:21 -04:00
Steven Franke
8998537622 Clean up a couple of loose ends. 2020-07-09 15:30:46 -05:00
Steven Franke
a47f34db92 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-07-09 14:13:31 -05:00
Steven Franke
8941b70a2a Changes to improve sensitivity on overspread channels. 2020-07-09 14:13:23 -05:00
Joe Taylor
114cd83376 Signal report range has been [-30,+99]. Not it is [-50,+50], in a backward-compatible way. 2020-07-08 11:25:07 -04:00
Bill Somerville
aa557820d4
Work around gfortran v10 error message 2020-07-08 02:25:25 +01:00
Bill Somerville
61a72e9d91
Merge branch 'develop' into feat-fst280 2020-07-06 23:44:00 +01:00
K9AN
d17bc2f97f Comment out debug prints. 2020-07-04 13:06:50 -05:00
Steven Franke
3fe6fa3d72 Rough first attempt at setting minsync according to setup. 2020-07-04 12:57:51 -05:00
Steven Franke
0357af2eb5 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-07-04 09:16:01 -05:00
Steven Franke
c176572ec0 Add options for sub-symbol integration for sync and symbol estimation. 2020-07-04 09:15:57 -05:00
Joe Taylor
4a0b7b3a1d Fix the "FST240W Type 2" and "FST240W Type 3" messages. 2020-07-03 12:01:26 -04:00
Steven Franke
7fb7e51283 Use N=1,2,3,4 for now. 2020-07-02 14:48:11 -05:00
Joe Taylor
352b497399 Remove a diagnostic print. 2020-07-02 13:43:50 -04:00
Joe Taylor
185cf3eb48 "Also FST240W" should set iwspr=2, not 1. Change ndeep to ndepth, for consistency. 2020-07-02 13:30:18 -04:00
Steven Franke
3f1fd6e2c1 Tweaks to decrease the number of garbage candidates slightly. 2020-07-02 11:54:10 -05:00
Steven Franke
6d0d21670e Change noise_bw to xnoise_bw so that it is real. 2020-07-02 08:45:37 -05:00
Steven Franke
e74595fdd5 Discard the all-zero codeword. 2020-07-01 16:42:22 -05:00
Steven Franke
6ebb487cd5 Remove residual WSPR_LF that was causing build errors. Build ldpcsim240_74. 2020-07-01 14:40:37 -05:00
Joe Taylor
94f5e2925c Correct the length of id2 sent to decoder for FST240W mode. 2020-07-01 15:04:15 -04:00
Joe Taylor
f2c3cbf9ac Implement basic functiionality of FST240W in the GUI. 2020-07-01 12:01:47 -04:00
Steven Franke
0f04f3285a Prevent decodes that fail to unpack from being printed. 2020-07-01 08:20:38 -05:00
Joe Taylor
22b782a4ae Can now decode FST240W signals from WSJT-X, using FST240 and the option "Decode -> Also FST240W". 2020-06-30 20:04:44 -04:00
Steven Franke
f6a8a179dc Hardwire for 50-bit messages. 2020-06-30 18:15:35 -05:00
Joe Taylor
361c1a96c1 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-30 17:23:58 -04:00
Joe Taylor
ae54c80a54 Here's a start on GUI changes to support FST240W as well as FST240. 2020-06-30 17:14:58 -04:00
Steven Franke
5336d959c7 Remove temporary stuff. 2020-06-30 16:06:53 -05:00
Steven Franke
a8b87f1f3a Fix wspr-mode SNR. 2020-06-30 16:05:52 -05:00
Steven Franke
7345e13661 Fix a bug 2020-06-30 15:50:50 -05:00
Bill Somerville
f6a7d8c4bd
Fix an off by one error in 10 and 12 bit hash code handling
Revealed by trying to hash M0RNR which has zero as a 10 and 12 bit
hash code.
2020-06-30 21:50:17 +01:00
Steven Franke
630ef640ac First cut at joint QSO/WSPR type decoding for FST240. 2020-06-30 15:06:18 -05:00
Joe Taylor
0472a816fb Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-30 15:12:22 -04:00
Joe Taylor
d7448347e5 Install a basic framework for handling FST240W decodes. 2020-06-30 15:11:36 -04:00
Steven Franke
e8bb7e74bc Add routines for a (240,74) code. Hardwire decoder for wspr messages, for the time being. 2020-06-30 13:29:32 -05:00
Steven Franke
d916f315d3 Make AP decoding baseline llrs depend on hmod. Center the DT search window on emedelay. 2020-06-30 11:39:51 -05:00
Joe Taylor
53e7941c7c Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-30 10:36:16 -04:00
Joe Taylor
2a74e5a5de Allow command-line argument for "nQSOProgress" in jt9. 2020-06-30 10:35:13 -04:00
Steven Franke
f0efd881ca Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-30 08:42:59 -05:00
Steven Franke
d34f05f985 Implement basic AP decoding for FST240. No contests. 2020-06-30 08:42:54 -05:00
Joe Taylor
023e09bc4d Correct the help message's option label for setting FST240 mode. 2020-06-30 08:58:40 -04:00
Steven Franke
d462277a3e Make ldpcsim program work again. 2020-06-29 16:09:12 -05:00
Steven Franke
355b060454 1. Fix broken sync.
2. Change FST240-15 to use nsps=720
2020-06-29 15:06:11 -05:00
Steven Franke
42a0e9df32 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-29 12:31:21 -05:00
Steven Franke
a5cb88deed Use two alternating sync words. Change DT=0 to t=0.5 s for ntrperiod=15 s only. 2020-06-29 12:31:16 -05:00
Joe Taylor
bb5041da98 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-29 13:28:34 -04:00
Joe Taylor
67422f2ede Remove a diagnostic write statement. 2020-06-29 13:28:06 -04:00
Steven Franke
06b8e0eec6 Try to ensure that nfft1 and nfft2 are nice values. Add a brickwall filter in the downsampler. 2020-06-29 12:15:28 -05:00
Joe Taylor
83fddb1f57 Pass more parameters to fst240_decode(). 2020-06-29 12:21:34 -04:00
Joe Taylor
133c32cb41 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-29 09:38:24 -04:00
Joe Taylor
4fbed923ab Add detailed comments to get_candidates_fst240.f90. 2020-06-29 09:37:29 -04:00
Steven Franke
5480beba3a Change DT search range back to -1s -> 2s. NB - FST240-15 is subject to false sync at DT=+2.5s - bad for EME? 2020-06-29 07:42:00 -05:00
Steven Franke
f774cecd00 Experimental change to candidate detection. 2020-06-28 15:22:35 -05:00
Bill Somerville
d5c5a58c7f
Merge branch 'develop' into feat-fst280 2020-06-27 22:14:09 +01:00
Steven Franke
04d6fe4617 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-27 15:43:21 -05:00
Steven Franke
89c81cb5f1 XOR the message with rvec before calculating CRC 2020-06-27 15:43:14 -05:00
Joe Taylor
51447ef1d3 Remove the 1 s offset in wave() array. Fix NSPS for 300 s periods. 2020-06-27 16:24:11 -04:00
Joe Taylor
bf51dfd61d Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-27 16:23:20 -04:00
Steven Franke
1f16beeafe Make T/R=300s work from the command line. 2020-06-27 14:11:37 -05:00
Joe Taylor
eb167b11d3 Fix several more GUI parameters for FST240. 2020-06-27 14:13:59 -04:00
Steven Franke
3cb1980ef1 Remove un-needed files. 2020-06-27 09:21:43 -05:00
Steven Franke
390884268c Wholesale change from FST280 to FST240 2020-06-27 08:53:11 -05:00
Steven Franke
2cfe0513bb Adjust analysis window when single-decode is checked. 2020-06-26 08:40:01 -05:00
Steven Franke
37d5af9311 Fix an out-of-bounds error. 2020-06-26 07:24:11 -05:00
Steven Franke
76e84ec8fa Add debug print statement, lower sync threshold. 2020-06-25 08:54:16 -05:00
Steven Franke
f06f5d77a5 New frame format, new symbol lengths and ndown values, gen_fst280wave now returns a waveform aligned so that first message symbol starts at t=1s. 2020-06-24 15:15:20 -05:00
Steven Franke
31f98b94b9 Make DT search range -1s to +2s. 2020-06-24 12:22:22 -05:00
Joe Taylor
344b9c11f3 Speed up gen_fst280wave() by nearly x10 for longest FST280 transmissions. 2020-06-23 15:08:56 -04:00
K9AN
1b2d690bf0 Avoid edge effects when finding noise baseline. 2020-06-23 09:45:44 -05:00
Steven Franke
67f2450cc5 Make noise analysis bandwidth at least 10 times the signal bandwidth, when possible. 2020-06-22 15:21:55 -05:00
Steven Franke
37eff41549 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-22 14:51:08 -05:00
Steven Franke
9741e08af2 Improve sync search range to account for hmod>1. 2020-06-22 14:51:01 -05:00
Joe Taylor
65996b015c Exten the DT search range, Steve's suggestion. 2020-06-22 15:20:02 -04:00
Joe Taylor
fcb237807c Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-22 12:10:52 -04:00
Steven Franke
963bd78f63 Tweak for better sensitivity. 2020-06-22 09:46:48 -05:00
Steven Franke
f111230687 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-22 08:16:37 -05:00
Steven Franke
7d5fb03dea First cut at SNR estimate. Needs testing. 2020-06-22 08:11:45 -05:00
Joe Taylor
8a21533c21 UPdate some estimates in fst280.txt. 2020-06-21 18:46:21 -04:00
Bill Somerville
c2de0fe7ca
Merge branch 'hotfix-2.2.2' into develop 2020-06-21 21:44:59 +01:00
Steven Franke
d147eae27e
FT8: make sure that nbadcrc is initialized to true before each decoding attempt. 2020-06-21 20:36:19 +01:00
Joe Taylor
9208ac55b8
Another try: Ignore messages decoding to i3.n3 = 0.2. 2020-06-21 20:36:19 +01:00
Joe Taylor
ad0ff6d2be
Revert "Messages decoding to i3.n3 = 0.2 are now ignored: 0.2 is not currently used."
This reverts commit d56f359b69.
2020-06-21 20:36:19 +01:00
Joe Taylor
ac1e007238
Messages decoding to i3.n3 = 0.2 are now ignored: 0.2 is not currently used. 2020-06-21 20:36:19 +01:00
Steven Franke
2eca4001a0
cosmetic change. 2020-06-21 20:35:59 +01:00
Steven Franke
72a1a03db1
Detune the Normal decode setting a bit to reduce false decodes even more. 2020-06-21 20:35:59 +01:00
Steven Franke
4913929c99
FT8: Make Fast decode setting faster. 2020-06-21 20:35:26 +01:00
Steven Franke
77f05e9e10
In gen_ft8wave, make sure that wave() is not referenced unless icmplx=0. 2020-06-21 20:24:25 +01:00
Steven Franke
fb60ec0be5
FT8: Make the Fast decode setting Faster. 2020-06-21 20:24:25 +01:00
Joe Taylor
501cb44923 Clean up git workspace. 2020-06-21 14:38:40 -04:00
Steven Franke
79c437f69a Implement de-duping for FST280. 2020-06-21 12:40:38 -05:00
Joe Taylor
3a16399857 Don't send "<DecodeFinished>" twice for FST280. 2020-06-21 11:08:46 -04:00
Joe Taylor
ad4fac6b3d Implement "Single decode" for FST280. 2020-06-21 10:33:36 -04:00
K9AN
f03f411733 Changes to enable Fast and Normal decode settings. NB - max number of candidates has been increased to 20. 2020-06-21 08:48:34 -05:00
Bill Somerville
aa52e7d4c6
Add new PE RAC section for FD 2020-06-21 13:06:52 +01:00
Joe Taylor
0e935f0cf7 More tweaks to FST280 decoding. Suppress blank free text msgs. 2020-06-20 15:41:52 -04:00
Joe Taylor
17d1bc92dc Revert "Make sure that ncand is correct even when the number of candidates has been limited."
This reverts commit e78f1abced.
2020-06-20 14:17:34 -04:00
Joe Taylor
066d2585bc Revert "Enable sync checks on candidates."
This reverts commit 644a570cb9.
2020-06-20 14:17:05 -04:00
Joe Taylor
78685e10c6 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-20 13:48:15 -04:00
Joe Taylor
f8d7489b4e Fix many odds & ends for merging FST280 properly into the GUI. 2020-06-20 13:47:32 -04:00
Steven Franke
644a570cb9 Enable sync checks on candidates. 2020-06-20 12:37:37 -05:00
K9AN
e78f1abced Make sure that ncand is correct even when the number of candidates has been limited. 2020-06-19 20:56:50 -05:00
Joe Taylor
f2b460231b Should allocate pulse(1:3*nsps), not pulse(1:3*nsps*fsample) ! 2020-06-19 19:17:05 -04:00
K9AN
28746dd0b6 Need to reallocate pulse() when nsps changes. 2020-06-19 16:49:26 -05:00
Joe Taylor
dff2b7e146 Add code to sort FST280 candidates by strength and return only the top few. Temporary? 2020-06-19 15:54:59 -04:00
Joe Taylor
dc2d1057bd Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-19 15:02:59 -04:00
Joe Taylor
87b79d0615 OK, we can now transmit in FST280 mode. 2020-06-19 15:02:05 -04:00
Steven Franke
7b62732a45 Fix size of candidates array. 2020-06-19 13:43:50 -05:00
Steven Franke
a5dd1bcab4 Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-19 13:41:35 -05:00
Steven Franke
1465ab6935 Sync all signals and then de-dupe before decoding. Changes to sync threshold scheme. 2020-06-19 13:39:10 -05:00
Joe Taylor
b2ae563a7d For the user, define FST280 frequency as that of the lowest tone. 2020-06-19 11:57:49 -04:00
Joe Taylor
297c1a0dcb Must reallocate some arrays when FST280 submode changes. 2020-06-19 10:16:04 -04:00
Joe Taylor
8933e43fb3 Use 15 30 60 120 300 rather than A B C D E for sequence length in FST280sim. 2020-06-19 09:28:55 -04:00
Joe Taylor
d64e266e8f Pass submode (==> hmod) to fst280_decode.f90. 2020-06-19 09:15:00 -04:00
Joe Taylor
5569700980 Send nutc to the fst280 decoder, and use it. Also some code cleanup. 2020-06-18 19:53:49 -04:00
Joe Taylor
ea439f77ab Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-18 18:46:06 -04:00
Bill Somerville
402ce1b3fb
Enable passing decodes back to caller 2020-06-18 23:33:36 +01:00
Joe Taylor
b270e7372f Use hhmm in file name if TRperiod.ge.60. 2020-06-18 15:03:41 -04:00
Joe Taylor
72005888ac Starting to implement callback routine fst280_decoded. Not yet functional! 2020-06-18 13:37:49 -04:00
Joe Taylor
54c1df030b Fix the logic for setting length of FST280 data sent from jt9 to decoder. 2020-06-18 11:25:32 -04:00
Steven Franke
3172f1e976 Fix a type, add threshold for h=8, tweak gen_candidates to decrease the number of spurious candidates. 2020-06-18 08:14:11 -05:00
Joe Taylor
07721761a9 Fix a few more passings of parameters from jt9 to decoder, for FST280. 2020-06-17 20:31:54 -04:00
Joe Taylor
5c3a340f72 Pass TRperiod (s) to fst280_decode(). 2020-06-17 19:58:21 -04:00
Joe Taylor
1cebbd2cdd Enable decoding of FST280 for other T/R sequence lengths. Needs testing! 2020-06-17 19:28:44 -04:00
Joe Taylor
b0a979e3f2 Enable FST280 decoding with jt9[.exe]. So far, with 60 s periods only. 2020-06-17 15:07:15 -04:00
Joe Taylor
5aeaf5dc78 Include h=8 and NSS=40 in the FST280 decoder. 2020-06-17 14:17:03 -04:00
Joe Taylor
70441a9b4a Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280 2020-06-17 13:33:26 -04:00