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

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 7d53a210fa255a21dfe0b10b9d7c7f3bf902cb3c
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Tue Jan 27 20:39:43 2009 +0100

    ogsmd: [TI CALYPSO] don't convert RXLEV to percentages (closes: #323)

diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py b/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py
index bf285ca..5871b31 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py
@@ -10,7 +10,7 @@ Package: ogsmd.modems.ti_calypso
 Module: mediator
 """
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 
 from ogsmd.modems.abstract.mediator import *
 
@@ -77,8 +77,7 @@ class MonitorGetServingCellInformation( MonitorMediator ):
     params = "arfcn c1 c2 rxlev bsic cid dsc txlev tn rlt tav rxlev_f rxlev_s rxqual_f rxqual_s lac cba cbq ctype vocoder".split()
     params.reverse()
 
-    stringparams = "cid lac"
-    strengthparams = "c1 c2 rxlev rxlev_f rxlev_s".split()
+    stringparams = "cid lac".split()
 
     def trigger( self ):
         self._commchannel.enqueue( "%EM=2,1", self.responseFromChannel, self.errorFromChannel )
@@ -94,8 +93,6 @@ class MonitorGetServingCellInformation( MonitorMediator ):
                 param = params.pop()
                 if param in self.stringparams:
                     result[param] = "%04X" % int( value )
-                elif param in self.strengthparams:
-                    result[param] = const.signalQualityToPercentage( int(value)/2+2 )
                 else:
                     result[param] = int( value )
             self._ok( result )
@@ -127,7 +124,6 @@ class MonitorGetNeighbourCellInformation( MonitorMediator ):
     params.reverse()
 
     stringparams = "cid lac".split()
-    levelparams = "c1 c2 rxlev rxlevam".split()
 
     def trigger( self ):
         self._commchannel.enqueue( "%EM=2,3", self.responseFromChannel, self.errorFromChannel )
@@ -148,8 +144,6 @@ class MonitorGetNeighbourCellInformation( MonitorMediator ):
                         if index < count:
                             if param in self.stringparams:
                                 result[index][param] = "%04X" % int( value )
-                            elif param in self.levelparams:
-                                result[index][param] = const.signalQualityToPercentage( int(value)/2+2 )
                             else:
                                 result[index][param] = int( value )
             self._ok( result )

-- 
FSO frameworkd Debian packaging