Commit Graph

3167 Commits

Author SHA1 Message Date
Joe Taylor
68e03f6c4e Another attempt to get both m_rptRcvd sent to log and valid spot sent to PSKreporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7147 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-03 22:52:01 +00:00
Joe Taylor
a852efc33f Always use "&" for MSK144 decodes. Add single digit at end of line to indicate number of frames coherently averaged. THIS REVISION IS NOT INTENDED FOR USE ON THE AIR.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7146 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-03 20:28:27 +00:00
Steven Franke
d9e4b7eede More progress on MSK40 decoder. THIS REVISION IS NOT INTENDED FOR USE ON THE AIR.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7145 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-03 20:18:53 +00:00
Joe Taylor
6dcdee836e Further speed improvements for MSK144 RT decoding. Fiz what I broke in the "click-on-CQ-message" logic.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7144 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-03 17:08:02 +00:00
Joe Taylor
4895b5f8ba More complete definition of CPU usage for MSK144 RT decoding. Speed is back
to that of r7139.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7143 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-03 13:48:30 +00:00
Steven Franke
78652121fa MSK144 should auto sequence only when the box is checked.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7142 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-03 01:20:15 +00:00
Joe Taylor
eeac94e361 Don't send decodes from disk data to PSKreporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7141 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-02 23:41:41 +00:00
Joe Taylor
672a4e88b5 MSK144 mode: minimum Ftol=20; report received copied to Log screen; spots sent to PSKreporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7140 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-02 23:16:47 +00:00
Steven Franke
69d579388b First steps toward realtime short ping decoder for MSK40.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7139 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-02 01:43:31 +00:00
Steven Franke
58b331b36b Make RxFreq step size 10 Hz in MSK144 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7138 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-02 01:14:35 +00:00
Steven Franke
0173ea4d6d 1. Initialize m_msg[0][0] to stop garbage decode right after startup. 2. Decouple RxFreq spinbox from printed/decoded frequency. 3. Limit RxFreq to 25 Hz steps in the range [1400,1600] when in MSK144 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7137 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-02 00:23:09 +00:00
Joe Taylor
8dc2fef844 Back out some changes that were broken. PSK reporter not yet functional for MSK144.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7136 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 20:10:46 +00:00
Joe Taylor
23785f60e4 Oops! Committed wrong versions. This code is not ready for use!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7135 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 19:40:26 +00:00
Joe Taylor
02ef8823ef 1. Allow Ftol down to 20 Hz in MSK144 mode.
2. Do not adjust Rx Freq automatically after an MSK144 decode.
3. Insert the Rcvd report in log window.
4. Send MSK144 decodes to PSK Reporter.

