REFACTORING : modify Scanner object to actually become a combination of GPS and WifiS...

[wifihood] / wifimap / gps.py

diff --git a/wifimap/gps.py b/wifimap/gps.py
index 70aa2dc..d37105d 100644 (file)
--- a/wifimap/gps.py
+++ b/wifimap/gps.py
@@ -17,7 +17,7 @@ class GPSObject ( gobject.GObject ) :
 
         # Values to be set by GPSDevice changed events
         self.gps_state = False
-        self.gps_info = "NO_FIX 0 0 NaN NaN NaN NaN NaN NaN NaN"
+        self.gps_info = "NO_FIX", 0, 0, None, None, None, None, None, None, None
         self.satellites = None
         self.cell_info = None
         self.ngps = 0
@@ -69,7 +69,7 @@ class GPSObject ( gobject.GObject ) :
             elif self.device.status == location.GPS_DEVICE_STATUS_DGPS_FIX :
                 self.gps_state = "DGPS"
 
-            self.gps_info = "%s %d %d %s %s %s %s %s %s %s" % ( self.gps_state , self.device.satellites_in_use , self.device.satellites_in_view , self.device.fix[2] , self.device.fix[4] , self.device.fix[5] , self.device.fix[7] , self.device.fix[9] , self.device.fix[11] , self.device.fix[13] )
+            self.gps_info = self.gps_state , self.device.satellites_in_use , self.device.satellites_in_view , self.device.fix[2] , self.device.fix[4] , self.device.fix[5] , self.device.fix[7] , self.device.fix[9] , self.device.fix[11] , self.device.fix[13]
             self.satellites = self.device.satellites
             self.cell_info = self.device.cell_info
 
@@ -101,7 +101,6 @@ gobject.type_register(GPSObject)
 if __name__ == "__main__" :
     loop = gobject.MainLoop()
     sample = GPSObject()
-    print dir(sample)
     def on_stop(control, mainloop):
         mainloop.quit()
     sample.control.connect("gpsd-stopped", on_stop, loop)