Changeset 635

Timestamp:

01/27/10 12:23:57 (2 years ago)

Author:

mosttw

Message:

Some GPS GUI improkvements and an updated config file

Location:

trunk/software

Files:

• ctrl (modified) (2 diffs)
• rb/gui/sensors.py (modified) (2 diffs)
• rbconfig.py (modified) (1 diff)

trunk/software/ctrl

@@ -1 +1 @@
 #!/usr/bin/python
 
+import os
 import sys
 import optparse
@@ -52 +53 @@
 logging.basicConfig(level=logging.DEBUG)
 
+# Some basic sanity checks
+if options.gps == rbconfig.REAL and os.system('pgrep gps'):
+        print >>sys.stderr, "gpsd is not running; needed for GPS"
+        sys.exit(1)
+if options.gui == rbconfig.REAL and not os.environ.get('DISPLAY', False):
+        print >>sys.stderr, "Need X server to run the GUI"
+        sys.exit(1)
+
 Controller(options)

trunk/software/rb/gui/sensors.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+
 # Copyright (C) 2009 Thomas W. Most
 #
@@ -86 +88 @@
                 @gobject.idle_add
                 def update_gui():
-                        self.gps_lat_long.set_text(   '{0.latitude:+.6f} {0.longitude:+.6f}'.format(gpscoord))
-                        self.gps_horiz_error.set_text('{0:+.6f}'.format(gpscoord.horiz_error))
+                        self.gps_lat_lon.set_text(    '{0.latitude:+.6f} {0.longitude:+.6f}'.format(gpscoord))
+                        self.gps_horiz_error.set_text('±{0:.6f}'.format(gpscoord.horiz_error))
                         self.gps_speed.set_text(      '{0:+.6f}'.format(gpscoord.speed))
-                        self.gps_speed_error.set_text('{0:+.6f}'.format(gpscoord.speed_error))
+                        self.gps_speed_error.set_text('±{0:.6f}'.format(gpscoord.speed_error))
 
 

trunk/software/rbconfig.py

@@ -16 +16 @@
 
 # Hardware configurations
-microstrain       = FAKE
+microstrain       = REAL
 microstrain_port  = '/dev/ttyS1'
 
-gps               = NONE
-gps_port          = '/dev/ttyUSB2'
+gps               = REAL
 
-drive             = FAKE
+drive             = REAL
 drive_left_port   = '/dev/ttyS0'
-drive_right_port  = '/dev/ttyS2'
+drive_right_port  = '/dev/ttyUSB0'
 
-camera            = REAL
+camera            = NONE
 #camera_gst_input  = 'v4l2src'
 camera_gst_input  = 'filesrc location="/home/tomwm/Videos/Still_Alive_Typography.flv" ! decodebin'