NB: not all these are fully tested, yet.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7134 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 19:32:16 +00:00
Steven Franke
4fe86cef1e Try to squash double-decodes and gibberish prints.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7133 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 18:13:39 +00:00
Joe Taylor
31032468a9 Storage for cdat2 must be on a "per thread" basis.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7132 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 01:30:41 +00:00
Steven Franke
6c7f112384 Delete unused nav(6) array in mskrtd. Minor fix to command-line tool msk144d2.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7131 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 00:05:20 +00:00
Bill Somerville
c7c50830bf Fix a crash which appears to be a stack size limitation
This issue was probably triggered  by OpenMP forcing some large arrays
onto the  stack where  Fortran might normally  make them  static.  The
change  that  seemed to  make  the  difference  was putting  cdat2  in
msk144_freq_search into  static storage. I  am not convinced  that the
problem is really solved but it works for now.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7130 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-30 23:32:01 +00:00
Steven Franke
98cfad968f Update msk144d2 to work with recent changes in genmsk144.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7129 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-30 21:09:28 +00:00
Bill Somerville
7644a79c0b Make new OpenMP code compile without OpenMP support
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7128 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-30 16:59:18 +00:00
Joe Taylor
435c132bac Simplify the multi-threading code in msk144sync().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7127 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-30 16:52:16 +00:00
Joe Taylor
5ecd85570d Multi-threaded real-time MSK144 decoder. Needs further testing!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7126 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-30 15:56:55 +00:00
Joe Taylor
2ba4865d84 This should have been committed with r7121.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7125 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-30 15:55:53 +00:00
Bill Somerville
23aead0b8d Fix broken non-Windows builds.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7124 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-30 14:47:25 +00:00
Joe Taylor
845420f2b2 Disable OpenMP in msk144sync. As initially coded it's no improvement.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7123 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 23:44:24 +00:00
Bill Somerville
13be9cb566 Enable OpenMP for everything except on Macs
Also increase  Windows stack  size from  1Mbyte to  8Mbyte due  to the
impact  of Fortran  arrays  not being  automatically  moved to  static
storage above a certain size. This needs attention by setting the SAVE
attribute on large arrays that do not  need to be on the stack i.e. do
no need to be duplicated across OpenMP thread teams.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7122 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 22:45:58 +00:00
Joe Taylor
69ccd03736 Implement "R FN20", etc., in contest-mode MSK144 messages. (Tx only, so far!)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7121 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 20:24:45 +00:00
Joe Taylor
7dd6d1c949 Correct two constants used in msk144sync.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7120 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 17:37:03 +00:00
Joe Taylor
bee5ea4c71 Minor cleanup; add some !$OMP stuff to msk144sync.f90, but it's not yet functional.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7119 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 16:39:14 +00:00
Steven Franke
9d49b88ca8 Revise some comments. No code changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7118 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 15:35:45 +00:00
Joe Taylor
7664a29fb6 Minor code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7117 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 14:46:12 +00:00
Joe Taylor
cd0895c26a Add a performance monitor for real-time MSK144 decoding.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7116 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 13:29:20 +00:00
Steven Franke
ebd7ac02b3 Drop Fast and Normal decoding depths down one notch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7115 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-29 03:01:32 +00:00
Steven Franke
4b9b6d8596 Wire up Fast/Normal/Deep decoding options for MSK144.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7114 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-28 22:13:07 +00:00
Joe Taylor
57a5ad188d Send ndepth (value = 1, 2, or 3) to hspec(). MSK144 click-to-decode now calls
the old fast_decode(); probably it should call hspec() instead?


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7113 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-28 20:41:41 +00:00
Joe Taylor
6579b93690 Progress toward full implementation of real-time decoding of MSK144.
I believe file saving and auto-sequencing nor work.  Not sure about posting
to PSK reporter: please check.  


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7112 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-28 19:08:19 +00:00
Steven Franke
766c978709 Make frequency search more efficient in msk144 realtime decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7111 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-25 20:37:30 +00:00
Steven Franke
3ea464c785 Make msk144spd properly track the RxFreq spinbox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7110 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-25 12:53:07 +00:00
Steven Franke
f210e47cd5 MSK144:
1. Clean up mskrtd to remove unused variables.
2. Re-instate Rx frequency spinbox in MSK144 mode to allow decoding of off-frequency signals with small FTol. Make changes needed to pass Rx Freq in to fortran routines. 
3. Enable realtime decoder for testing. Auto sequence does not yet work when realtime decoding is enabled. There are probably other bugs as well.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7109 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-25 00:16:29 +00:00
Steven Franke
3df371f11b New short ping decoding algorithm for msk144 realtime decoder. Not yet enabled.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7108 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-23 22:28:11 +00:00
Steven Franke
9831fb9cfc More work on real-time decoder for msk144.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7107 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-22 19:42:05 +00:00
Steven Franke
dd6cb2350a Add new routines associated with msk144 real-time decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7106 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-22 00:04:43 +00:00
Steven Franke
be0c4f15c1 More work on real time decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7105 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-22 00:03:44 +00:00
Steven Franke
5df0bbcd50 Fix what I broke.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7104 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-20 22:51:06 +00:00
Steven Franke
50d505c3b8 Remove diagnostic write.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7103 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-20 20:47:29 +00:00
Steven Franke
b04c3ab79c Add new routines to CMakeLists.txt.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7102 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-20 20:24:03 +00:00
Steven Franke
d97b2febdf Add command-line routine to test real time msk144 decoding.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7101 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-20 20:22:48 +00:00
Steven Franke
8d24c33a00 Move decoding of synced frame into a subroutine.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7100 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-20 20:21:24 +00:00
Joe Taylor
e1ef9b0ee0 Temporarily disable the cbRealTime checkbox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7099 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-20 16:37:39 +00:00
Joe Taylor
109caa8912 Add real-time decode routine.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7098 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-20 16:35:00 +00:00