Commit Graph

112 Commits

Author SHA1 Message Date
Joe Taylor
cdf1d6c05a Updated Makefile.in.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@118 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-25 18:51:57 +00:00
Joe Taylor
c0fb435c6a 1. New help screen lists available Add-on DXCC prefixes.
2. Initialization of PTT to OFF is fixed.
3. WSJT_Source_Code.tst updated.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@117 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-25 18:44:12 +00:00
Joe Taylor
f81ad6aacf 1. Trapped specjt error about "images do not match".
2. Fixed grid2deg to be case-insensitive for grid locator.
3. Bumped Revision number to 5.9.3.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@116 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-18 17:02:34 +00:00
Joe Taylor
59a8103b8d Changed runqqq so that *nix execution of KVASD uses "./KVASD".
Updated README_592.TXT in preparation for Windows release.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@115 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-16 17:55:05 +00:00
Joe Taylor
8d67e55e7b A few tweaks to make it compile and run in Linux/ALSA, Linux PortAudio,
and Windows.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@114 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-16 16:39:11 +00:00
Diane Bruce
4b889cdf57 - remove conf.h hence remove conf.h.in as well, and modify
all files previously using conf.h
- pass defs found into the Makefile instead
- add parallel port enable to configure --enable-parallel vs. --enable-serial
- use code (partially contributed by yours truly anyway) from cwdaemon to add
  parallel port support for *nix. 

I've not tested parallel port operation, it should match what cwdaemon
does, which is convenient.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@113 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-16 02:07:25 +00:00
Diane Bruce
ef6b6fcefc - This file should no longer be used
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@112 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-16 02:03:57 +00:00
Diane Bruce
e51c55ad98 - change the if logic a bit to match start_oss.c
and use memset().



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@111 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-16 02:02:46 +00:00
Diane Bruce
e7c229aed5 - fixed ptt_unix.c to work with the non blocking ttyd0 for now (on freebsd)
it was causing my grief with tx testing of OSS 
- fixed configure to fill in just start_oss.c for AUDIO



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@110 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-15 23:32:39 +00:00
Diane Bruce
749577b6a1 - Clean up zero of null sound buffer for write and clean up logic
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@109 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-15 22:17:12 +00:00
Diane Bruce
5297378423 - Commented out the wrong line!
- cleaned up compiler warnings (added a few casts)
- transmit appears to work



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@108 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-15 21:43:30 +00:00
Diane Bruce
17c69c2bd8 - Initial cut at OSS support
transmit not tested, I don't even know how to get the portaudio
  version to transmit. ;-)
  Works on receive just fine though.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@107 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-15 20:00:56 +00:00
Joe Taylor
d3b6083b50 Adjusted tx2 to allow for latency.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@106 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-15 00:44:19 +00:00
Joe Taylor
8da1823640 Corrected the zero-data test in spec2d.f.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@105 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 19:44:53 +00:00
Joe Taylor
3b7727ecc3 1. Fixed some problems with all-zero data.
2. Removed the two-buffer offset in fivehz.f90, it did not work right.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@104 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 18:38:15 +00:00
Joe Taylor
4ff0764408 Put parameter(NMAX=2048*1024) statements into four2.f
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@103 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 16:39:39 +00:00
Diane Bruce
0cce7ee1b9 - Add AUDIOSRCS in Makefile.in, which will be filled in with the appropriate
source files needed for the audio system chosen. Note in particular
  a2d.f90 no longer needs to be wrapped with a #ifdef PORTAUDIO since
  it is now only compiled and linked when needed.

  Tested on portaudio here, but untested on alsa. Please test that
  I have not screwed it up on alsa or windows. ;-)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@102 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 16:15:50 +00:00
Diane Bruce
0ce6252dba - No need to wrap this with an #ifdef PORTAUDIO
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@101 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 15:53:01 +00:00
Diane Bruce
36fcb937e3 - change from start_threads.c to start_alsa.c start_portaudio.c etc.
- split start_threads.c into start_alsa.c and start_portaudio.c
- make configure/Makefile add start_alsa or start_portaudio as needed
  instead of start_threads

  Untested on ALSA, works fine with PORTAUDIO



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@100 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 15:47:35 +00:00
Diane Bruce
1f1e1a965f - Adds for documentation purposes the fortran options for debug
i.e. traceback would be very nice.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@99 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 15:15:55 +00:00
Joe Taylor
3ce9963f38 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@98 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 2006-01-14 14:59:30 +00:00
Joe Taylor
bb1c453ed3 1. Corrected simulator so that noise and signal levels are correct in
FSK441 and JT6M, as well as JT65.  (Still no generated pings, however.)
2. Updated README_592.TXT in preparation for open release of version 5.9.2.
Updated READ


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@97 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 01:46:20 +00:00
Joe Taylor
ef47c8ba04 I mistakenly left the simulator producing noise during the Rx sequence. Fixed.
Adjusted Rx start time by one buffer.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@96 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-13 22:29:18 +00:00
Joe Taylor
076a01eba5 Added a simulation mode in which a specified SNR is generated.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@95 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-13 21:00:47 +00:00
Joe Taylor
c36054139a Tweaked Makefile.win to compile properly in Win32 with recent #ifdef changes to audio_init.f90
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@94 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-13 07:11:57 +00:00
Diane Bruce
b483328e63 - will need module array to deal with array tostring conversions
- left in the types import as well for possible debugging.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@93 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-13 06:39:29 +00:00
Diane Bruce
66f86c3d65 - in ftnstr() the argument coming in is not a python string but an
array (from fortran), it should be converted to string before using it as one.

  This fixes the odd zeros() problem.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@92 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-13 06:37:11 +00:00
