Changeset 12

Timestamp:

Jan 10, 2008, 6:36:38 PM (13 years ago)

Author:

lucas

Message:

gps_reader.py: code cleanup

File:

• openmoko/gps/gps_reader.py (modified) (6 diffs)

openmoko/gps/gps_reader.py

@@ -43 +43 @@
          above_sea_unit, geoidal_separation,
          geoidal_separation_unit, data_age,
-         diff_ref_stationID) = self.l
+         diff_ref_stationID) = self.splitted_line
 
         # build the timestamp in a human-readable form
@@ -73 +73 @@
         latitude = latitude_degrees + (latitude_minutes/60)
         longitude = longitude_degrees + (longitude_minutes/60)
-        
-        # str(latitude_degrees) + "" + " " + northsouth
+
+        # human-friendly coordinates
         return "%d° %d' %.3f\" %s\n%d° %d' %.3f\" %s" % \
                (latitude_degrees,latitude_minutes,latitude_seconds,northsouth,
@@ -80 +80 @@
     # end parse_coord
 
-    def read_stuff(self,source, condition):
+    def read_line(self,source, condition):
         line = self.file.readline()
-        self.l = line.split(",")
+        self.splitted_line = line.split(",")
 
         # did we get a GPGGGA line ?
-        if self.l[0] == "$GPGGA":
+        if self.splitted_line[0] == "$GPGGA":
             self.parse_gga()
             if trace:
                 self.trace_file.write(line)
         
-        # return false to deactivate callback, true to let it run
+        # return False to deactivate callback, True to let it run
         return True
-    # end read_stuff
+    # end read_line
 
     def spawn_gps(self, widget, data=None):
@@ -98 +98 @@
         self.pid = os.spawnl(os.P_NOWAIT,gllin_path)
         self.lbl_status.set_text("Starting...")
+        # wait 4 seconds to let gllin boot properly, and then start parsing data
         source_id = gobject.timeout_add(4000, self.init_gps_reader,self)
     # end spawn_gps
@@ -126 +127 @@
             else: # there is a process accessing that file, it's likely to be gllin, so open it
                 self.file = open(nmea_file,'r')
-                self.gps_source = gobject.io_add_watch(self.file, gobject.IO_IN, self.read_stuff)
+                self.gps_source = gobject.io_add_watch(self.file, gobject.IO_IN, self.read_line)
                 self.gps_is_on()
         else: # no nmea_file
             self.gps_is_off()
 
-        # disable future runs of callbacks
+        # disable future runs, it's only necessary to run it once
         return False
     # end init_gps_reader
@@ -224 +225 @@
 # interpreter then create a GpsRead instance and show it
 if __name__ == "__main__":
-    hello = GpsRead()
-    hello.main()
+    reader = GpsRead()
+    reader.main()