summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-05-09 09:10:45 -0500
committerJohn Klug <john.klug@multitech.com>2017-06-19 19:14:23 -0500
commitfdbdadf4859d84ea2d3baf45e10371ecdfca6eca (patch)
tree98574c8fbd9bc86b9a8685e5fee84b63d0039544
parent2694d15ac9166791ffb3cff9faf6711a19047fb0 (diff)
downloadmeta-mlinux-fdbdadf4859d84ea2d3baf45e10371ecdfca6eca.tar.gz
meta-mlinux-fdbdadf4859d84ea2d3baf45e10371ecdfca6eca.tar.bz2
meta-mlinux-fdbdadf4859d84ea2d3baf45e10371ecdfca6eca.zip
Allow a maximum of 20 seconds to set the baud rate. Normally this takes ten seconds.
-rwxr-xr-xrecipes-navigation/gpsd/gpsd/gpsd15
1 files changed, 9 insertions, 6 deletions
diff --git a/recipes-navigation/gpsd/gpsd/gpsd b/recipes-navigation/gpsd/gpsd/gpsd
index fcee788..d544ff5 100755
--- a/recipes-navigation/gpsd/gpsd/gpsd
+++ b/recipes-navigation/gpsd/gpsd/gpsd
@@ -63,12 +63,15 @@ do_start()
# 1 if daemon was already running
# 2 if daemon could not be started
# Set the baud rate. Works better with ntp at a higher baud rate.
- gpsctl -t 'u-blox' -s $GPS_BAUD -b -f $GPS_LINE
- # The next line is needed due to a bug in gpsctl.
- # We will go back to the default baud rate if we don't do this step.
- echo Expect a timeout error here. Need this error.
- gpsctl -T 2 -f $GPS_LINE
- stty -F $GPS_LINE $GPS_BAUD
+ if ! gpsctl -T 20 -t 'u-blox' -s $GPS_BAUD -b -f $GPS_LINE ; then
+ echo 'WARNING: Unable to set GPS serial port speed.'
+ else
+ # The next line is needed due to a bug in gpsctl.
+ # We will go back to the default baud rate if we don't do this step.
+ echo Expect a timeout error here. Need this error.
+ gpsctl -T 2 -f $GPS_LINE
+ stty -F $GPS_LINE $GPS_BAUD
+ fi
/usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
$GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \
|| return 2