w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 09:01:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,210 Commits 5 Branches 98 Tags 208 MiB
22b580af56
Commit Graph

136 Commits

Author SHA1 Message Date
Steve Franke
7a40bf2e4b Use separate hash tables for 10, 12, and 22 bit hashes. Make unpacking i3=4 messages depend on whether unpack is being done on a received message, or a to-be-transmitted message. Give mycall13 priority over hash table entries in certain contexts. 2018-12-20 15:08:29 -06:00
Steve Franke
6fc27d550d Fix an egregious bug and another not-so-egregious bug. The egregious bug prevented decodes of most signals with negative DT. 2018-12-03 07:18:52 -06:00
Steve Franke
ab34db7556 Get rid of unused variable ldecode77. 2018-11-05 14:40:55 -06:00
Joe Taylor
0235cf69ff Remove all vestiges of old (isync=1) FT8 mode. Many changes here! 2018-11-05 11:59:48 -05:00
k9an
6bb23dbe4d Comment out debug write to lun 81. 2018-10-17 19:17:04 -05:00
Steve Franke
4b54873c81 Implement AP for all contest modes and also for Hound mode. AP is always active for Hounds. AP is automatically disabled if MyCall or DxCall are extended callsigns. 2018-10-04 17:48:55 -05:00
Steve Franke
4ab4de6682 Forgot to add the AP-related changes to ft8_decode.f90. 2018-10-04 17:45:41 -05:00
Steve Franke
77bb49e9ac Beginnings of AP for RU. Not working yet. 2018-10-04 17:44:34 -05:00
Steve Franke
c7b9892517 Fix the dimensions of the candidate array. 2018-08-08 16:05:21 +00:00
Steve Franke
20cfae891e Make sync8.f90 more robust. Increase number of candidates to 300. 2018-08-08 09:29:08 -05:00
Joe Taylor
3af293f297 Use module variables rather than common/hashcom/; working on transparent handling of goofy calls. 2018-07-30 15:46:25 -04:00
Steve Franke
fe491393cd Fix call to ft8apset. 2018-07-29 17:18:02 -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
Joe Taylor
adcffe3db4 Pass "nContest" value to ft8_decode.f90. 2018-07-27 09:30:00 -04:00
Joe Taylor
f7c02ec587 Code cleanup: remove several unused dummy arguments. 2018-07-25 15:19:57 -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
Joe Taylor
2c5dd053f3 Don't send "mygrid" where it's no longer needed. 2018-07-11 16:32:08 -04:00
Joe Taylor
316e78133c Remove remaining traces of the "NA VHF Contest" checkBox. 2018-07-11 14:27:53 -04:00
Joe Taylor
c1e71a46ef Remove more "bcontest" stuff from Fortrn code. 2018-07-10 15:32:59 -04:00
Steve Franke
4b8ea3ef45 Wire up the 'Decode only 77-bit messages' checkbox. 2018-07-05 07:51:10 -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
c4e6a310aa Turn off ap symbol generation for type 2 messages. This needs to be completely reworked once basic functionality is established. 2018-07-03 15:49:39 -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
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
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
b84602d059 Zero the apsymbols for type 2 frames, for now. 2018-06-06 11:28:44 -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
Steven Franke
4f7c7f6a09 Make NA VHF Contest mode work when in FT8 mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8427 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2018-01-21 15:30:11 +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
ac818337a6 Use 30 s intevals for "Age" units. Clean up labels when Message Avg window used for Fox Log. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8348 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-12-19 17:01:38 +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
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
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
Steven Franke
89434b0d97 Minor tweaks to JT65 decoding. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8264 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-11-28 20:46:00 +00:00
Steven Franke
487cebf09c Experimental implementation of AP decoding for JT65 - configured for testing only. Not usable on the air. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8219 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-11-04 17:03:56 +00:00
Steven Franke
2e9a64aebe Move FT8 files into their own directory. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8200 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-10-30 21:30:14 +00:00
Joe Taylor
d4652ef0e5 More progress on FoxCalls... 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2017-10-30 20:47:08 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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