[svn-commits] jdixon: branch jdixon/chan_usbradio-1.4 r116706 - /team/jdixon/chan_usbradio-...

[SVN commits to the Digium repositories]

Author: jdixon
Date: Thu May 15 17:59:17 2008
New Revision: 116706

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116706
Log:
Update to latest

Modified:
    team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.c
    team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.h

Modified: team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.c?view=diff&rev=116706&r1=116705&r2=116706
==============================================================================
--- team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.c (original)
+++ team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.c Thu May 15 17:59:17 2008
@@ -1674,6 +1674,7 @@
 		pChan->rxCdType=tChan->rxCdType;
 		pChan->rxSquelchPoint = tChan->rxSquelchPoint;
 		pChan->rxCarrierHyst = 3000;
+		pChan->rxSqVoxAdj=tChan->rxSqVoxAdj;
 
 		pChan->txMod=tChan->txMod;
 		pChan->txHpfEnable=1;
@@ -2160,7 +2161,10 @@
 		pSps->outputGain=1*M_Q8;
 		pSps->nSamples=pChan->nSamplesRx;
 		pSps->discfactor=3;
-		pSps->setpt=(0.01*M_Q15);
+		if(pChan->rxSqVoxAdj==0)
+			pSps->setpt=(0.011*M_Q15);
+		else
+			pSps->setpt=(pChan->rxSqVoxAdj);
 		pSps->hyst=(pSps->setpt/10);
 		pSps->enabled=1;
 	}

Modified: team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.h
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.h?view=diff&rev=116706&r1=116705&r2=116706
==============================================================================
--- team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.h (original)
+++ team/jdixon/chan_usbradio-1.4/channels/xpmr/xpmr.h Thu May 15 17:59:17 2008
@@ -602,6 +602,7 @@
 	i16 rxQuality;			// signal quality metric
 	i16 rxCarrierDetect;    // carrier detect
 	i16 rxCdType;
+	i16 rxSqVoxAdj;
 	i16 rxExtCarrierDetect; 
 	i32 inputBlanking;  	// Tx pulse eliminator