w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-26 14:18:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,927 Commits 5 Branches 98 Tags 208 MiB
d48fb58ffa
Commit Graph

1392 Commits

Author SHA1 Message Date
Joe Taylor
2e5a451b59 Fix a comment in ft8_decode.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8054 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-31 20:16:38 +00:00
Steven Franke
89e3e989ca Fix a potential array bounds issue in osd174.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8040 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-28 21:09:44 +00:00
Joe Taylor
a3c65d72bb Fix the 'Start=0 ==> S/N = -24 dB' problem. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8037 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-27 12:26:37 +00:00
Joe Taylor
021336823a Use a baseline-fitting procedure to improve S/N estimates for FT8. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8036 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-26 16:30:47 +00:00
Joe Taylor
0a16a1e614 Possible pseudo-code for DXpedition auto-sequencing. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8034 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-24 13:38:47 +00:00
Steven Franke
e212e76de0 More cleanup. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8033 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-22 00:21:59 +00:00
Steven Franke
50555def5c Delete unused array. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8032 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-22 00:17:23 +00:00
Steven Franke
d5d8abc29a 1. Improvements to the OSD to allow deeper wideband decoding. 2. Add a third decoding pass. 3. Change symbol metric from max-log to max-amplitude. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8031 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-22 00:14:51 +00:00
Steven Franke
84813be7db Make default MSK144 amplitude polynomial flat. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8026 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-14 15:00:48 +00:00
Steven Franke
4a3cd7222f Improve efficiency of OSD by a factor of 5 to 10 for norder=2 and 3. Use norder=2 for wideband multi-decoding, norder=3 near nfqso and nftx. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8022 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-13 01:35:13 +00:00
Steven Franke
3b74de89f2 Bring a simulation tool up to date. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8017 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-09 15:52:52 +00:00
Steven Franke
b2df3c9fdb Remove call to jtmsg. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8016 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-09 15:22:54 +00:00
Steven Franke
0bc966c554 1. Use norder=3 for nagain, 2. Renumber aptypes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7993 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-03 14:46:21 +00:00
Joe Taylor
b5b3ffbfbf Enable "nagain" for FT8, as in other modes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7980 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-02 14:05:37 +00:00
Joe Taylor
db9181d1cd Tidy up some details for 72-bit contest mode in FT8. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7974 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-01 18:16:01 +00:00
Joe Taylor
b29bd33a86 Utility for generating figure for QST/RadCom article. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7973 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-08-01 18:01:27 +00:00
Joe Taylor
e6635624f5 Make 72-bit "contest mode" available in FT8 as well as MSK144. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7969 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-28 15:50:13 +00:00
Steven Franke
a7b7c19f88 Comment out diagnostic write to lun 81. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7968 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-28 15:35:17 +00:00
Bill Somerville
2e3e5990fc Fix syntax error in statement function definition 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7964 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-28 00:00:42 +00:00
Joe Taylor
f6ddd2cd2e Working on some features for NA VHF contests. Not finished! 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7963 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-27 20:17:30 +00:00
Joe Taylor
ed95b6d373 Remove unused arguments from the call to fix_contest_msg(). 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7962 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-27 18:57:53 +00:00
Steven Franke
1110902285 Correct some logic so that AP is only on when selected and so that AP decodes of type 4 or greater are limited to the vicinity of nfqso or nftx. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7961 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-27 18:07:54 +00:00
Steven Franke
f6d0bd7787 nQSOProgress now controls AP decoding. Needs testing - may not be stable with AP enabled. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7960 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-27 15:35:40 +00:00
Bill Somerville
33b1742568 Add QSO state machine state and tx audio offset to parameters passed to slow decoders 
Required to pick best AP masks in FT8 decoder

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7958 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-26 21:19:21 +00:00
Joe Taylor
8fe7d5c5de Remove obsolete test program. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7956 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-26 13:44:31 +00:00
Steven Franke
a891bcdd8d Enable AP for any decoding level. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7955 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-26 13:05:34 +00:00
Steven Franke
7b8a86dca7 Reject candiates with fewer than 7 correct hard-decoded sync symbols. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7946 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-25 20:55:13 +00:00
Steven Franke
dc5305573d Move '?' quality warning to message(22:22). 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7945 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-25 19:06:05 +00:00
Steven Franke
22af8aa7d3 Bring msk144d2 more up to date. Runs now, but still needs more work. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7936 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-24 14:23:22 +00:00
Steven Franke
d06912a075 More informative end-of-line annotation for AP decodes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7935 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-22 17:12:48 +00:00
Steven Franke
b924a81f80 Prevent a certain type of non-standard message from being flagged as a false decode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7934 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-22 13:21:03 +00:00
Steven Franke
bbbcae9233 Add variables lapon and napwid to control ap decoding. Reconfigure the logic for AP decoding and ordered-statistics decoding. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7933 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-22 03:01:09 +00:00
Steven Franke
d4c6a4e823 Add to the list of allowed keywords in jtmsg.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7932 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-21 22:02:06 +00:00
Steven Franke
925cd09085 Only print dupes if SNR is higher than what has already been printed. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7931 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-20 21:08:36 +00:00
Joe Taylor
fc5e10fc08 Comment out diagnostic write. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7930 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-20 19:25:08 +00:00
Joe Taylor
556525702a Fix wording in list of keyboard shortcuts. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7929 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-20 19:23:17 +00:00
Joe Taylor
73df0d00ef 1. Alt+F8 arms "Call 1st" as if a CQ had been sent. 
2. "Call 1st" label turns red when armed to respond to a caller.
3. Suppress some recognizable false decodes, send them to cumulative file
   "data_dir/false_decodes.txt".
