Commit Graph

279 Commits

Author SHA1 Message Date
Joe Taylor
0fc609ce5f Double-click on call in Messages window now sets Tx mode and report, as in main window. 2021-05-22 09:55:43 -04:00
Bill Somerville
028b217df3
Some clean up of IQ+ frequency control
IQ+  users  on  MS  Windows  should  update  the  driver,  the  PE0FKO
libusb-w32  driver is  obsolete  and not  compatible  with the  latest
libusb user mode  library we are using for control  of this device. By
far the  easiest way  to upgrade,  without loosing  compatibility with
applications using older vendor USB  drivers, is to download the Zadig
tool  from   https://zadig.akeo.ie/,  run  the  tool,   scan  for  all
appropriate USB  devices (check the "Menu->Options->List  All Devices"
option), select the device called  DG8SAQ from the top drop-down list,
then with  WinUSB listed  as the  replacement driver  to right  of the
green arrow, double-click the "Replace libusb-w32" button. After a few
seconds the driver will be replace, quit the utility and you are done.
2021-05-21 19:49:38 +01:00
Bill Somerville
71b9ec921b
Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-05-21 01:24:39 +01:00
Bill Somerville
5a3d0d7e21
Use main window menu bar for macOS MAP65 2021-05-21 01:23:26 +01:00
Joe Taylor
2f731ed434 Fix a bug concerned with testing a decode for inclusion in the main window. 2021-05-20 18:40:06 -04:00
Joe Taylor
651b90af81 Add "Q65 Sensitivity in MAP65 3.0" to the Help menu. 2021-05-20 14:36:58 -04:00
Joe Taylor
446ec086af Remove diagnostic prints. 2021-05-20 13:34:35 -04:00
Joe Taylor
92668c3ed4 Set k0 from f_mouse when nagain=1, and correct the displayed DF. 2021-05-20 13:01:36 -04:00
Joe Taylor
3392d18218 Pass several more params to q65b(). 2021-05-20 13:00:39 -04:00
Joe Taylor
c78e43e960 Double-click on a call in Messages now updates the signal report in Q65 mode. 2021-05-19 15:58:39 -04:00
Joe Taylor
4f70b808cd Reformat the "DX Call DX Grid" label on main window. 2021-05-19 15:15:09 -04:00
Joe Taylor
061e18f5e5 Restore normal colors for Q65 decodes in Messages window. 2021-05-19 14:34:06 -04:00
Joe Taylor
07d5fd23bb Double-click on callsign now populates DXgrid (if available) as well as DXcall. 2021-05-19 13:04:23 -04:00
Joe Taylor
7ae25b98f8 Don't try for a JT65 decode after calling decode1a with sync1=2.000. 2021-05-18 19:10:50 -04:00
Joe Taylor
919c4e0d22 Trying to (somewhat) rationalize use of Fcal and reposted DF values. 2021-05-18 14:04:33 -04:00
Joe Taylor
db7d4413e0 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-05-17 18:37:19 -04:00
Bill Somerville
cc24068106
Graceful shutdown of MAP65
May wait for current decoding cycle to complete.
2021-05-17 22:18:52 +01:00
Bill Somerville
d93b5fc908
Refactor window widget management to fix initialization errors 2021-05-17 19:30:51 +01:00
Joe Taylor
de27b71c02 Correct reported Q65 DF values for cases with fcal.ne.0. 2021-05-17 13:40:04 -04:00
Joe Taylor
4e4ae3ea9e Reject bogus JT65 decodes with unreasonable values of DT. 2021-05-17 13:01:20 -04:00
Joe Taylor
f174367a5b Don't execute irrelevant code if "No JT65" was selected. 2021-05-17 10:45:10 -04:00
Joe Taylor
5541d0f792 Correct an obsolete use of nqd=2. Avoid irrelevant code of "No JT65" was selected. 2021-05-17 10:43:21 -04:00
Joe Taylor
bfc66e22d3 Code cleanup. 2021-05-17 10:42:53 -04:00
Joe Taylor
a139bb98f5 Must call q65b at least once with nqd=1. Make the snr1 threshold smaller in q65b. 2021-05-16 14:56:43 -04:00
Joe Taylor
9d10e38b9e Correct a flaw in checking for Q65 candidate freq within FTol range. 2021-05-15 14:44:42 -04:00
Joe Taylor
acbfc8840e Don't call q65b if "No Q65" is selected. 2021-05-15 10:24:33 -04:00
Joe Taylor
6b5d85e9e2 Send correct DF for Q65 decodes to Messages window and and decoded text window. 2021-05-15 09:46:00 -04:00
Joe Taylor
0e175f5046 Send correct QSO mode to the log. 2021-05-15 09:45:31 -04:00
Joe Taylor
857fe04e00 Remove obsolete references to nqd.eq.2. 2021-05-14 19:41:44 -04:00
Joe Taylor
51dd025a8b Don't display Q65 decodes twice in Messages window (if decoded with nqd=1). 2021-05-14 19:37:14 -04:00
Joe Taylor
0e07395f2b Double-click on Erase button will now clear the Band Map and Messages windows. 2021-05-14 14:49:14 -04:00
Joe Taylor
51b0941b20 Display Q65 decodes as white in Band Mp and Messages windows. 2021-05-14 14:35:58 -04:00
Joe Taylor
7076f3c749 Remove references to common/tracer/. 2021-05-14 14:35:23 -04:00
Joe Taylor
7a57a399e0 Display cursor frequency on Wide graph (upper and lower) as a ToolTip. 2021-05-14 14:14:39 -04:00
Joe Taylor
56e8f0ceee Send polarization of Q65 signals to LiveCQ. 2021-05-14 13:32:49 -04:00
Joe Taylor
f2ca2124d4 MAP65 wideband decoding tested and known working now for Q65-60A and Q65-60C. 2021-05-14 11:52:23 -04:00
Joe Taylor
25148a52e3 Remove more timer calls that are essentially moot. 2021-05-13 16:34:47 -04:00
Joe Taylor
00362b080a Protect against dupe decodes by widening bw just a bit. 2021-05-13 15:51:26 -04:00
Joe Taylor
8034a006d7 Enable q3 decodes, but only at the QSO freq. 2021-05-13 15:33:52 -04:00
Joe Taylor
ebfe352834 Establish correct nqd behavior with wideband Q65 decoding. 2021-05-13 13:13:21 -04:00
Joe Taylor
e480c47356 Wideband Q65 decoding basically works, and timeing is acceptable! Needs work to distinguish between nqd states. 2021-05-13 11:43:39 -04:00
Joe Taylor
32ad0bec38 Work in progress on wideband decoding. 2021-05-13 11:24:26 -04:00
Joe Taylor
a323c6ec65 Remove some timer calls for routines that contribute negligibly to execution time. 2021-05-13 10:49:41 -04:00
Joe Taylor
2a2f9eb76d More work toward wideband decoding. 2021-05-13 10:40:24 -04:00
Joe Taylor
43e2a95edf Disable diagnostic write. 2021-05-13 08:42:00 -04:00
Joe Taylor
7407dc6332 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-05-13 08:16:57 -04:00
Bill Somerville
6bd50b2444
Automatic FFTW3 wisdom handling for map65 GUI and shmem m65 runs 2021-05-13 12:44:32 +01:00
Joe Taylor
37b6b4b22c More WIP on wideband Q65 decoding. 2021-05-12 16:50:50 -04:00
Joe Taylor
af6d406aeb Working toward wideband decoding for Q65. 2021-05-12 16:34:00 -04:00
Joe Taylor
cd978bae4e Code cleanup for synctest and wideband2_sync. 2021-05-12 14:30:53 -04:00
Joe Taylor
150c6b179c Ffurther improvements and code cleanup for synctest. 2021-05-11 15:19:27 -04:00
Joe Taylor
82693d032f Program synctest now working well. 2021-05-11 14:53:49 -04:00
Joe Taylor
0e069f7f3b Add temporary program for testing JT65 and Q65 sync for possible use in MAP65. 2021-05-11 12:50:18 -04:00
Joe Taylor
28699d6224 Make Quick-Start Guides to Q65 and MAP65 v3 available from the Help menu. 2021-05-10 09:38:14 -04:00
Joe Taylor
5d097b8c2b Improved JT65 decoding performance when input signal level is well above "normal". 2021-05-09 16:35:12 -04:00
Bill Somerville
7b98a0c585
Fix rx/tx frequency overlay punctuation and make label background transparent 2021-05-08 23:51:16 +01:00
Joe Taylor
356946d9ab Correct a flaw in setting the target f0 in q65b. 2021-05-08 13:58:43 -04:00
Joe Taylor
ed957a0390 Protect against rms=0 in ccf65. 2021-05-08 10:11:12 -04:00
Joe Taylor
fc967a850f Must set m_TRperiod=60 even when "No JT65" is selected. 2021-05-07 14:28:26 -04:00
Joe Taylor
a8753774ca Protect against a possible bounds error in decode1a. 2021-05-07 13:25:02 -04:00
Joe Taylor
e271696da9 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-05-07 11:41:58 -04:00
Joe Taylor
0ce4e8d92e Correct the faulty definition of Q65 transmission duration in mainwindow.cpp. 2021-05-07 10:40:14 -04:00
Joe Taylor
733fe2f580 Do not send '<DecodeFinished>' from q65b, it's done from decode0. 2021-05-07 10:27:41 -04:00
Joe Taylor
f8e385deeb Flag Q65 decodes with ':' in Messages window. 2021-05-07 09:59:33 -04:00
Bill Somerville
98d4f771c2
Report failed sub-process exit statuses then exit gracefully 2021-05-07 01:14:51 +01:00
Joe Taylor
1d6835b859 Once again, use the value of Fcal (nfcal) properly in q65b.f90. 2021-05-06 19:21:22 -04:00
Joe Taylor
c6d0efc6dc Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-05-06 14:56:44 -04:00
Joe Taylor
98f6181f32 Start work on Q65 wideband decoding. 2021-05-06 14:56:05 -04:00
Joe Taylor
5f439126ee Send Q65 decodes to Band Map and Messages windows. 2021-05-06 14:51:53 -04:00
Joe Taylor
8b2e257e2c Sent ntone_spacing to wb_sync. Change "debug print flag" from # to =. 2021-05-06 14:50:05 -04:00
Steven Franke
f34940aafe Fix a comment. 2021-05-06 10:30:38 -05:00
Steven Franke
49588fde96 Call routine get_q65_tones when generating q65 waveforms. 2021-05-06 10:27:43 -05:00
Bill Somerville
47aa8b1dc6
Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-05-05 17:04:57 +01:00
Bill Somerville
fe8a2a31af
Work around a CMake file(TO_NATIVE_PATH) oddity with CPack 2021-05-05 17:04:02 +01:00
Joe Taylor
1eea4cd9cf Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-05-05 11:22:18 -04:00
Joe Taylor
e4de1a65be Use hhmm rather than hhmmss for generated mapsim file names. 2021-05-05 11:21:25 -04:00
Bill Somerville
9322b1a8c7
Avoid MainWindow methods being called via the event loop during construction 2021-05-05 15:15:50 +01:00
Joe Taylor
5bfb629b84 Corrections for several flaws in mapsim. 2021-05-05 09:23:25 -04:00
Joe Taylor
3f74137d32 Add Q65 modes and optional Doppler spread to mapsim. 2021-05-04 15:46:00 -04:00
Joe Taylor
b11b925e11 Use <h2> rther than <h4> for heading in the 'About' window. 2021-05-03 10:25:02 -04:00
Joe Taylor
dcd3e5a1d6 Fixed some problems in q65b. Performance now better over full range of lower waterfall. More work still needed! 2021-05-02 18:50:47 -04:00
Joe Taylor
e79a6b80f4 Roll off the extracted spectrum below 500 Ha and above 2500 Hz. 2021-05-02 13:51:01 -04:00
Joe Taylor
54882b57b9 Allow mainwindow to send Fortran debugging output to the shell. 2021-05-02 11:37:21 -04:00
Joe Taylor
d010929fab Correct for the fact that ss and savg start at bin 1 = zero freq. 2021-05-02 11:36:17 -04:00
Joe Taylor
25584f09e5 Build and install mapsim[.exe]. 2021-05-02 11:34:10 -04:00
Joe Taylor
2b09f6ef87 Code cleanup. 2021-04-30 18:56:04 -04:00
Bill Somerville
c4d3f91098
Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-30 22:54:11 +01:00
Bill Somerville
039513e2cf
Use WSJT-X revision utilities to label the MAP65 revision
MAP65 still has  a private version number as set  in map65/main.c, but
the SCS revision automatically tracks the git SHA.
2021-04-30 22:51:09 +01:00
Joe Taylor
f3ba12e643 Change the timer call to 'q65b', as it should be. 2021-04-30 17:31:38 -04:00
Joe Taylor
42318c9021 Make the behavior of FTol more rational in MAP65. 2021-04-30 15:22:41 -04:00
Joe Taylor
c9b2a3d2cd If no 'hiscall', don't try for a q3 decode. 2021-04-30 08:31:45 -04:00
Joe Taylor
d8e9850583 MAP65 code cleanup. More still needed! 2021-04-29 17:05:11 -04:00
Joe Taylor
7f9da0ba90 Compute analog of "orange sync curve" in MAP65; use it to determind ipol for a decode candidate. 2021-04-29 14:35:19 -04:00
Joe Taylor
88fa43cf77 Tweak a few startup constants used for command-line execution of m65. 2021-04-29 12:13:17 -04:00
Joe Taylor
5af7397641 Use timer module from wsjt_fort library in MAP65. 2021-04-29 09:39:08 -04:00
Joe Taylor
4b967ad8af Add a timer call. Still to do: convert timer calls to 'use timer ...' 2021-04-28 15:32:58 -04:00
Joe Taylor
943ff89dcd Use pctile from the wsjt_fort library. 2021-04-28 14:31:24 -04:00
Joe Taylor
cc419bcef7 General cleanup in q65b.f90. 2021-04-28 14:14:54 -04:00
Joe Taylor
e844307ccc New default params, for now. This needs work! 2021-04-28 13:53:16 -04:00
Joe Taylor
de1388f0b0 Set some default parame for command-line eecution of m65. 2021-04-28 13:36:48 -04:00
Joe Taylor
c7af9945d3 m65 noe mostly OK for single-pol mode. Needs more work for xpol. 2021-04-28 10:13:42 -04:00
Joe Taylor
6a4770ef96 Fix the MAP65 "About" screen. 2021-04-27 17:30:01 -04:00
Joe Taylor
8bdaf2dccf First working m65 that calls Q65 subroutines rather than execuring jt9[.exe]. Still needs work. 2021-04-27 17:02:39 -04:00
Joe Taylor
6d9b436947 Save a temporary version of q65b.f90. Still to do: remove the call that executes jt9. 2021-04-27 15:25:38 -04:00
Joe Taylor
201a071128 Make pctile in libm65 the same as pctile in lib. 2021-04-27 15:24:40 -04:00
Joe Taylor
fe6df921c9 Search the wsjt_fort and wsjt_cxx libraries when linking m65. 2021-04-27 15:21:56 -04:00
Joe Taylor
ed59972ee4 Change the map65 timer.f90 to use system_clock() ==> wall clock time. 2021-04-26 14:57:15 -04:00
k9an
b3d15ea0c6 Prevent a divide-by-0 error in ftrsd2.c. 2021-04-26 08:08:27 -05:00
Joe Taylor
56450e1806 Allow m65 to set ndepth for jt9. 2021-04-24 11:29:59 -04:00
Joe Taylor
842d46cd6a Display the last q65 message character in *nix. 2021-04-24 11:28:51 -04:00
Bill Somerville
8c056a3edb
Repair a regression in parsing map65 UI colours 2021-04-24 15:01:50 +01:00
Bill Somerville
4a7d5b8602
Write a file Fortran code can use to prefix $cwd file paths 2021-04-24 01:03:13 +01:00
Joe Taylor
34580f3a5b Go back to using wsjtx_dir.txt, temporarily, for platform portability. 2021-04-23 18:59:34 -04:00
Joe Taylor
8024c6a4c3 Change wsjtx_dir from '\.' to './' for Linux. Does this still work in Windows? 2021-04-23 17:27:00 -04:00
Joe Taylor
a90b938a6d Fix a flaw in setting up the map65 .lock and .quit files. 2021-04-23 17:18:24 -04:00
Joe Taylor
f3b6a06c96 Remove dependence on wsjtx_dir.txt -- we don't need it now. 2021-04-22 14:56:57 -04:00
Joe Taylor
96ee2bfac1 Rx sequence must be >= 56 s now, but >= 52 s. 2021-04-22 14:35:38 -04:00
Joe Taylor
4afc6f92b6 Fix a regression introduced when cleaning up compiler warnings. 2021-04-22 14:24:35 -04:00
Joe Taylor
b2a56fec8b Fis a few more compiler warnings. 2021-04-22 14:08:53 -04:00
Joe Taylor
c3b724a377 More cleanup of compiler warnings. 2021-04-22 14:04:08 -04:00
Joe Taylor
19e73414df More cleanup: remove obsolete files from the map65 tree. 2021-04-22 13:47:17 -04:00
Joe Taylor
c6e24e79bd More cleanup of compiler warnings. 2021-04-22 13:29:40 -04:00
Joe Taylor
cfecb43d34 Cleaning up some build scripts and fixing compiler warnings. 2021-04-22 13:12:55 -04:00
Joe Taylor
a90b58ad40 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-21 17:06:00 -04:00
Bill Somerville
6ec55f0698
Repair a regression in saving colours to settings 2021-04-21 21:58:10 +01:00
Joe Taylor
b99812111d Must keep ihsym stopping point at 280, for old *.tf2/*.iq files. 2021-04-21 15:33:13 -04:00
Joe Taylor
bc88592684 Don't start decoder until t=56 s, to accommodate Q65 Tx duration and EME delay. 2021-04-21 11:28:09 -04:00
Joe Taylor
db9ed3be03 Move the Q65 "q#' tags slightly to the left when displayed in main window. 2021-04-21 11:27:10 -04:00
Joe Taylor
69619dd31e Remove an unused variable. Protect against extreme values leading to FPEs. 2021-04-20 15:35:56 -04:00
Joe Taylor
fbf288e271 Revert "Send a suitable 'datadir' and 'tempdir' to m65."
This reverts commit fb17e42f25.
2021-04-20 12:46:44 -04:00
Joe Taylor
6cf3a74ad8 Revert "Receive 'datadir' and 'tempdir' from map65."
This reverts commit cc69993b6a.
2021-04-20 12:46:23 -04:00
Joe Taylor
4979336622 Revert "Working toward proper usage of OS-independent datadir and tempdir."
This reverts commit 00c9fb10e1.
2021-04-20 12:46:00 -04:00
Joe Taylor
9bc9899b18 Revert "A few steps further toward use of datadir, tempdir."
This reverts commit 189a0a35ab.
2021-04-20 12:45:41 -04:00
Joe Taylor
c20201e7f7 Revert "Prepare to send 'datadir' and 'tempdir' strings to m65."
This reverts commit f8e61e05af.
2021-04-20 12:45:18 -04:00
Joe Taylor
f8e61e05af Prepare to send 'datadir' and 'tempdir' strings to m65. 2021-04-20 11:07:33 -04:00
Joe Taylor
189a0a35ab A few steps further toward use of datadir, tempdir. 2021-04-19 16:12:55 -04:00
Joe Taylor
00c9fb10e1 Working toward proper usage of OS-independent datadir and tempdir. 2021-04-19 15:55:40 -04:00
Joe Taylor
0599be02cc Fix input format for wsjtx_dir.txt. 2021-04-19 15:15:16 -04:00
Joe Taylor
55f1e9da2b No need to save paerr here. 2021-04-19 15:10:32 -04:00
Joe Taylor
f5a63e1e4a Call Pa_Terminate() on exit, to free all Portaudio resources. 2021-04-19 14:16:27 -04:00
Joe Taylor
f712621177 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-19 13:09:29 -04:00
Joe Taylor
a360ff0bcd Remove some diagnostic writes. 2021-04-19 13:08:59 -04:00
Joe Taylor
cc69993b6a Receive 'datadir' and 'tempdir' from map65. 2021-04-19 13:08:25 -04:00
Joe Taylor
fb17e42f25 Send a suitable 'datadir' and 'tempdir' to m65. 2021-04-19 13:06:50 -04:00
Bill Somerville
a3334295ef
Revert to standard CMake BundleUtilities.cmake script
Fix some installation dependency finding issues.
2021-04-18 01:06:04 +01:00
Joe Taylor
c143c2c279 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-16 15:14:28 -04:00
Joe Taylor
a970ad1447 Make both call-from-map65 and m65 from command line work properly on *.tf2 and *.iq files. 2021-04-16 15:12:00 -04:00
Joe Taylor
30d37f292b Replace variable name 'mode64' with 'mode_q65' in several more places. 2021-04-15 13:56:41 -04:00
Joe Taylor
3c853df1bc Make sure m_TRperiod is defined before use. 2021-04-15 13:53:45 -04:00
Joe Taylor
2ed4ca3aaf Guard against base=0 when normalizing an snr2 estimate in ccf65(). 2021-04-15 13:51:01 -04:00