Commit Graph

8574 Commits

Author SHA1 Message Date
Diane Bruce
b55d068325 - No, it should be || not &&
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@210 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-26 14:24:27 +00:00
Diane Bruce
6ff6159461 - No, it should be || not &&
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@210 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-26 14:24:27 +00:00
Diane Bruce
3c5f8883e8 - Oops. missed the /* Fallback (nothing) */ case
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@209 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-26 14:12:34 +00:00
Diane Bruce
401b59aa4d - Oops. missed the /* Fallback (nothing) */ case
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@209 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-26 14:12:34 +00:00
Diane Bruce
9350a4197c - misplaced indentation meant fortran copy of pttport never got set
- reworked ptt_unix.c numerous things I did not like anyway.
  removed gotos's (from original cwdaemon; not my fault!)
  commented better what was happening
  refactored code to make it clearer, there was no need to try and do
  both the open and the parallel port test in one function (cwdaemon again)
  this just obsfuscated what was happening.
 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@208 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-26 14:06:27 +00:00
Diane Bruce
7716b6fc31 - misplaced indentation meant fortran copy of pttport never got set
- reworked ptt_unix.c numerous things I did not like anyway.
  removed gotos's (from original cwdaemon; not my fault!)
  commented better what was happening
  refactored code to make it clearer, there was no need to try and do
  both the open and the parallel port test in one function (cwdaemon again)
  this just obsfuscated what was happening.
 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@208 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-26 14:06:27 +00:00
Joe Taylor
a1819b2e5b Another tweak to parameters in Deep Search algorithm.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@207 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-25 13:12:03 +00:00
Joe Taylor
9621999d52 Another tweak to parameters in Deep Search algorithm.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@207 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-25 13:12:03 +00:00
Joe Taylor
33a52a0101 Fix comment line in getpfx1.f
Fix Windows PttPort assignment in wsjt.py


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@206 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-25 01:27:01 +00:00
Joe Taylor
bc90f17349 Fix comment line in getpfx1.f
Fix Windows PttPort assignment in wsjt.py


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@206 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-25 01:27:01 +00:00
Joe Taylor
b9ec5aab67 Tweak deep65 params for modes JT65A, JT65C.
Increase range of optional SNR degradation.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@205 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 20:48:02 +00:00
Joe Taylor
a735577197 Tweak deep65 params for modes JT65A, JT65C.
Increase range of optional SNR degradation.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@205 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 20:48:02 +00:00
Diane Bruce
05f784e1b3 - Make prototype match that of windows, even though unused *isn't* used.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@204 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 19:23:12 +00:00
Diane Bruce
dedbd91143 - Make prototype match that of windows, even though unused *isn't* used.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@204 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 19:23:12 +00:00
Diane Bruce
cda36d9c43 - Give user a chance to fix from wjst, don't just exit.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@203 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 19:20:07 +00:00
Diane Bruce
2f64004924 - Give user a chance to fix from wjst, don't just exit.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@203 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 19:20:07 +00:00
Joe Taylor
00532d3d17 Fixed save/restore of PttPort in WSJT.INI
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@202 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 17:24:47 +00:00
Joe Taylor
d594c24d41 Fixed save/restore of PttPort in WSJT.INI
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@202 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 17:24:47 +00:00
Joe Taylor
5e3165f7e4 Fixed format of WAV files written by savedata.F90 in *nix.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@201 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 17:20:27 +00:00
Joe Taylor
b18438a6eb Fixed format of WAV files written by savedata.F90 in *nix.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@201 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 17:20:27 +00:00
Joe Taylor
d2254f0310 fivehz.F90: Added function gran()
wsjt1.F:    Option to intentionally degrade SNR for test purposes
deep65.F:   Tweaked parameters for computing qual


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@200 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 14:30:15 +00:00
Joe Taylor
c8afc2da11 fivehz.F90: Added function gran()
wsjt1.F:    Option to intentionally degrade SNR for test purposes
deep65.F:   Tweaked parameters for computing qual


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@200 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-24 14:30:15 +00:00
Joe Taylor
229fbd60fc Improved calculation of reference level in deep65.F.
Incremented version to 5.9.5.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-21 20:09:23 +00:00
Joe Taylor
e7e7077bfa Improved calculation of reference level in deep65.F.
Incremented version to 5.9.5.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-21 20:09:23 +00:00
Diane Bruce
3c5ab99c26 - This should also be in native eol
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@198 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-09 16:00:22 +00:00
Diane Bruce
8fe7e2d020 - Make eol native
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@197 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-09 15:58:04 +00:00
Diane Bruce
cb77c96b21 - remove CRLF
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@196 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-09 15:54:37 +00:00
Diane Bruce
1d7a6a6c7a - remove CRLF
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@196 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-09 15:54:37 +00:00
Diane Bruce
ee414f517f - Fixed compile for linux
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@195 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-09 03:12:26 +00:00
Diane Bruce
91cae5bd11 - Fixed compile for linux
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@195 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-09 03:12:26 +00:00
Diane Bruce
af5a77bb1b - All other 'c' functions include both <time.h> and <sys/time.h>
might as well be consistent.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@194 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 21:23:58 +00:00
Diane Bruce
471d593dd7 - All other 'c' functions include both <time.h> and <sys/time.h>
might as well be consistent.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@194 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 21:23:58 +00:00
Diane Bruce
65f855a21e - simple cleanup of style, no code changes
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@193 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 20:54:51 +00:00
Diane Bruce
65ab0e52ea - simple cleanup of style, no code changes
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@193 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 20:54:51 +00:00
Diane Bruce
6a55a028db - Missing line broke start_oss.c on transmit
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@192 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 20:52:38 +00:00
Diane Bruce
f67ddfba36 - Missing line broke start_oss.c on transmit
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@192 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 20:52:38 +00:00
Diane Bruce
ce8b1874fd - fixed typo that prevented WSJT from going into transmit
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@191 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 13:54:56 +00:00
Diane Bruce
f788c5cfa7 - fixed typo that prevented WSJT from going into transmit
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@191 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 13:54:56 +00:00
Diane Bruce
eac317e80d - Cleaned up portaudio-v19 compile/clean a bit
- Fixed more missing merges, start_threads needs to pass PttPort, devin_name
  devout_name