4. Reduce sleep delay in decoder() to 10 ms.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7928 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-20 15:15:00 +00:00
Steven Franke
46e1cd5a30 Fix a bug in AP decoding when iaptype=2. Decrease time-sync search range to +/- 1.5s. Fix a big with erasure decoding. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7926 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-18 15:22:20 +00:00
Steven Franke
4594aaa589 Work on ap decoding. Diagnostic write enabled. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7925 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-18 01:12:11 +00:00
Steven Franke
238ccff110 Properly round the printed snr. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7917 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-16 17:08:09 +00:00
Steven Franke
748e359fe0 More work on Deep decoding. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7911 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-16 15:56:06 +00:00
Bill Somerville
29fc1719a9 Improve support for older C++ compilers 
Some current  Linux distributions  are still using  GCC 4.6  which has
no/poor  C++11 support.  probably more  of this  needed if  we are  to
support such compilers.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7896 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-16 14:32:28 +00:00
Steven Franke
d50f3a009d Make refspec filter causal for overlap and add. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7895 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-16 00:10:37 +00:00
Steven Franke
f4eaca5cf0 Improve a comment. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7894 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-15 15:46:46 +00:00
Steven Franke
86776ed0d1 Use overlap and add to apply reference filter/amplitude equalization. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7893 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-15 15:43:41 +00:00
Steven Franke
8af95e2582 Properly calculate metrics for non-ap bits that reside in symbols that contain ap bits. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7892 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-15 14:21:18 +00:00
Steven Franke
57d898779f Add some more items to the lun 81 diagnostics. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7891 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-15 01:49:44 +00:00
Steven Franke
c1666a0069 Turn off ap. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7890 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-15 00:33:25 +00:00
Steven Franke
a2f2e6091d More work on AP. Deep decode is unstable - not for use on the air. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7887 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-14 22:09:50 +00:00
Steven Franke
192665bdeb More work on ap. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7886 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-14 20:12:29 +00:00
Steven Franke
23b514a2f8 Update call to ft8b. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7885 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-14 19:46:04 +00:00
Steven Franke
bcf6ab933b Add ft8apset.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7884 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-14 19:35:22 +00:00
Steven Franke
d0ad300a65 Move ft8apset to a separate file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7882 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-14 19:22:53 +00:00
Joe Taylor
141f0ceefa Fix nutc in jt9; alternative sync value for late-start FT8 signals. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7881 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-14 18:19:48 +00:00
Joe Taylor
a8cba435d4 Code cleanup and test ofFT8 decodes with erasures. Do not use on the air. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7879 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-14 16:02:01 +00:00
Steven Franke
2e704a33db ft8sim.f90 can now generate 25 independently-fading signals. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7869 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-13 22:23:59 +00:00
Steven Franke
4dc1db0ef3 Fix call to symspec. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7866 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-13 14:23:58 +00:00
Steven Franke
f540df3629 Fix another bounds error. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7864 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-13 00:43:56 +00:00
Steven Franke
a35b460e68 Fix a comment. No code changes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7863 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-13 00:31:52 +00:00
Steven Franke
6e8ebd1024 Fix NHSYM. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7862 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-13 00:28:57 +00:00
Steven Franke
d8f9f385b4 Use quarter-symbol steps for time sync. Lower sync threshold. Implement subtraction and two pass decoding. Use osd2 only near nfqso. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7861 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-12 21:49:39 +00:00
Bill Somerville
407eb2c514 Correct issues with UDP messages and screen layout for MSK144 and FT8 modes 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7830 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-10 00:01:20 +00:00
Steven Franke
fffeb17ec0 Guard against blank msg in fix_contest_message. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7823 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-09 17:46:02 +00:00
Steven Franke
5b92ad5f9d Submit ap symbols to osd174. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7815 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-08 14:28:13 +00:00
Joe Taylor
a0acb0607d Re-commit 7806 and 7807, but disable AP decoding. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7814 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-08 14:06:48 +00:00
Joe Taylor
a0ea5dc8eb Temporarily back out r7806 and r7807. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7808 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-07 21:40:28 +00:00
Steven Franke
8b1a956269 Don't call osd174 if ndepth=1. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7807 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-07 21:00:02 +00:00
Steven Franke
cdfd224974 Add basic ap functionality. Needs testing for decoding speed. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7806 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-07 20:24:00 +00:00
Joe Taylor
5e0265a5ab Minor tweaks to FT8 decoder, including norder=3 if ndepth=3. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7805 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-07 15:27:15 +00:00
Joe Taylor
4786fbd866 Patch from W9MDB: adds braces to make code in qra64.c more readable. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7802 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-07 12:55:05 +00:00
Steven Franke
1c2695332a Send mycall,hiscall,hisgrid into the ft8 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7797 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 20:00:42 +00:00
Steven Franke
cd5d144b97 Disable subtraction for now. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7794 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 18:58:04 +00:00
Steven Franke
3b87939358 Use dd in sync8, in anticipation of multiple detection/decoding passes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7789 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 15:45:25 +00:00
Steven Franke
f68c86854b Remove a diagnostic write. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7788 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 14:57:55 +00:00
Steven Franke
ce06547b59 Add subtraction routines - not fully tested or tweaked yet. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7787 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 14:44:17 +00:00
Joe Taylor
ca8e9502b2 Minor tweaks for code cleanup. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7786 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 14:19:39 +00:00
Joe Taylor
76d1169140 FT8 now uses nsps=1920. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7784 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 13:38:06 +00:00
Joe Taylor
52d8324382 Baseline code with nsps=2048 in FT8. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7783 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-06 12:07:17 +00:00
Joe Taylor
b1f2f5c12e Increase DT range to +/- 3 s. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7781 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-03 21:25:52 +00:00
Joe Taylor
ab3832fa82 In ft8_downsample, compute long FFT only when data have changed. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7780 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-03 19:52:36 +00:00
Joe Taylor
4bce86d61e Correct the FT8 downsample factor to be exactly 1/64. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7779 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-03 19:01:38 +00:00
Joe Taylor
e1b2bdef06 Fix a time delay introduced in refspectrum.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7778 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-03 15:21:38 +00:00
Bill Somerville
11a4139350 Fix complex buffer size for real to complex DFT 
This fixes a memory corruption issue.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7776 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-02 15:05:17 +00:00
Steven Franke
adf648e0f3 Improved SNR calibration. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-02 11:24:30 +00:00
Steven Franke
ea12ba34fe This stops Steve's mac from crashing. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7773 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-02 01:31:43 +00:00
Joe Taylor
cf6ff745a2 Oops! Those two 'unused' variables are actually used. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7772 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-02 00:36:45 +00:00
Steven Franke
27de2481bb Remove some unused variables. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7771 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-02 00:08:17 +00:00
Joe Taylor
d8c883dd52 Add timer calls for ft8downsample. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7770 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 20:47:59 +00:00
Bill Somerville
f73a35842a Reduce stack usage of F8 decoder modules 
Reverted to default stack allocation for jt9.exe on Windows.

