diff options
| author | <philippe colliot> | 2014-11-10 16:45:03 +0100 |
|---|---|---|
| committer | <philippe colliot> | 2014-11-10 16:45:03 +0100 |
| commit | 81ab08306f876799b9ddf09bc87423ea471b99ba (patch) | |
| tree | dd9be40d50be9bdda52013e237cd4f2a21f0e20c | |
| parent | f5794b3d59419fcc669597bffeec6c68aa10f8e7 (diff) | |
| download | navigation-81ab08306f876799b9ddf09bc87423ea471b99ba.tar.gz | |
Fix missing constants for trip computer
| -rw-r--r-- | src/hmi/qml/TripComputer.qml | 2 | ||||
| -rw-r--r-- | src/hmi/qml/hmi-launcher/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | src/script/build.sh | 2 | ||||
| -rwxr-xr-x | test/script/configTests.py | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/hmi/qml/TripComputer.qml b/src/hmi/qml/TripComputer.qml index bd3770e..cc9b022 100644 --- a/src/hmi/qml/TripComputer.qml +++ b/src/hmi/qml/TripComputer.qml @@ -181,7 +181,7 @@ HMIMenu { disableAllValue(); // By default set all the values to "--" if (tripnr > 0) { res=Genivi.fuel_stop_advisor_message(dbusIf,"GetTripData",["uint8",tripnr-1]); - // Genivi.dump("",res); + Genivi.dump("",res); for (var i = 0 ; i < res[1].length ; i+=4) { if (res[1][i+1] == Genivi.FUELSTOPADVISOR_DISTANCE) { distance_value.text=res[1][i+3][1]/10; diff --git a/src/hmi/qml/hmi-launcher/CMakeLists.txt b/src/hmi/qml/hmi-launcher/CMakeLists.txt index f52c268..857685f 100644 --- a/src/hmi/qml/hmi-launcher/CMakeLists.txt +++ b/src/hmi/qml/hmi-launcher/CMakeLists.txt @@ -101,12 +101,13 @@ set(LIBRARIES # generate constants used by the QML files # in order to generate it, navigation-service and positioning have to be being cloned before -# do cmake -Dnavigation-service_API=<path to navigation-service APIs> -Dpositioning_API=<path to positioning enhanced position API> +# do cmake -Dnavigation-service_API=<path to navigation-service APIs> -Dpositioning_API=<path to positioning enhanced position API> -Dfuel-stop-advisor_API=<path to fuel-stop-advisor APIs> file (GLOB XML_TO_CONSTANTS ${navigation-service_API}/map-viewer/genivi-mapviewer-constants.xml ${navigation-service_API}/navigation-core/genivi-navigationcore-constants.xml ${navigation-service_API}/poi-service/genivi-poiservice-constants.xml ${positioning_API}/genivi-positioning-constants.xml + ${fuel-stop-advisor_API}/constants.xml ) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/constants.js) foreach (RAW_FILE ${XML_TO_CONSTANTS}) diff --git a/src/script/build.sh b/src/script/build.sh index 013622d..e945310 100755 --- a/src/script/build.sh +++ b/src/script/build.sh @@ -103,7 +103,7 @@ build() { cd $TOP_BIN_DIR mkdir -p $HMI_LAUNCHER cd $HMI_LAUNCHER_BIN_DIR - cmake -DLM=$lm -Dnavigation-service_API=$NAVIGATION_SERVICE_API_DIR -Dpositioning_API=$ENHANCED_POSITION_SERVICE_API_DIR $HMI_LAUNCHER_SRC_DIR && make + cmake -DLM=$lm -Dnavigation-service_API=$NAVIGATION_SERVICE_API_DIR -Dpositioning_API=$ENHANCED_POSITION_SERVICE_API_DIR -Dfuel-stop-advisor_API=$FUEL_STOP_ADVISOR_SRC_DIR $HMI_LAUNCHER_SRC_DIR && make cd $TOP_BIN_DIR mkdir -p $POI_SERVER diff --git a/test/script/configTests.py b/test/script/configTests.py index be6b745..6c5dcd0 100755 --- a/test/script/configTests.py +++ b/test/script/configTests.py @@ -36,8 +36,7 @@ def launch(file,host): FNULL = open(os.devnull,'w') logreplayer=PATH_LOGREPLAYER + 'log-replayer' file=PATH_LOGFILES + file - param = file + ' ' + host - call([logreplayer, param], stdout=FNULL, stderr=FNULL) + call([logreplayer, file, host], stdout=FNULL, stderr=FNULL) |