- start_oss.c needs to use devin_name, devout_name



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@190 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 13:44:34 +00:00
Diane Bruce
99cd80593e - Cleaned up portaudio-v19 compile/clean a bit
- Fixed more missing merges, start_threads needs to pass PttPort, devin_name
  devout_name
- start_oss.c needs to use devin_name, devout_name



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@190 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 13:44:34 +00:00
Diane Bruce
5b9645bf09 - Import of portaudio v19
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@189 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 03:57:24 +00:00
Diane Bruce
8d353a5b3b - Import of portaudio v19
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@189 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 03:57:24 +00:00
Diane Bruce
42349ec587 - move portaudio to portaudio-v19, note portaudio-v19 itself still
has to be imported.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@187 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 15:32:17 +00:00
Diane Bruce
019ece987d - move portaudio to portaudio-v19, note portaudio-v19 itself still
has to be imported.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@187 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 15:32:17 +00:00
Diane Bruce
70d2c2b1a8 - Manual editing in diffs I missed a few
- This should be all the final merges from the freebsd branch



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@186 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 14:28:20 +00:00
Diane Bruce
c0a27fd3c2 - Manual editing in diffs I missed a few
- This should be all the final merges from the freebsd branch



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@186 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 14:28:20 +00:00
Diane Bruce
ad643f3353 - This imports the freebsd branch modifications
- This gets rid of the need to configure for parallel or serial port
- The code picks up the device name from WSJT.INI for ComPort (misnamed now)
  which is actually a device name for either a serial port or parallel port.
  ptt_unix.c then uses the appropriate code to "talk" to a parallel or serial
  port.
- audio in/audio out should work the same way on windows as it did before,
  however it is actually now a string name value, which can be used to open
  the appropriate /dev/dsp on OSS or in future, be passed to the ALSA init
  routines or other audio routines as needed. 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@185 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 03:49:02 +00:00
Diane Bruce
a0a3b799dc - This imports the freebsd branch modifications
- This gets rid of the need to configure for parallel or serial port
- The code picks up the device name from WSJT.INI for ComPort (misnamed now)
  which is actually a device name for either a serial port or parallel port.
  ptt_unix.c then uses the appropriate code to "talk" to a parallel or serial
  port.
- audio in/audio out should work the same way on windows as it did before,
  however it is actually now a string name value, which can be used to open
  the appropriate /dev/dsp on OSS or in future, be passed to the ALSA init
  routines or other audio routines as needed. 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@185 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 03:49:02 +00:00
Diane Bruce
a68074eb7d - Add in code to look for portaudio v19 beta as a subdir, if found
compile it if necessary and use the libs from it instead of the system
  library. v19 has a different ABI than portaudio normally installed
  on unix systems. 
  I have come across at least one other program that includes a copy
  of portaudio v19 with it's release package due to this problem.
 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@184 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 03:03:11 +00:00
Diane Bruce
680a9194c9 - Add in code to look for portaudio v19 beta as a subdir, if found
compile it if necessary and use the libs from it instead of the system
  library. v19 has a different ABI than portaudio normally installed
  on unix systems. 
  I have come across at least one other program that includes a copy
  of portaudio v19 with it's release package due to this problem.
 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@184 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 03:03:11 +00:00