Tidied up FT8 decoder inteface  to remove arguments that will probably
never be used.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7768 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 18:46:14 +00:00
Steven Franke
53dbe3248f Make ft8d work with recent changes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7767 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 17:58:57 +00:00
Steven Franke
0bd8542ccf Guard against bounds error in candidate array. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7765 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 16:06:18 +00:00
Steven Franke
624ef493a8 Remove s from ft8b argument list. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7763 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 14:58:34 +00:00
Steven Franke
4c88ab860b Add more bounds checks. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7762 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 14:47:52 +00:00
Steven Franke
12c1b45c66 tweak 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7761 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 14:36:55 +00:00
Steven Franke
ff4e4b1828 Don't need to pass s into ft8b anymore. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7760 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 14:36:08 +00:00
Steven Franke
c4f056dca8 Fix a bounds violation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7759 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 13:45:16 +00:00
Steven Franke
304cbaa672 Use complex signal for fine sync and symbol demod. Lower sync threshold. Improved SNR estimate. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7757 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-07-01 13:08:30 +00:00
Joe Taylor
f6ecfec363 Add some timer calls; fix reporting of FT8 spots to PSKreporter. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7755 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-30 20:11:07 +00:00
Steven Franke
ec34c3b03b Fix up command-line decoder ft8d.f90 so that it works with recent changes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7754 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-30 14:07:17 +00:00
Joe Taylor
b8eafac0db Upgrade jt9.f90 for command-line processing of FT8 files. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7753 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-30 13:55:19 +00:00
Joe Taylor
e20bd5eae1 Don't execute AutoSeq steps after sending a 73. 
For FT8 mode:
  1. Open LU 13 in the proper way.
  2. Disable diagnostic LU 51.
  3. Add keyboard shortcuts CTRL+Plus, CTRL-Minus, to adjust audio Tx frequency
     in even 50 Hz steps.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7749 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-29 13:42:24 +00:00
