Commit Graph

8907 Commits

Author SHA1 Message Date
Diane Bruce
eaed0b81eb - 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
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
110ef8779d - 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
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
01437a297b 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
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
be04b5bffa 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
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
51a2218bdb 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
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
6da7ae935f 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
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
1b0cdca090 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
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
c379e4971e - 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
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
7cb7058b98 - 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
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
d52e1d7b1d - 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
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
59f6797a2c 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
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
d5453c2ba9 - 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
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
4f41cd02c7 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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