w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 04:38:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,860 Commits 5 Branches 98 Tags 208 MiB
672a4e88b5
Commit Graph

940 Commits

Author SHA1 Message Date
Steven Franke
96ad832a93 Accidentally overwrote msk32d.f90. Put the original back. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6958 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-27 22:29:52 +00:00
Steven Franke
f6d92acb47 msk32d modified for the (32,16) code. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6957 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-27 22:24:39 +00:00
Joe Taylor
b6a0b5a40f Tweak the correction for frequency drift of a QRA64 signal. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6956 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-27 20:49:30 +00:00
Joe Taylor
bcef802525 Simple standalone program msk32d to decode MSK144 short messages. It must be built using the genmsk32.f90 from r6951 (Golay code, 8-bit sync). 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6955 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-27 16:37:32 +00:00
Steven Franke
aeed9e3344 First-cut at decoder for (32,16) msk32. Needs more work. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6954 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-27 14:40:38 +00:00
Steven Franke
7b54487b91 Change msk32 messages to (32,16) code (no sync word) with 6-bit report and 10-bit hash. No decoder yet. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6952 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-26 23:14:30 +00:00
Joe Taylor
edc57a7d64 Disable diagnostic print; add msk32d.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6951 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-26 20:28:42 +00:00
Joe Taylor
24fb9b9d56 Oops! Forgot to include spec64.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6950 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-26 17:51:13 +00:00
Joe Taylor
f5737348fe Good decode implies sync OK. Also some code cleanup. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6949 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-26 16:44:35 +00:00
Joe Taylor
38113068cd New sync scheme for QRA64; also idf0 and idf1 dithering. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6948 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-26 16:04:57 +00:00
Steven Franke
9d1498891a Improvements to msk32 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6947 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-25 03:10:23 +00:00
Steven Franke
418f8b4ca6 Replacing floating point with integer in exhaustive search decreased exec. time from 33s to 23s. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6946 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-24 21:30:46 +00:00
Joe Taylor
99d4ed1399 Correct a logical flaw in hint65.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6945 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-24 18:31:13 +00:00
Joe Taylor
da7c135c9a Fix another cause of possible bounds errors in sync64; comment out the call to sync64, for now. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6944 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-24 12:32:14 +00:00
Joe Taylor
d1e23bdac8 Fix some potential bounds errors in setting frequency limits. Implement submodes QRA65B-E on the Tx side. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6942 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-23 13:22:34 +00:00
Joe Taylor
6a8ed228e2 Code cleanup for the sync64 routine. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6941 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-22 21:04:50 +00:00
Joe Taylor
71d94aa4c9 No more need for explicit includes of sync64.f90 and averms.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6940 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-22 19:58:37 +00:00
Joe Taylor
95ab66807d MOving toward use of sync64(). Not yet there! 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6939 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-22 19:52:20 +00:00
Joe Taylor
a2d961aa5a Speed up sync by 10x, solve for frequency drift, and improve Sync S/N estimate. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6938 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-22 18:52:59 +00:00
Joe Taylor
f60f7d2060 Many improvements to qratest. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6937 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-22 16:56:08 +00:00
Joe Taylor
44d2f446a2 Test program for improved sync detection. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6936 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-21 20:30:04 +00:00
Joe Taylor
6d6fa2b4ae About 1 dB better for worst-case DT. Further improvement still to come! 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6935 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-21 15:23:32 +00:00
Joe Taylor
c7361c66f6 Add APTYPE_CQHISCALL (5), returning 9 [CQ DXcall ?], 10 [CQ DXcall], and 
11 [CQ DXcall DXgrid].


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6934 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-21 12:38:26 +00:00
Joe Taylor
ab1e2eaa3c More cleanup and optimization of the QRA64 decoding procedure. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6932 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-20 15:38:29 +00:00
Joe Taylor
76ed1007c4 Cleanup and minor tweaks to QRA64 decoding scheme. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6931 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-19 20:52:51 +00:00
Joe Taylor
2df82d2b12 For unknown reasons, AP decode of [CQ ? ?] is not working. 
Temporary work-around effectively sets MyCall to "CQ    ". 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6930 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-19 15:49:06 +00:00
Joe Taylor
f92afadc6c Try APtype 4, 3, 2, 1, 0. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6929 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-19 15:24:15 +00:00
Joe Taylor
920fd25537 Starting work toward flexible use of AP decoding in QRA64. Beware, this is still in progress! 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6928 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-19 13:16:10 +00:00
Joe Taylor
07951f1a18 Remove some experimental code; revert qra64a.f90 to r6904. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6927 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-18 12:59:33 +00:00
Joe Taylor
f3703e0241 Nico's additions for new AP decoding modes and improved control of AP decoding. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6926 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-18 12:42:10 +00:00
Steven Franke
df8d0ab665 Add some timer calls. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6925 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-17 20:05:27 +00:00
Steven Franke
fca3805df7 Add -e option to msk144d - prints short messages regardless of hash. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6923 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-15 00:59:19 +00:00
Joe Taylor
d00e377d88 Fix typo. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6922 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-14 18:46:04 +00:00
Joe Taylor
3bb1487c60 Allow <...> display of mouse-clicked short MSK144 messages with bad CRC and S/N > -4. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6921 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-14 18:23:38 +00:00
Joe Taylor
9544f60b5a Implement "pick to decode" on the MSK144 horizontal waterfall. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6917 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-14 17:06:52 +00:00
Steven Franke
3522f3706a Fully implement FTol and remove temporary hash test in detectmsk32.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6916 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-14 16:39:07 +00:00
Steven Franke
f3d6de87d8 Quantize SNR to 2dB steps. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6911 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-13 20:29:18 +00:00
Joe Taylor
857388722d When MSK144 message is changed between long and short format, must inform Modulator. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6909 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-13 19:17:47 +00:00
Steven Franke
42b6ef859c Remove bit re-ordering in msk144. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6908 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-12 18:29:46 +00:00
Joe Taylor
211f8ba291 Save/Restore status of Sh box. Limit range of auto-generated short-message 
reports to -4 to +10 dB.  Include +/- sign in all reports.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6907 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-12 15:45:27 +00:00
Joe Taylor
f740d7d999 Rough measurement and compensation for drift now included for QRA64. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6905 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-11 20:38:31 +00:00
Steven Franke
039c9c023e Tweaks to msk32 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6902 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-10 02:19:43 +00:00
Steven Franke
d39dfe3d87 Catch up msk144d.f90 with recent changes. Implement FTol in detectmsk144 (but not in detectmsk32 yet). 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6899 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-09 00:07:07 +00:00
Joe Taylor
874204dfe9 Another attempt at optimizing the red sync curve for QRA64. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6895 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-08 15:22:50 +00:00
Joe Taylor
6d2e974b8d Call the MSK144 short-message decoder only if "Sh" is checked. Also, 
make ntol available to the MSK144 decoder.  


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6894 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-08 14:42:28 +00:00
Steven Franke
42bdbf0de7 Fix what I broke. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6891 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-07 23:18:40 +00:00
Steven Franke
b0108d59be Add hash test. Add phase0 loop. Implement hash test in msk144d.f90 test program. Have not yet tested short messages with hash test. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6890 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-07 22:41:35 +00:00
Joe Taylor
807d5e595b Commit most of what's necessary for decoding MSK144 short messages, including 
the hash test.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6889 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-07 20:15:01 +00:00
Joe Taylor
421524d88c Fix the broken S/N calculation for QRA64. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6888 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-07 19:27:03 +00:00
Joe Taylor
26efb825d3 Minor corection to "red" curve, QRA64 mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6887 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-07 14:53:40 +00:00
Steven Franke
b9a6d346b5 Improve sensitivity of msk32 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6885 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-07 00:20:11 +00:00
Steven Franke
c3529c9a1b Make short-message report format for positive SNR consistent with existing convention (no + sign). 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6880 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-06 20:13:08 +00:00
Steven Franke
ccbf3a9896 Define the length of short msk messages. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6879 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-06 19:11:03 +00:00
Joe Taylor
77e295d36d Plot a red "sync" curve in QRA64 mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6876 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-06 14:18:23 +00:00
Steven Franke
73c5fef39b Tweaking msk32 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6875 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-06 01:28:01 +00:00
Steven Franke
d987f8c507 Remove debug writes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6872 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-05 22:46:05 +00:00
Steven Franke
92088369e6 Un-break decoding of long msk messages. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6871 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-05 21:32:19 +00:00
Steven Franke
bd2d44942e Add msk32 routines. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6870 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-05 21:06:54 +00:00
Steven Franke
268208a185 Changes to existing files needed to accommodate short (16ms) msk messages. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6869 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-05 21:06:04 +00:00
Joe Taylor
e195b3ce15 Align displayed S/N with S/N in qra64sim. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6851 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-02 15:35:31 +00:00
Joe Taylor
63fa30b0b2 A few more renames, QRA65 --> QRA64. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6849 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-02 12:48:27 +00:00
Joe Taylor
3016ccee01 Many renames: QRA65 --> QRA64, QRA02 --> QRA64. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6848 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-02 12:15:41 +00:00
Joe Taylor
bb1e8f6692 Minor tweaks to QRA sync handling. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6844 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-01 15:25:41 +00:00
Joe Taylor
e23017d9e3 Improving the QRA sync-detect algorithm. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6843 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-07-01 15:16:00 +00:00
Joe Taylor
deb89de196 Temporary (partial?) workaround for qra decoder bug. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-30 23:17:40 +00:00
Joe Taylor
0384d312a6 Temporary mode QRA02 is now basically functional (though buggy). 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6833 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-30 20:38:36 +00:00
Joe Taylor
100c3d3121 More changes for QRA01 --> QRA02. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6825 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-29 19:12:46 +00:00
Joe Taylor
4bc4c11b66 Starting the transition from QRA01 to QRA02. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6824 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-29 19:10:57 +00:00
Steven Franke
364c7024db Improvements to msk144 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6810 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-25 18:47:55 +00:00
Joe Taylor
37d38a84db Make the 28-bit "nmycall" available to the QRA65 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6809 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-24 19:56:01 +00:00
Joe Taylor
dd2e5fbdda Some cleanup and reformatting of QRA65 code (with apologies to Nico). 
I've tried to make code "pretty print" and easier to follow, at least for me.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6808 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-24 19:54:34 +00:00
Joe Taylor
529ad6eec9 First functional decoder for QRA01. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6805 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-24 14:36:03 +00:00
Joe Taylor
6a8e4a7d01 Update some comments. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6804 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-23 17:40:56 +00:00
Joe Taylor
e2ea412e24 Minor tweaks to qra65code to facilitate simple simulations. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6803 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-23 15:50:59 +00:00
Joe Taylor
f146375dd0 More flexibility in QRA65code, including simple S/N simulations. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6802 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-23 13:58:18 +00:00
Bill Somerville
84891dde37 Apply Nico's QRA changes as of 2016/06/23 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6801 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-23 10:36:18 +00:00
Bill Somerville
6a481dd006 Make QRA sources more portable 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6800 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-23 09:31:16 +00:00
Steven Franke
0e3cb2ee8c Better calibration of SNR. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6799 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-23 02:43:40 +00:00
Steven Franke
f43c4fddbc delete unused variable 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6798 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-23 01:56:21 +00:00
Steven Franke
d1ad5c63a3 Fix msk144sim - thanks Joe. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6797 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-22 21:18:08 +00:00
Joe Taylor
969efaca14 Add qra65sim.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6796 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-22 20:47:11 +00:00
Joe Taylor
9fe70e8a02 Add routines needed for QRA65code. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6795 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-22 20:45:29 +00:00
Joe Taylor
9c19ff3eea Making progress on what will become QRA65 mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6794 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-22 20:26:41 +00:00
Steven Franke
403f16d296 More work on msk144 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6791 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-22 02:29:37 +00:00
Joe Taylor
0bd4a2363a Add makefiles for building libqra65.a and qra65sim.exe in Windows. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6790 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-21 17:26:07 +00:00
Joe Taylor
7402cecd9a Remove irrelevant *.vcproj files. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6789 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-21 15:10:06 +00:00
Joe Taylor
14f03dca53 Starting to add code for a potential "QRA65" mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6788 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-21 15:07:24 +00:00
Bill Somerville
1d7e86bc35 Binary branding 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6786 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-21 00:13:52 +00:00
Bill Somerville
e7bfd6de76 Sharpen 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6785 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-20 23:53:57 +00:00
Bill Somerville
1d0f097895 Sharpen 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6784 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-20 23:01:19 +00:00
Bill Somerville
2c20423fc6 Sharpen 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6783 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-20 22:18:08 +00:00
Steven Franke
fa55dadb91 Add extractmessage144.f90 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6779 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-16 23:19:56 +00:00
Steven Franke
469b57cbd0 More work on msk144. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6778 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-16 23:18:22 +00:00
Steven Franke
cb65abbb56 Turn off soft-symbol dithering to move RNG out of the picture. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-12 21:27:26 +00:00
Steven Franke
0fa2ed81bb Add Bill's fixes plus change to line 139. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6774 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-12 20:49:02 +00:00
Steven Franke
fea1f88dce Remove obsolete msk144 routines. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6773 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-12 15:56:41 +00:00
Steven Franke
45c36a5738 Minor tweaks to detectmsk144.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6772 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-12 15:02:50 +00:00
Steven Franke
9d75e1d9d1 Guard against array overrun. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6771 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-12 02:55:43 +00:00
Steven Franke
00ad072b7f calls detectmsk144 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6769 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-12 02:43:49 +00:00
Steven Franke
d45dc65a87 new combined detector/demodulator/decoder routine for msk144 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6768 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-12 02:42:51 +00:00
Bill Somerville
bac8da7859 Add the save attribute to variables that are lazily initialized and reused across calls 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6765 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-11 18:51:04 +00:00
Steven Franke
b91a9a782b Tweaks to syncmsk144 - improve performance for short pings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6758 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-11 02:39:21 +00:00
Joe Taylor
ad54035a53 Clean up some further compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6754 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-10 14:18:10 +00:00
Bill Somerville
5e7b750ac3 Initialize decode counts before decoding 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6750 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-09 23:39:19 +00:00
Steven Franke
80ff880341 Catch up msk144d.f90 and msk144sim.f90 to latest changes. Turn off debug write to lun78 - now builds and runs msk144 on OS X. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6749 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-09 22:09:06 +00:00
Joe Taylor
22340f66e4 Suppress some compiler warnings. (More to come...) 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6748 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-09 19:39:48 +00:00
Joe Taylor
df518f4e1d Make it possible to find MSK144 code-definition files in the "data_dir" on all platforms. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6747 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-09 15:06:15 +00:00
Steven Franke
26b20882ba Add msk144dt.f90 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6746 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-09 10:30:52 +00:00
Steven Franke
ada15d4f3c Put nsnr back where it was. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6745 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-09 02:23:21 +00:00
Steven Franke
0679069878 Added msk144dt; tweaks to syncmsk144l 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6743 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-09 02:02:50 +00:00
Joe Taylor
4425a5aad9 Remove diagnostic print. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6742 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-08 21:25:11 +00:00
Joe Taylor
143736129b Starting to implement the hooks for interfacing to QRA mode. 
Pass file path for peg-128 files to fast_decode().  (Inelegant, but it works.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6741 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-08 21:20:58 +00:00
Joe Taylor
dae04d7a39 For now (and maybe longer?), install the LDPC code-definition files in the .../bin/data directory. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6739 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-07 14:54:53 +00:00
Steven Franke
478f6270ee More work on msk144 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6738 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-07 01:30:00 +00:00
Steven Franke
b84a07349c fixed an array overrun 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6737 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-06 02:48:06 +00:00
Steven Franke
51428985b3 cleanup and improvement of syncmsk144 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6736 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-06 01:53:04 +00:00
Steven Franke
6e54009797 Average over 3 frames on the second pass. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6735 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-05 23:11:51 +00:00
Steven Franke
ee40202a1c fix up file names written by msk144sim 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6732 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-05 17:58:04 +00:00
Steven Franke
6c50362ccc Tweak coarse frequency acquisition. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6731 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-05 17:21:19 +00:00
Steven Franke
31d393cd45 Found and fixed a nasty array overrun problem. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6730 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-05 16:40:45 +00:00
Steven Franke
f7572dcc4e Fix utc issue in msk144d and other small changes related to msk144. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6729 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-05 16:02:26 +00:00
Joe Taylor
eec8ef436a Change the selective "save" statement in syncmsk144.f90 to a global 
save, to avoid what appears to be a stack overflow on Windows.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6728 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-05 14:03:20 +00:00
Steven Franke
a87f7270b0 Improvements to msk144d. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6727 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-05 01:19:54 +00:00
Joe Taylor
9845494276 Install MSK144 as a new mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6721 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-03 15:45:54 +00:00
Joe Taylor
a68384689f Revert three jt4 files to svn revision 6701. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6720 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-03 12:48:16 +00:00
Joe Taylor
2f2fd030e1 Let genmsk144 open the .pchk and .gen files from current working directory. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6719 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-02 12:41:39 +00:00
Steven Franke
05a311be59 Cleaned up syncmsk144 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6718 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-02 03:19:08 +00:00
Steven Franke
21bd398053 Add file needed by msk144d. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6717 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-02 02:46:53 +00:00
Steven Franke
1f37a6676f msk144 simulator is now called msk144sim.f90, command line msk144 decoder is msk144d.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6716 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-01 23:46:36 +00:00
Joe Taylor
ab8f641bb1 Set minimum SNR in JT4 mode to -26 dB. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6715 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-01 12:23:25 +00:00
Steven Franke
311dcdf7b9 Put back the original jtmsk_decode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6714 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-01 11:20:33 +00:00
Steven Franke
968705cb9c Some cleanup to genmsk144.f90 and commented out debug statements for loopback test on OS X. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6713 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-06-01 01:58:46 +00:00
Joe Taylor
2e7910fdfa Trivial correction to comment: "MSK144" protocol is s8 + d48 + s8 + d80 = 144 bits long. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6712 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-31 13:31:50 +00:00
Steven Franke
374282920c First working decoder for experimental jtmsk 72ms ldpc-coded messages. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6711 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-28 20:53:35 +00:00
Steven Franke
d68062f9d6 Progress on jtmsk 72ms messages. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6710 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-28 17:58:06 +00:00
Steven Franke
4d0bf9027b minor cleanup 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6709 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-27 20:50:30 +00:00
Steven Franke
aa34320736 genmsk144 now generates the tone indices need by Modulator.cpp. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6708 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-27 20:46:48 +00:00
Steven Franke
7bd8be0107 Added JTMSKsim to CMakeLists.txt to facilitate development efforts. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6706 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-27 00:59:00 +00:00
Steven Franke
9773afcb0a Routines for 72ms jtmsk messages. Nothing works yet. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6704 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-26 21:19:09 +00:00
Joe Taylor
fb00a603d5 Further improvements in JT4 decoder. NB: this is an intermediate save, users beware! 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6702 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-25 17:35:27 +00:00
Joe Taylor
27fb2d8126 Minor cleanups and corrections to the JT4 and JT65 decoders when 
using deep search and/or averaging.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6696 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-24 16:00:00 +00:00
Joe Taylor
f669df4d08 In JT4 mode, do averaging only if GUI has it enabled. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6694 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-24 14:19:55 +00:00
Joe Taylor
4bcc4f35a1 Much improved detection of sync in JT4 decoder. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6686 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-19 19:19:47 +00:00
Joe Taylor
1531f3ad3b New format for end-of-line flags in JT4 and JT65; starting work on 
establishing sync in JT4.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6685 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-19 16:13:51 +00:00
Bill Somerville
f398495cfc Allow for, and add where necessary, a second character after mode 
The decoded message processing relies on fixed column positions so the
extra character used in message  averaging to indicate sync flips must
also be allowed for in other modes.  This is done by inserting a space
character.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6681 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-17 19:35:38 +00:00
Joe Taylor
6bbfb0e1f1 Mark JT4 Fano decodes with 'f'. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6680 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-17 19:33:33 +00:00
Joe Taylor
f5cec462d4 Resolve more issues for display of JT4 decodes; improve JT4 sync at low spread. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6679 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-17 18:34:57 +00:00
Joe Taylor
f82ee7c4e3 Correct several VHF/UHF/Microwave items on Rex's list. Specifically: 
1. Allow display of JT65 single-line decodes when there is also an
   average decode.
5. Do not call JT4 deep search if Fano decode has succeeded.
7. Fix occasional Fortran error seen with the "#" (nflip=-1) sync.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6678 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-17 17:19:27 +00:00
Joe Taylor
bd9d772c02 Clean up some code in jt4_decode.f90. 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6677 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-16 17:50:16 +00:00
Bill Somerville
a45ea3cdff Adjust decodes displays and processing for extra csync indicator after mode 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6674 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
 2016-05-05 18:53:00 +00:00