[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 2bec920ce0d2eae2759f0cdd6e395c22684825a2
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sat Jan 17 15:12:14 2009 +0100

    ogpsd: fix disabling the device when it was never enabled before.
    Daniel, please review this!

diff --git a/framework/subsystems/ogpsd/gpschannel.py b/framework/subsystems/ogpsd/gpschannel.py
index 5beddcd..056bf0f 100644
--- a/framework/subsystems/ogpsd/gpschannel.py
+++ b/framework/subsystems/ogpsd/gpschannel.py
@@ -204,6 +204,9 @@ class SerialChannel( GPSChannel ):
         return False
 
     def send( self, stream ):
+        if not self.serial.isOpen():
+            logger.warning( "Attempted to send something while serial is not open." )
+            return
         self.datapending = self.datapending + stream
         if not self.watchReadyToSend:
             self.watchReadyToSend = gobject.io_add_watch( self.serial.fd, gobject.IO_OUT, self.readyToSend )
diff --git a/framework/subsystems/ogpsd/om.py b/framework/subsystems/ogpsd/om.py
index 1d2f56b..23e1acb 100644
--- a/framework/subsystems/ogpsd/om.py
+++ b/framework/subsystems/ogpsd/om.py
@@ -9,7 +9,7 @@ Open GPS Daemon
 GPLv2 or later
 """
 
-__version__ = "0.9.9.1"
+__version__ = "0.9.9.2"
 MODULE_NAME = "ogpsd"
 
 DEVICE_POWER_PATH = "/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
@@ -39,6 +39,8 @@ class GTA02Device( UBXDevice ):
         if self.aidingData is None:
             self.aidingData = { "almanac": {}, "ephemeris": {}, "position": {}, "hui": {} }
 
+        self.huiTimeout = None
+
         super( GTA02Device, self ).__init__( bus, channel )
 
     def initializeDevice( self ):
@@ -62,13 +64,13 @@ class GTA02Device( UBXDevice ):
         #self.send("CFG-MSG", 3, {"Class" : CLIDPAIR["AID-EPH"][0] , "MsgID" : CLIDPAIR["AID-EPH"][1] , "Rate": 1 })
         self.huiTimeout = gobject.timeout_add_seconds( 300, self.requestHuiTimer )
 
-    def shutdownDevice(self):
+    def shutdownDevice( self ):
         # Disable NAV-POSECEF, AID-REQ (AID-DATA), AID-ALM, AID-EPH messages
         self.send("CFG-MSG", 3, {"Class" : CLIDPAIR["NAV-POSECEF"][0] , "MsgID" : CLIDPAIR["NAV-POSECEF"][1] , "Rate" : 0 })
         self.send("CFG-MSG", 3, {"Class" : CLIDPAIR["AID-REQ"][0] , "MsgID" : CLIDPAIR["AID-REQ"][1] , "Rate" : 0 })
         self.send("CFG-MSG", 3, {"Class" : CLIDPAIR["AID-ALM"][0] , "MsgID" : CLIDPAIR["AID-ALM"][1] , "Rate" : 0 })
         #self.send("CFG-MSG", 3, {"Class" : CLIDPAIR["AID-EPH"][0] , "MsgID" : CLIDPAIR["AID-EPH"][1] , "Rate" : 0 })
-        if self.huiTimeout:
+        if self.huiTimeout is not None:
             gobject.source_remove( self.huiTimeout )
             self.huiTimeout = None
 

-- 
FSO frameworkd Debian packaging