Commit Graph

159 Commits

Author SHA1 Message Date
Joe Taylor
a9deb8c1fd Merge branch 'integrate-77bit' of bitbucket.org:k1jt/wsjtx into integrate-77bit 2018-09-13 09:51:34 -04:00
Joe Taylor
d82949c54e Correct the display of usage examples. 2018-09-13 09:50:34 -04:00
Steve Franke
642540ff8f unpack77 now returns logical variable unpk77_success, which will be .false. if there is something obviously wrong with the message. Still to do: set the flag if the unpacked message contains CQ in an implausible place. 2018-09-12 15:06:26 -05:00
Steve Franke
629d061e30 Move a couple of simulation files to fsk4hf, which will eventually be excluded from releases. 2018-09-12 13:46:40 -05:00
Joe Taylor
ca2c1a2b8b Don't use "appendage" ~ or ! on decoded lines. Protect against bad read in genft8_174_91. 2018-09-02 18:55:13 -04:00
Joe Taylor
a8ad1569cc Protect against a potential bounds error. 2018-08-31 10:47:31 -04:00
Joe Taylor
201b29993c More fixes related to nonstandard calls. 2018-08-29 14:18:56 -04:00
Steve Franke
20cfae891e Make sync8.f90 more robust. Increase number of candidates to 300. 2018-08-08 09:29:08 -05:00
Steve Franke
f7d423296f Minor code cleanup. 2018-07-29 17:15:02 -05:00
Steve Franke
b67589d29f Bring isync=1 message simulator, ft8sim, up to date. Fix ap decoding for isync=1 messages. 2018-07-29 16:29:11 -05:00
Steve Franke
df0b5e2622 Progress on AP decoding for 77bit messages. AP is basically working for regular i3=1 messages. 2018-07-28 17:32:45 -05:00
Steve Franke
750bf569f3 ft8sim2: make it easier to identify callsign and grid bits in simulated messages. 2018-07-28 09:26:54 -05:00
Steve Franke
bee1ecd109 Detect and reject messages with invalid i3 and or n3. 2018-07-28 08:50:50 -05:00
Joe Taylor
017629ac36 Suppress any "QU1RK" decodes, they are necessarily bad. 2018-07-27 10:43:58 -04:00
Steve Franke
59f713ba76 The change committed to decodedtext.cpp fixes a crash that occurred when processing certain isync=2 decodes. Is this the right fix? Other changes are minor code cleanups. 2018-07-17 17:48:23 -05:00
Steve Franke
ab7c811552 Remove bcontest from ft8sim2.f90 so that it works. 2018-07-17 16:55:22 -05:00
Joe Taylor
2c5dd053f3 Don't send "mygrid" where it's no longer needed. 2018-07-11 16:32:08 -04:00
Joe Taylor
14385611be Code cleanup related to "bcontest". Auto-seq now OK for new NA VHF Contest messages. 2018-07-11 10:13:42 -04:00
Joe Taylor
c1e71a46ef Remove more "bcontest" stuff from Fortrn code. 2018-07-10 15:32:59 -04:00
Joe Taylor
d95d2df5b6 Old-style "NA VHF Contest" mode removed from all Fortran routines. 2018-07-10 15:09:42 -04:00
Steven Franke
e7b19b29b0 Screen out FT8 decodes with excessively large number of hard errors. These are almost certainly undetected errors. 2018-07-08 13:29:12 +00:00
Steven Franke
8eb58a47ba Fix a problem in ldpcsim174_91.f90. 2018-07-08 13:19:22 +00:00
Steve Franke
fd0ad33028 MSK144: Wholesale changeover to (128,90) code with 77-bit messages. Compiles and doesn't crash, but communication between two instances has not been tested. 2018-07-07 10:35:59 -05:00
Steve Franke
42f75bf404 Fix graymap. 2018-07-07 08:18:31 -05:00
Steve Franke
5948b671eb Still working on getting c++/fortran interface right. 2018-07-06 18:14:56 -05:00
Steve Franke
b83b66e665 Changed genft8 and related routines to accept 37 char message and return 37 char msgsent. For now, in mainwindow, just copy the 22 char message into message37. 2018-07-05 15:32:04 -05:00
Joe Taylor
e5e81e01fb Make packjt77 into a module; move all its routines into file packjt77.f90. 2018-07-05 14:07:17 -04:00
Steve Franke
4b8ea3ef45 Wire up the 'Decode only 77-bit messages' checkbox. 2018-07-05 07:51:10 -05:00
Steve Franke
ed92d5a86c SNR estimator is broken for isync=2 messages, due to different signal normalization. For now, go back to SJF's old signal/(noise+interference) estimator. 2018-07-04 16:58:24 -05:00
Steve Franke
a448dc5640 Use 37 character message for de-duping. Comment out some code that needs to be updated to work with new message type. 2018-07-04 16:20:12 -05:00
Steve Franke
50d8945bca Fix up Usage message for ft8sim2. 2018-07-04 12:41:43 -05:00
Steve Franke
d70e3dbb26 Fix some problems in ft8sim2.f90. 2018-07-04 10:38:10 -05:00
Steve Franke
df652e383b More progress on making ft8sim2 and ft8b_2 encode and decode all message types. For now, decoder.f90 is hardwired to always print 37 characters. 2018-07-04 10:15:01 -05:00
Steve Franke
91388f8ba2 Create a separate simulation program, ft8sim2, for New Style 77 bit messages. Hashes are not handled yet. Needs more testing. 2018-07-04 09:52:39 -05:00
Steve Franke
24f4792b23 Fix incorrect reference to extract77 - should have been unpack77 2018-07-03 15:59:24 -05:00
Steve Franke
57ebc30369 Call the new extract77 in ft8b_2. Define msg37 and msgsent37 to replace their 22-bit predecessors. 2018-07-03 15:34:39 -05:00
Steve Franke
bb12c7424d Module packjt77.f90 includes the 77bit utility programs called by pak77 and unpack77. Modify genft8_174_91.f90 to generate type 2 messages. 2018-07-03 15:08:38 -05:00
Steve Franke
cf64cad091 Send m_i3, m_n3, m_isync from mainwindow to genft8.f90 and use these to determine the type of generated message, according to the scheme described in lib/77bit/NewCode.txt. 2018-07-03 14:37:50 -05:00
Steve Franke
9295726931 Fix the sign of i3 when trying to subtract a type message. 2018-07-03 11:24:42 -05:00
Steve Franke
385cda8e01 Comment out a debug message. 2018-07-03 11:17:21 -05:00
Steve Franke
3f897225fe genft8 now looks at sign of n3 and i3. If either sign is negative, generate a type 1 (classic) message. Otherwise generate type 2. Type 1 seems to work. Type 2 does not yet work. 2018-07-03 11:10:47 -05:00
Steve Franke
91b7544ba1 More progress toward switching to (i3,n3). wsjtx runs without crashing now. 2018-07-03 09:49:11 -05:00
Steve Franke
c39dd63f79 Send (i3,n3) from mainwindow to genft8. First steps at interpreting (i3,n3) to send itype=1 for classic messages and itype=2 otherwise. Very buggy at this stage. 2018-07-03 09:28:16 -05:00
Steve Franke
5fc4fe6eda Fix an off-by-one error. Remove attempt to refine DT estimate using polynomial interpolation. 2018-07-02 16:13:27 -05:00
Steve Franke
26de3219d3 Fix an off-by-one problem. 2018-06-30 14:56:19 -05:00
Steve Franke
83d81bdcd2 Streamline the sequence detector code. 2018-06-27 15:11:39 -05:00
Steve Franke
229ee09b99 Minor code cleanup. 2018-06-27 09:55:34 -05:00
Steve Franke
03abada09b More progress on sequence demodulator. Can now do nsymb=1,2, and/or 3. 2018-06-26 11:11:58 -05:00
Steve Franke
7684bd0e78 Work toward a generalized sequence detector for nsymbols=1, 2, or 3. Works for nsymbol=3, but not yet for nsymbol=1, or 2. 2018-06-25 17:01:34 -05:00
Steve Franke
0f5759270e Added 2-symbol sequence detection for proof-of-concept tests. 2018-06-22 11:20:28 -05:00
Steve Franke
3f8c218ebe Make changes to ft8b_2.f90 to accommodate the new 77-bit in/out encoding/decoding routines. With these changes, WSJT-X decodes (174,91) frames. 2018-06-17 12:11:32 -05:00
Steve Franke
1a31e5b2d6 For (174,91) code, move CRC generation and testing into encode and decode routines. Make ldpcsim174_91.f90 work with the new encode/decode routines. 2018-06-17 08:44:10 -05:00
Steve Franke
e16e78790a Create chkcrc13a.f90. Should chkcrc12a, chkcrc13a, and chkcrc14a be combined into one routine? 2018-06-16 09:04:51 -05:00
Steve Franke
a5837bd5c7 AP decoding now works for type 2 frames. Also cleaned up and simplified AP implementation in ft8b_2. 2018-06-11 15:10:44 -05:00
Steve Franke
6fe9e8f860 Remove the need to re-order the parity-check matrix columns for compatibility with the generator matrix. Redefine the codeword to have the form [91 message bits|83 parity bits]. 2018-06-09 13:05:11 -05:00
Steve Franke
68beed88a7 Change to Gray bit to symbol mapping for (174,91) messages. 2018-06-08 16:21:21 -05:00
Steve Franke
a0db6a8a08 Disable AP passes for type 2 frames, for now. Write some diagnostics to lun 81. 2018-06-07 11:40:25 -05:00
Steve Franke
a23e2b6f8b Fix a bug that caused some second-decoding-attempt log-likelihoods to become NaN. 2018-06-06 11:21:00 -05:00
Steve Franke
badc639777 Fix a bug in sync8d.f90. Switching between Costas arrays should work now. 2018-06-06 10:59:49 -05:00
Steve Franke
48b60eab71 Make two sync passes, one for each sync array. Label candidates with their type and decode accordingly. 2018-06-05 16:44:52 -05:00
Steve Franke
772b1bd5fa ft8sim can now generate old (174,87) or new (174,91) frames. Frame type is selected using the itype command line parameter. 2018-06-05 08:40:00 -05:00
Steve Franke
01a380084d Changes to make it easier to test different codes. 2018-06-04 08:04:22 -05:00
Joe Taylor
58939ce011 More changes to accommodate Hounds with compound calls. Fox CQs only every 4 Tx sequences.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8651 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-05-09 17:18:08 +00:00
Steven Franke
e0e13e1778 Edit some comments. No functional changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8530 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-02-24 21:40:47 +00:00
Joe Taylor
5d1df32387 Replace some temporarily removed code in ft8b, and some general cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8443 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-01-30 16:57:14 +00:00
Joe Taylor
910e18d042 Minor updates to ft8code.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8442 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-01-30 16:13:56 +00:00
Joe Taylor
5f9dec3997 Add a required file.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8441 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-01-30 15:28:03 +00:00
Joe Taylor
c1bd6060dd New utility program ft8code. Remove unused references to recent_calls() in FT8 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8440 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-01-30 15:25:10 +00:00
Steven Franke
b5a2f42033 Generalize osd174.f90 to permit deeper decoding, but keep depth settings as they were.1
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8428 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-01-21 17:53:36 +00:00
Steven Franke
affa853609 Fix some bugs in simulators, add pre-processing rules to osd300.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8426 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-01-20 18:45:40 +00:00
Joe Taylor
d1be2506a9 Several enhancements to DXpedition mode:
1. Insert dummy report when Hound is called by complex-callsign Fox.
2. Allow Fox to transmit anywhere between 300 and 900 Hz.
3. Restrict randomized Hound freq to the range 1000 - 3000 Hz.
4. Suppress Fox signals that would be duplicates.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8376 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-27 21:06:57 +00:00
Joe Taylor
69cb0333ab Remove a diagnostic write; revert the other two files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8365 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-22 18:03:32 +00:00
Joe Taylor
c353ec244f Additional changes to enable Fox to use a compound callsign.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8364 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-22 18:00:47 +00:00
Joe Taylor
f492a2560d Clean up behavior for Fox with compound callsign.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8363 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-22 17:25:16 +00:00
Joe Taylor
161ac6e76a All-new algorithm for determining Tx messages for Fox.
Also, extend max cmsg length to 40 characters.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8356 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-21 20:55:38 +00:00
Joe Taylor
19e0ad921d Updates to FT8 simulator, useful for testing DXped mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8352 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-19 20:59:59 +00:00
Joe Taylor
5c87f329a0 Better support for compound callsigns in DXpedition mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8351 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-19 20:01:06 +00:00
Joe Taylor
8f7ca2851c Fix a number of minor bugs in FT8 DXpedition mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8340 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-18 19:07:10 +00:00
Joe Taylor
d526d42078 Updates to the draft "DXpedition Quick Start Guide".
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8326 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-13 20:38:20 +00:00
Joe Taylor
030e4e4651 Remove a spurious include.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8325 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-13 20:24:02 +00:00
Joe Taylor
4f90f320c0 Add a filtering for signals generated in ft8sim. Beware, not all options work.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8324 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-13 20:22:15 +00:00
Joe Taylor
bb77853f27 Don't include diagnostic plotspec.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8321 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-13 17:18:34 +00:00
Joe Taylor
c98b4c00b1 Comment out the calls to plotspec. They were for testing only.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8320 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-13 13:41:49 +00:00
Joe Taylor
c4f4e9d7bd Remove some diagnostics.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8318 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-12 20:33:44 +00:00
Joe Taylor
84b38ee0ad Fix a flaw in ft8sim. De-activate the calls to plotspec() in foxfilt.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8317 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-12 20:15:36 +00:00
Joe Taylor
5cadbe26aa Add filtering of audio waveforms generated for Fox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8316 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-12 17:59:09 +00:00
Joe Taylor
c1255f39b8 Draft 'Quick Start Guide' for DXpedition mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8312 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-09 18:37:11 +00:00
Joe Taylor
7d23849786 Move subroutine h1() to its own file, h1.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8310 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-09 03:21:48 +00:00
Joe Taylor
100c73b851 Now seems to compile OK in Linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8308 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-09 00:36:52 +00:00
Joe Taylor
1b22496ce4 Add missing routine.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8304 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-08 23:58:18 +00:00
Joe Taylor
6a90a11651 Tweaks to Fox/Hound behavior. More to come!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-08 20:23:54 +00:00
Joe Taylor
1557b9cb99 Hound now transmits correctly.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-08 19:53:27 +00:00
Joe Taylor
385c83658e Hound can now decode Fox messages with i3bit=1.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8297 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-08 17:03:11 +00:00
Joe Taylor
075307da68 Now generating Fox "<...>" messages, which set i3bit=1.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8296 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-07 21:36:25 +00:00
Joe Taylor
5d0236755d Further progress with fox-mode coding. Not finished yet!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8289 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-04 18:58:38 +00:00
Joe Taylor
ff7e127e53 Option to generate many "hounds" calling a fox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8286 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-04 17:54:30 +00:00
Steven Franke
20a19fb3e3 Do only AP1 (CQ ??? ???) if we are processing live data and haven't
transmitted, or enabled Tune, for 10 minutes or more.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8282 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-04 00:46:19 +00:00
Joe Taylor
c4de80607c Make ft8sim able to generate simulated "Hound" signals.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8275 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-01 16:23:27 +00:00
Joe Taylor
7e549b5d55 More Fox progress...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8271 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-11-30 20:34:05 +00:00
Joe Taylor
00e0d76fc2 Work-in-progress with Fox-mode code. Contains incomplete and untested code!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-11-30 18:45:51 +00:00