Diane Bruce
22c1dc6c79 - Ok, mix and match Makefile.in.joe into Makefile.in
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@91 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-13 01:50:01 +00:00
Joe Taylor
60889230ed Added Makefile.in.joe (temporary, for information).
Fixed array bounds for ccfblue in wsjt65.f, sync65.f, xcor.f.
Edited README_592.TXT


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@90 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-12 22:10:21 +00:00
Diane Bruce
c0e156d98c - Ok, added some rules to build .c, .f and .f90 objects
Next step will be to break up the huge f2py 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@89 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-12 05:13:07 +00:00
Joe Taylor
d462134d7e Tweaked ibuf0 in fivehz.f90 to give DT=0 with local SimJT.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@88 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-11 20:17:51 +00:00
Diane Bruce
d7c23a875a - Cleaned up Makefile to use F2PY instead of calling Python
fixed some dependancies to force recompile if a file is changed.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@86 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-11 20:16:13 +00:00
Joe Taylor
44600fef28 Merged changes to wsjt.py, specjt.py from tags/release-5.9.2.
Added README_592.TXT and WSJT592.iss.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@85 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-11 19:04:51 +00:00
Joe Taylor
624bcc3cbd 1. Turned off debugging messages in start_threads.c, audio_init.f90.
2. Tweaked code that measures sampling rates (in fivehz and fivehztx) so
   that it works well with both PortAudio and bare ALSA.
3. Added a "Using PortAudio" message to a2d.f90.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@84 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-11 17:06:25 +00:00
Diane Bruce
afeb1cf2cf - reconcile start_threads.c to agree with Bob's version in branch portaudio
Notice that I have an explicit #ifdef USE_PORTAUDIO for later use.
  The alsa code was swapping around the original iret1 iret2 and thread1
  thread2 also making it confusing. This should 100% agree with what
  Bob had now for USE_PORTAUDIO.

  This code should be re-factored if we are keeping alsa, start_threads.c
  should have no audio code in it. Something like jtaudio_portaudio.c
  jtaudio_alsa.c jtaudio_oss.c would be what I would do, with the
  file to compile chosen at configure time.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@83 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-11 02:57:23 +00:00
Diane Bruce
cfc66c91ef - cleaned up the configure a bit more, it will now pick a default audio method
if none given.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@82 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 21:35:37 +00:00
Joe Taylor
d373a39dfb Fixed thread creation for portaudio in start_threads.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@81 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 21:24:49 +00:00
Joe Taylor
05989ec612 Tweaked fivehztx.f90 to give correct fsample with the alsa callback.
Removed the divide-by-2 of input samples in portaudio callback.
Re-activated #ifdef USE_PORTAUDIO in a2d.f90.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@80 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 20:32:53 +00:00
Diane Bruce
2cf6ea1f89 - Added samplerate.h check
- Try to guess at a default between portaudio and alsa for now
- changed "samplerate.h" to <samplerate.h> in resample.c



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@76 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 16:36:04 +00:00
Diane Bruce
7ce8878e3a - I forgot -lsamplerate
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@75 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 05:00:34 +00:00
Diane Bruce
1a7eba8421 - clean up start_threads.c using bob's start_threads.c as template
- always define -pthread
- make sure right libs are passed along



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@74 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 04:30:03 +00:00
Diane Bruce
f504e95c03 - ok, this should enable Bobs portaudio fixes and ALSA depending on
--enable options. 

This will have to be cleaned up a lot more to minimise #ifdef's
a2d_() is needed for portaudio which is needed by both windows and *nix
but only a small piece of start_threads.c is needed for portaudio
the ALSA part is #ifdef'd out when USE_PORTAUDIO is enabled.
audio_init.f90 and a2d.f90 now have #ifdef's on USE_PORTAUDIO
instead of Win32.

Lots to do still.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@73 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 02:43:23 +00:00
Diane Bruce
f95e01d28f - forgot to add -lportaudio
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@71 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 21:35:25 +00:00
Diane Bruce
8a708402af - check correct HAS_ASOUNDLIB_H flag in start_threads.c
- look for alsa/asoundlib.h and set HAS_ASOUNDLIB_H if present
- also rework Makefile to pass proper flags

This should be it for alsa and portaudio.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@70 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 21:30:35 +00:00
Diane Bruce
1f1abc09d3 - cleaned up a few more stupids on configure system
- cleaned up Makefile to use LDFLAGS and CPPFLAGS
- look for asoundlib.h properly



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@69 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 19:18:03 +00:00
Joe Taylor
2cfd513bd7 Implemented Freeze/Tolerance/MouseDF features for JT6M.
Removed superfluous "#ifdef Win32" in jtaudio.c.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@67 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 15:42:44 +00:00
Joe Taylor
e61b287980 Added dfinc.mak (include file for Makefile.win).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@66 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 15:08:01 +00:00
Joe Taylor
e1ace45403 Changed WIN32 to Win32 in wrapkarn.c and igray.c.
Corresponding change in go.bat.
Added Makefiile.win.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@65 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 15:06:21 +00:00
Diane Bruce
a160f9aca3 - A little more work on configure.ac, to at least get portaudio right
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@64 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 18:19:01 +00:00
Robert W Mc Gwier, Jr
ce7b1a958f adding install-sh
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@63 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 04:35:48 +00:00