Commit Graph

6930 Commits

Author SHA1 Message Date
Diane Bruce
0fcec320a0 - 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
8b4755d8b7 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
930a5ab2b1 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
6189d47595 - 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
0df428a28b - 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
acafe66c65 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
03750fab97 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
861c4dc71b - 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
85fddafcaf - 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
7dfd1025a3 - 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
2858f3b9c9 - 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
bb05bf7662 - 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
58fe7642c8 - 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
7987c826ef - 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
4377834835 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
5bc2a3acc3 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
8550aa14be 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
74525df65d - 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
f253c50082 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
Diane Bruce
c236b4c52c - Cleaned up further using Joe's Windows makefile as a basis
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@62 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 03:54:50 +00:00
Diane Bruce
857a6a10cb - A few more cleanups to configure
Note for *now* you will have to expressly state ./configure --enable-alsa
  or --enable-oss etc. I'll fix it later to pick a default.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@61 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 01:40:30 +00:00
Diane Bruce
e1c6930cda - oops sorry about that.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@60 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 22:40:26 +00:00
Diane Bruce
e59ac5dd3c - more cleanups to configure
- ptt_linux.c is no longer needed (replaced with generic ptt_unix.c)
- Makefile should be created from configure (and Makefile.in)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@59 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 21:24:49 +00:00
Diane Bruce
b6b89b6cd7 - Add first rough cut of configure
Note that Makefile should go since it should be rebuilt from Makefile.in
  by configure.
- start_threads now has HAVE_ALSA_ALSASOUND_H
- ptt_unix now uses configure HAVE_SYS_PARAM_H

Initial *non production* commit
I am a little rusty with it, sorry. --db



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@58 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 20:14:23 +00:00
Diane Bruce
caf61a6624 - first cut at a general Makefile for WSJT, it is *not* production quality
Still a lot of re-factoring to do with the .o etc. 

  (Reviewed and tested by Joe)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@57 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 16:51:20 +00:00
Diane Bruce
558bcc2e6a - initial cut at a portable ptt module for all unix and unix like systems
It will be refined later on for OSX/Solaris etc.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@56 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 16:48:20 +00:00
Joe Taylor
ff8579192c Clear PTT in ftn_init.
F10 to show SpecJT screen.
Alt-F to toggle Freeze.
Erase when changing modes.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@55 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 22:03:35 +00:00
Joe Taylor
1d27cad645 Fixed readout of average messages: needed flush(12) in wsjt65.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@54 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 21:04:14 +00:00
Joe Taylor
bddc69ca1a Removed redundancy in fsubs.f.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@53 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 21:02:19 +00:00
Joe Taylor
666ad46195 Added wsjtrc.win, configuration file for Windows.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@52 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 16:53:57 +00:00
Joe Taylor
866b116d1d Will I ever be happy with the fonts?
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@51 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 16:45:05 +00:00
Joe Taylor
591f0853c3 More tweaking of fonts; fix NMAX in indexx.f; increase latency in jtaudio.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@50 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 16:06:57 +00:00
Joe Taylor
ac511866dc Corrected logic in ptt_linux.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@49 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 20:38:27 +00:00
Joe Taylor
1ed2fa8262 Fleshed out ptt_linux.c to control DTR/RTS lines on serial port.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@48 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 19:39:21 +00:00
Joe Taylor
5f5e711917 Fixed several problems in playback_callback (start_threads.c).
Reverted to display of full Tx message in status bar (wsjt.py).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@47 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 15:33:56 +00:00
J C Dutton
a5f1469127 Summary: Implements audio playback (TX) for ALSA.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@46 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 00:08:26 +00:00
Joe Taylor
4d4be80421 Passed ndsec to capture callback, as required.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@45 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-04 21:02:30 +00:00
Joe Taylor
28c62de695 Fixed definition of stime and Tsec in start_threads.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@44 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-04 20:10:08 +00:00
Joe Taylor
45caec5d23 Workaround code for James's problem with the Python rfind method; better
error message in ssort.f.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@43 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-03 16:33:16 +00:00
J C Dutton
6074556d20 Summary: Fix wrap around capture buffer.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@42 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-02 02:06:19 +00:00
J C Dutton
43cb15d438 Summary: Add in timing code. The captured audio is now decoded.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@41 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-02 01:34:45 +00:00
J C Dutton
db838694d8 Summary: Add first attempt at sound capture.
Currently display the trace in specjt, but does not seem to decode it.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@40 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-02 00:41:10 +00:00
Joe Taylor
c23a58f2c8 Fixed sort of zero-length array in wsjt1.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@39 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-30 01:40:23 +00:00
Joe Taylor
5b38cdeccd Tweaked spacings on Astrodata window.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@38 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 21:29:42 +00:00
Joe Taylor
3f3eccf1a4 Fixed igray.c to compile on Windows; changed go.bat accordingly.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@37 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 21:07:24 +00:00
Joe Taylor
25c039f672 Added sort.f, ssort.f
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@36 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 20:32:28 +00:00
Joe Taylor
860e9d8c1a Added indexx.f
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@35 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 20:31:33 +00:00
Joe Taylor
7b55b784a1 Removed ran1 and gasdev; replaced igray, sort, and indexx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@34 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 20:12:45 +00:00
Joe Taylor
6b851ce524 Delete JT65code; remove extra 160 ms ping from mtdecode; fix "go" script
for Linux.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@33 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 15:02:29 +00:00
Joe Taylor
4326072d52 Fixed spacing of labels above text box, FSK441 and JT6M modes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@32 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 14:42:02 +00:00