[zaptel-commits] mattf: branch 1.4 r3639 - in /branches/1.4: ./ wctdm24xxp/ wcte12xp/

[SVN commits to the Zaptel project]

Author: mattf
Date: Wed Jan  9 16:49:24 2008
New Revision: 3639

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3639
Log:
Merged revisions 3638 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3638 | mattf | 2008-01-09 16:46:47 -0600 (Wed, 09 Jan 2008) | 1 line

Make sure G.165 EC disable tone detection is enabled
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wctdm24xxp/base.c
    branches/1.4/wcte12xp/vpmadt032.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=3639&r1=3638&r2=3639
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Wed Jan  9 16:49:24 2008
@@ -3517,7 +3517,7 @@
 		chanconfig.EcanParametersA.EcanTapLength = 1024;
 		chanconfig.EcanParametersA.EcanNlpType = 1;
 		chanconfig.EcanParametersA.EcanAdaptEnable = 1;
-		chanconfig.EcanParametersA.EcanG165DetEnable = 0;
+		chanconfig.EcanParametersA.EcanG165DetEnable = 1;
 		chanconfig.EcanParametersA.EcanDblTalkThresh = 6;
 		chanconfig.EcanParametersA.EcanNlpThreshold = 24;
 		chanconfig.EcanParametersA.EcanNlpConv = 0;
@@ -3532,7 +3532,7 @@
 		chanconfig.EcanParametersB.EcanTapLength = 1024;
 		chanconfig.EcanParametersB.EcanNlpType = 1;
 		chanconfig.EcanParametersB.EcanAdaptEnable = 1;
-		chanconfig.EcanParametersB.EcanG165DetEnable = 0;
+		chanconfig.EcanParametersB.EcanG165DetEnable = 1;
 		chanconfig.EcanParametersB.EcanDblTalkThresh = 6;
 		chanconfig.EcanParametersB.EcanNlpThreshold = 24;
 		chanconfig.EcanParametersB.EcanNlpConv = 0;

Modified: branches/1.4/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/vpmadt032.c?view=diff&rev=3639&r1=3638&r2=3639
==============================================================================
--- branches/1.4/wcte12xp/vpmadt032.c (original)
+++ branches/1.4/wcte12xp/vpmadt032.c Wed Jan  9 16:49:24 2008
@@ -1311,7 +1311,7 @@
 		chanconfig.EcanParametersA.EcanTapLength = 1024;
 		chanconfig.EcanParametersA.EcanNlpType = 1;
 		chanconfig.EcanParametersA.EcanAdaptEnable = 1;
-		chanconfig.EcanParametersA.EcanG165DetEnable = 0;
+		chanconfig.EcanParametersA.EcanG165DetEnable = 1;
 		chanconfig.EcanParametersA.EcanDblTalkThresh = 6;
 		chanconfig.EcanParametersA.EcanNlpThreshold = 24;
 		chanconfig.EcanParametersA.EcanNlpConv = 0;
@@ -1326,7 +1326,7 @@
 		chanconfig.EcanParametersB.EcanTapLength = 1024;
 		chanconfig.EcanParametersB.EcanNlpType = 1;
 		chanconfig.EcanParametersB.EcanAdaptEnable = 1;
-		chanconfig.EcanParametersB.EcanG165DetEnable = 0;
+		chanconfig.EcanParametersB.EcanG165DetEnable = 1;
 		chanconfig.EcanParametersB.EcanDblTalkThresh = 6;
 		chanconfig.EcanParametersB.EcanNlpThreshold = 24;
 		chanconfig.EcanParametersB.EcanNlpConv = 0;