diff options
author | <philippe colliot> | 2015-09-01 16:59:12 +0200 |
---|---|---|
committer | <philippe colliot> | 2015-09-01 16:59:12 +0200 |
commit | c7e488e57fa34547f515c23fae3f23f25a630593 (patch) | |
tree | d130f153393c3fc046df46bb605b8df93d1101c2 | |
parent | bac2007ca336cb9d49f19d0a12ff8932afb8e583 (diff) | |
download | navigation-c7e488e57fa34547f515c23fae3f23f25a630593.tar.gz |
Align with last version of navigation, fix the run scriptGDP-ready
-rw-r--r-- | src/README | 4 | ||||
-rwxr-xr-x | src/run | 17 |
2 files changed, 16 insertions, 5 deletions
@@ -29,11 +29,11 @@ Ubuntu 14.04 LTS Current versions of additional code =============================== Navigation middleware: -<current version of navigation> (git): 1da40e28957f2dbda99a1586cdbe83140f283a59 +<current version of navigation> (git): aa65e80c3bd4f69fe0344db7beec9c2af64be9e7 Additional code coming with navigation: <current version of positioning> (git): 8bcb5aee2172bf1672b4402a2dbae480d5fbdc25 -<current version of navit> (svn): 6084 +<current version of navit> (svn): 6135 Automotive message broker: <current version of amb> (git): c216955d16ca275159891cad296217094d972390 @@ -201,7 +201,7 @@ do ;; \?) echo "Usage:" - echo "$0 [-a application][-c center][-glnoprx]" + echo "$0 [-a application][-c center][-glnorvx]" echo "-a: Set application (default application.qml)" echo "-c: Set center (supported values: paris,tokyo,longitude latitude). Default is geneve" echo "-g: Run subprocesses within gdb (only with -x)" @@ -258,13 +258,24 @@ cd $NAVIT_BIN_DIR >bookmark.txt echo "$center" >center.txt -run "MapViewer" ./$NAVIT navit_genivi_mapviewer.xml +if [ "$verbose" = "1" ] +then + run "MapViewer" ./$NAVIT -d 3 -c navit_genivi_mapviewer.xml +else + run "MapViewer" ./$NAVIT -d 0 -c navit_genivi_mapviewer.xml +fi wait_for_service org.genivi.mapviewer.Configuration /org/genivi/mapviewer wait_for_service org.genivi.mapviewer.MapViewerControl /org/genivi/mapviewer wait_for_service org.genivi.mapviewer.Session /org/genivi/mapviewer -run "NavigationCore" ./$NAVIT navit_genivi_navigationcore.xml +if [ "$verbose" = "1" ] +then + run "NavigationCore" ./$NAVIT -d 3 -c navit_genivi_navigationcore.xml +else + run "NavigationCore" ./$NAVIT -d 0 -c navit_genivi_navigationcore.xml +fi + wait_for_service org.genivi.navigationcore.Configuration /org/genivi/navigationcore wait_for_service org.genivi.navigationcore.Guidance /org/genivi/navigationcore wait_for_service org.genivi.navigationcore.LocationInput /org/genivi/navigationcore |