Commit Graph

208 Commits

Author SHA1 Message Date
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
Joe Taylor
e3f405684f Add authors' names to title bar. 2021-04-15 08:15:06 -04:00
Bill Somerville
25baa705de
Repair another argument type issue 2021-04-15 03:04:52 +01:00
Bill Somerville
84f193c5a9
Repair argument type mismatch 2021-04-15 02:57:02 +01:00
Bill Somerville
bd9c7a5785
Switch to recommended package finder naming conventions 2021-04-15 02:56:00 +01:00
Bill Somerville
583b4aa21a
Squash more compiler warnings 2021-04-14 23:41:52 +01:00
Bill Somerville
8de93a5330
Squash a couple of compiler warnings 2021-04-14 22:55:33 +01:00
Bill Somerville
5946eaf615
Windows compatibility for the portaudio package finder 2021-04-14 21:59:00 +01:00
Joe Taylor
b17ddac6c6 Simplification of Wide Graph layout. 2021-04-14 14:13:20 -04:00
Joe Taylor
c12ae72dac Minor tweaks to GUI code. 2021-04-14 14:13:04 -04:00
Joe Taylor
9f45e095f1 Change button label from "Tx Q65 $" to "Tx Q65 :". 2021-04-14 09:16:54 -04:00
Joe Taylor
fec7e2d2d1 Do not display no-decode lines in MAP65 main window. 2021-04-13 19:23:45 -04:00
Joe Taylor
30ecae5193 Back out commit b30713388 -- it broke the behavior of Messages and Band Map. 2021-04-13 17:33:58 -04:00
Joe Taylor
12f3faa0a1 Code cleanup. Looking ad adding Q65 decodes to Band Map and Messages. 2021-04-13 16:32:24 -04:00
Joe Taylor
17b0fd4974 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-13 14:47:15 -04:00
Joe Taylor
b307133882 Do not display blank decode lines. 2021-04-13 14:46:31 -04:00
Joe Taylor
8937266395 MAP65 now decodes Q65-60C. 2021-04-13 14:02:30 -04:00
Joe Taylor
ff54b4853b Minor code cleanup. 2021-04-13 13:52:46 -04:00
Bill Somerville
19875e2b03
Remove redundant code that causes CLang++ warnings 2021-04-13 13:41:01 +01:00
Joe Taylor
3f98270681 Fix the floating-point exception caused by a c2r FFT when not enough space allocated for data array. 2021-04-12 15:21:38 -04:00
Bill Somerville
f82d984501
Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-11 15:29:59 +01:00
Bill Somerville
56c92c55fb
Updated CMake finders and changes to build map65 on Linux 2021-04-11 15:29:15 +01:00
Joe Taylor
7664a63465 Send real, not int, to indexx(). Should prevent floating exception message on exit. 2021-04-11 09:32:21 -04:00
Joe Taylor
f65b7925a7 Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration 2021-04-10 07:40:43 -04:00
Bill Somerville
74bd3c1d0c
Changes to integrate into WSJT-X build system
A  separate install  of the  portaudio  library is  now required,  see
"doc/building on MS Windows.txt" for a suitable recipe.

The map65  code base  is still  MS Windows specific  in some  areas so
don't expect successful builds on Linux or macOS yet.
2021-04-10 12:29:34 +01:00
Joe Taylor
00035235eb Update map65.pro and Makefile for new location of sources in the wsjtx project. 2021-04-09 13:41:19 -04:00
Bill Somerville
769e00ab88
Getting compilation of map65 working with CMake and Qt 5.15 2021-04-09 17:47:49 +01:00
Joe Taylor
faca845d89 Fix a merge issue in init_rs.c. 2021-04-09 09:50:25 -04:00
Bill Somerville
96e8908866
Merge branch 'master' of ../map65 into feat-map65-integration 2021-04-09 14:00:10 +01:00
Bill Somerville
280c8344cd
Move project files to map65 sub-directory
Preparation for merging with the wsjtx project repository.
2021-04-09 13:57:41 +01:00