From 51a2218bdb5ab1eaabbaf49c9cc9d27206fd260a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 13 Jan 2006 22:29:18 +0000 Subject: [PATCH] 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 --- fivehz.f90 | 2 +- jtaudio.c | 7 ++----- wsjt.py | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/fivehz.f90 b/fivehz.f90 index df9950f62..5cda28acc 100644 --- a/fivehz.f90 +++ b/fivehz.f90 @@ -91,7 +91,7 @@ subroutine fivehz if(ntr.ne.ntr0) then ibuf0=ibuf !Start of new sequence, save ibuf - ibuf0=ibuf0-3 !Tweak the Rx start time + ibuf0=ibuf0-2 !Tweak the Rx start time if(ibuf0.lt.1) ibuf0=ibuf0+1024 ! if(mode(1:4).ne.'JT65') then ! ibuf0=ibuf0+3 !So we don't copy our own Tx diff --git a/jtaudio.c b/jtaudio.c index 1d17b4036..ac489396e 100644 --- a/jtaudio.c +++ b/jtaudio.c @@ -137,7 +137,6 @@ static int SoundOut( void *inputBuffer, void *outputBuffer, short *in = (short*)inputBuffer; short *wptr = (short*)outputBuffer; unsigned int i,n; - static short n2; static int n0; static int ia=0; static int ib=0; @@ -179,10 +178,8 @@ static int SoundOut( void *inputBuffer, void *outputBuffer, } } else { - n2=0; - addnoise_(&n2); - *wptr++ = n2; //left - *wptr++ = n2; //right + *wptr++ = 0; //left + *wptr++ = 0; //right } } fivehztx_(); //Call fortran routine diff --git a/wsjt.py b/wsjt.py index 8eed72d75..0b2f5c9bb 100644 --- a/wsjt.py +++ b/wsjt.py @@ -1,4 +1,4 @@ -#------------------------------------------------------------ WSJT +#------------------------------------------------------------- WSJT from Tkinter import * from tkFileDialog import * import Pmw