[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Denis 'GNUtoo' Carikli]

The following commit has been merged in the debian branch:
commit 746a04b5bfe502b3141aedc7bf69a04e37b5cb88
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Sat Sep 11 12:13:03 2010 +0200

    ogpsd: add initial support for htcdream's gps
    
    Htcdream's gps support is higly incomplete:
    *First NMEADevice has some parsing problem:
    2010.09.11 12:13:35.500 ogpsd                ERROR    Line: ['GPVTG,nan,T,,M,0.0,N,0.0,K,A', '4']
    *the user has to launch "gps" from the android-rpc recipe.
    That will be fixed in a future commit.
    
    Despite of the parsing problem,it seem to work, display the location etc...
    But it makes the logs grow
    
    In order to activate the htcdream's gps support, frameworkd.conf should
    have the following lines,after the ogsmd section:
     [ogpsd]
     device = GTA02Device
     channel = SerialChannel
     path = /dev/ttySAC1

diff --git a/framework/subsystems/ogpsd/factory.py b/framework/subsystems/ogpsd/factory.py
index be35550..fad64dd 100644
--- a/framework/subsystems/ogpsd/factory.py
+++ b/framework/subsystems/ogpsd/factory.py
@@ -20,6 +20,7 @@ from nmea import NMEADevice
 from ubx import UBXDevice
 from om import GTA02Device
 from eten import EtenDevice
+from msm import MSMDevice
 from gpschannel import *
 
 NEEDS_BUSNAMES = [ "org.freedesktop.Gypsy" ]
diff --git a/framework/subsystems/ogpsd/eten.py b/framework/subsystems/ogpsd/msm.py
similarity index 65%
copy from framework/subsystems/ogpsd/eten.py
copy to framework/subsystems/ogpsd/msm.py
index 7c59569..896af7c 100644
--- a/framework/subsystems/ogpsd/eten.py
+++ b/framework/subsystems/ogpsd/msm.py
@@ -3,6 +3,7 @@
 """
 Open GPS Daemon
 
+(C) 2010 Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
 (C) 2008 Jan 'Shoragan' Lübbe <jluebbe at lasnet.de>
 (C) 2008 Daniel Willmann <daniel at totalueberwachung.de>
 (C) 2008 Stefan Schmidt <stefan at datenfreihafen.org>
@@ -10,8 +11,6 @@ Open GPS Daemon
 GPLv2 or later
 """
 
-DEVICE_POWER_PATH = "/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
-
 from nmea import NMEADevice
 
 import helpers
@@ -19,18 +18,17 @@ import helpers
 import logging
 logger = logging.getLogger('ogpsd')
 
-class EtenDevice( NMEADevice ):
-    """E-Ten specific GPS device"""
+class MSMDevice( NMEADevice ):
+    """MSM SOC specific GPS device"""
 
     def __init__( self, bus, channel ):
 
-        # Make sure the GPS is off
-        helpers.writeToFile( DEVICE_POWER_PATH, "0" )
+        #TODO: stop "gps" from android-rpc if already launched
 
         NMEADevice.__init__( self, bus, channel )
 
     def initializeDevice( self ):
-        helpers.writeToFile( DEVICE_POWER_PATH, "1" )
+        #TODO: launch "gps" from android-rpc
 
         NMEADevice.initializeDevice( self )
 
@@ -38,6 +36,6 @@ class EtenDevice( NMEADevice ):
 
         NMEADevice.shutdownDevice( self )
 
-        helpers.writeToFile( DEVICE_POWER_PATH, "0" )
+        #TODO: stop "gps" from android-rpc
 
 #vim: expandtab

-- 
FSO frameworkd Debian packaging