Joe Taylor
804543c6f8 Protect against bounds error when nfa=0. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7748 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-28 18:48:31 +00:00
Joe Taylor
7195f121dd FT8 mode: Add suggested default freqs; start Tx audio at t=0.5 s rather than 1.0 s; Correct the displayed value of DT. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7747 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-28 18:23:56 +00:00
Joe Taylor
3658e32d57 Use norder=3 at the QSO frequency. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7745 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-28 15:34:38 +00:00
Joe Taylor
43295f018d Improvements to FT8 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7744 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-28 14:38:06 +00:00
Joe Taylor
80ad721524 Code cleanup. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7742 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-27 20:50:17 +00:00
Joe Taylor
41336209c8 Rearrange some FT8 code for consistency with other modes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7741 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-27 19:44:12 +00:00
Joe Taylor
8b6f3d8920 Fix behavior of RxFreq in FT8 mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7738 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-26 19:33:26 +00:00
Joe Taylor
91fbeff072 Many GUI adjustments for FT8. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7736 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-26 15:24:56 +00:00
Steven Franke
9ae479e9d9 1. add error-pattern rejection to osd174 (factor of 3 speedup for norder=3) 
2. osd codeword selected based on correlation discrepancy instead of Hamming dist (improves sensitivity)
3. trap zero-valued spectrum values caused by large dt.
4. trap all-zero codeword
4. both decoders return number of hard errors
5. osd174 returns correlation discrepancy (rejection threshold still needs to be tuned).
6. both decoders return the codeword with bits in as-transmitted order, for subtraction.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7735 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-23 14:14:09 +00:00
Steven Franke
d44e580148 More development tool tweaks. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7734 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-22 13:54:21 +00:00
Steven Franke
ff4327cd56 Update some development tools. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7733 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-22 13:47:28 +00:00
Joe Taylor
de3e975b98 1. ft8sim now generates 25 signals: f=300, 400, ... 2700 Hz. 
2. ft8d is now a bare-bones multi-decoder.
3. wsjt-x now includes the bare-bones multi-decoder for FT8.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7729 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-19 20:15:43 +00:00
Joe Taylor
09af56b32c Add a bare framework for ft8_decode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7728 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-18 12:26:41 +00:00
Joe Taylor
3ba80279ec Start a framework for FT8 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7727 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-17 15:55:30 +00:00
Joe Taylor
51925c3e44 De-activate unused call, for now. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7725 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-17 11:27:44 +00:00
Joe Taylor
383bff512c Working toward a better sync scheme. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7724 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-16 20:14:36 +00:00
Joe Taylor
9d89cc0719 Further work on ft8sim and ft8d. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7723 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-16 13:27:17 +00:00
Joe Taylor
ec673490b4 More tweaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7722 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-15 15:43:33 +00:00
Joe Taylor
c5ef1ed237 Further tweaks to test routines. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7721 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-15 15:38:50 +00:00
Joe Taylor
1bf751f0d8 Various tweaks to test routines. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7720 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-15 14:58:59 +00:00
Joe Taylor
38fdda4dc7 Update some test routines. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7719 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-15 13:47:47 +00:00
Joe Taylor
de58b21207 Add a missing file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7718 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-15 12:09:53 +00:00
Joe Taylor
0bad13b8a3 Add a missing file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7717 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-15 11:48:09 +00:00
Joe Taylor
44b4c180f6 First bare-bones decoder for FT8. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7716 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-14 20:21:01 +00:00
Steven Franke
c14fd2b1e5 Another test file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7715 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-14 19:56:23 +00:00
Steven Franke
8307ae5b5d Fix some bugs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7714 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-14 15:59:36 +00:00
Steven Franke
c8e5d8ecd6 More test files. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7713 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-14 00:45:44 +00:00
Joe Taylor
7047150453 Some test routines. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7712 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-13 19:42:45 +00:00
Steven Franke
f993094acb An experimental decoder for slow msk144. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7711 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-12 14:01:06 +00:00
Joe Taylor
e3e84b1d74 Fix another typo. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7708 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-07 21:03:38 +00:00
Joe Taylor
6e3aae5cc1 Fix typo. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7706 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-07 18:28:38 +00:00
Joe Taylor
76685f5a40 Better variable name. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7705 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-07 18:23:27 +00:00
Joe Taylor
9cfadf6ccb Experimenting with a slow MSK144 mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7704 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-06 18:57:17 +00:00
Steven Franke
b8194cf199 Minor tweaks. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7701 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-02 20:11:29 +00:00
Steven Franke
a92e7508b9 wspr5d_exp now tries to detect sequences of 3, 6, and 9 bits. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7700 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-06-02 13:58:32 +00:00
Steven Franke
f8a673077b Change wspr5d frequency dither to a search over a list of the top npeak peaks in squared-signal spectrum. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7699 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-31 14:08:54 +00:00
Steven Franke
c001d11c57 1. wspr_fsk8_sim.f90: Add Watterson channel model. Fading is applied only to .c4 files. 2. wspr_fsk8d.f90: Add the capability to read and process .c4 files. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7697 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-26 15:07:27 +00:00
Steven Franke
a5054c7d5d Add Watterson channel model to wspr5sim. Fix up processing of c5 files in wspr5d.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7696 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-25 16:24:57 +00:00
Steven Franke
2517106629 Add an experimental decoder for wspr5. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7695 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-21 22:19:57 +00:00
Joe Taylor
9338cb52bb Correct the real-time filename being sent to wspr_fsk8d. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7693 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-19 15:52:48 +00:00
Joe Taylor
bfa4b2895d Fix minor bug in gen9 -- thanks to Igor, UA3DJY, for identifying it! 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7692 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-19 14:44:20 +00:00
Joe Taylor
9458acb01b Limit WSPR-LF frequency search range to 1600-1650 Hz. Enable S/N degradation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7689 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-18 15:59:30 +00:00
Joe Taylor
b71b5c225d Fix a typo. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7686 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-17 20:19:59 +00:00
Joe Taylor
22e45c24e6 Fix snr calculation; remove diagnostic write. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7683 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-17 13:30:32 +00:00
Steven Franke
3099147891 Fix an out of bounds error. Thanks Joe. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7682 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-17 13:27:11 +00:00
Joe Taylor
303eecdfd6 Make wspr_fsk8d search for DT as well as f0. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7681 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-17 13:13:11 +00:00
Joe Taylor
28c09d4a76 Add some new test programs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7680 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-16 19:20:14 +00:00
Joe Taylor
4731e02cdb Add a call to osd300. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7679 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-14 14:37:22 +00:00
Joe Taylor
c248d5095a Limit the Rx freq range to 1600-1650 Hz for WSPR-LF. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7678 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-05-13 19:34:47 +00:00