[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit d32cffd07f1a5a95ef10bfb0677bae9a9f2c9d74
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sat Dec 6 01:17:54 2008 +0100

    ogsmd: [TI CALYPSO] disable +COLP=1 to prevent falling into FSO #211.

diff --git a/docs/ogsmd/ti_calypso/modem b/docs/ogsmd/ti_calypso/modem
index a845b03..1925760 100644
--- a/docs/ogsmd/ti_calypso/modem
+++ b/docs/ogsmd/ti_calypso/modem
@@ -31,6 +31,7 @@
 
 * Cancelling certain commands (ATH for a start) will render a virtual channel unusable. Calypso moves into
   a CMS ERROR 512 state in that case. You will have to restart the modem once this happens.
+  * Sending +COLP=1 seems to have a negative effect on this issue. DO NOT USE +COLP=1.
 
 * Shutting down an ongoing GPRS connection can take ages. Need to better interface with pppd here.
   * We should issue ATH here (first check whether there is no call ongoing though).
diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/channel.py b/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
index cac6e90..7b1724d 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
@@ -54,7 +54,7 @@ class CalypsoModemChannel( AbstractModemChannel ):
         for i in itertools.count():
             logger.debug( "(modem init... try #%d)", i+1 )
             select.select( [], [self.serial.fd], [], 0.5 )
-            self.serial.write( "ATE0\r\n" )
+            self.serial.write( "ATE0Q0V1\r\n" )
             r, w, x = select.select( [self.serial.fd], [], [], 0.5 )
             if r:
                 try:
@@ -175,7 +175,9 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
         c = self._commands["init"]
         # GSM unsolicited
         c.append( '+CLIP=1' ) # calling line identification presentation enable
-        c.append( '+COLP=1' ) # connected line identification presentation enable
+        c.append( '+COLP=0' ) # connected line identification presentation: disable
+        # DO NOT enable +COLP=1 on the Calypso, it will raise the chance to drop into FSO #211
+        #c.append( '+COLP=1' ) # connected line identification presentation: enable
         c.append( '+CCWA=1' ) # call waiting
         c.append( "+CSSN=1,1" ) # supplementary service notifications: send unsol. code
         c.append( '+CTZU=1' ) # timezone update

-- 
FSO frameworkd Debian packaging