diff options
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | build-all.sh | 18 | ||||
-rw-r--r-- | enhanced-position-service/README | 9 | ||||
-rw-r--r-- | enhanced-position-service/commonapi-service/FindDLT.cmake | 30 | ||||
-rw-r--r-- | enhanced-position-service/dbus-service/FindDLT.cmake | 30 | ||||
-rw-r--r-- | enhanced-position-service/dbus/CMakeLists.txt (renamed from enhanced-position-service/dbus-service/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/.gitignore (renamed from enhanced-position-service/commonapi-service/api/.gitignore) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/CMakeLists.txt (renamed from enhanced-position-service/dbus-service/api/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/constants.xsl (renamed from enhanced-position-service/dbus-service/api/constants.xsl) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/enum.xsl (renamed from enhanced-position-service/dbus-service/api/enum.xsl) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/genivi-positioning-configuration.xml (renamed from enhanced-position-service/dbus-service/api/genivi-positioning-configuration.xml) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/genivi-positioning-constants.xml (renamed from enhanced-position-service/dbus-service/api/genivi-positioning-constants.xml) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/genivi-positioning-enhancedposition.xml (renamed from enhanced-position-service/dbus-service/api/genivi-positioning-enhancedposition.xml) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/genivi-positioning-positionfeedback.xml (renamed from enhanced-position-service/dbus-service/api/genivi-positioning-positionfeedback.xml) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/introspect.xsd (renamed from enhanced-position-service/dbus-service/api/introspect.xsd) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/api/introspect.xsl (renamed from enhanced-position-service/dbus-service/api/introspect.xsl) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/doc/GENIVI_EnhancedPositionService_ComponentSpecification.pdf (renamed from enhanced-position-service/dbus-service/doc/GENIVI_EnhancedPositionService_ComponentSpecification.pdf) | bin | 758745 -> 758745 bytes | |||
-rw-r--r-- | enhanced-position-service/dbus/doc/testplan.txt (renamed from enhanced-position-service/dbus-service/doc/testplan.txt) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/dbus/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.docx (renamed from enhanced-position-service/dbus-service/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.docx) | bin | 208649 -> 208649 bytes | |||
-rwxr-xr-x | enhanced-position-service/dbus/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.pdf (renamed from enhanced-position-service/dbus-service/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.pdf) | bin | 653724 -> 653724 bytes | |||
-rwxr-xr-x | enhanced-position-service/dbus/doc/tools/README.txt (renamed from enhanced-position-service/dbus-service/doc/tools/README.txt) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/dbus/doc/tools/generate-doc.sh (renamed from enhanced-position-service/dbus-service/doc/tools/generate-doc.sh) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/CMakeLists.txt (renamed from enhanced-position-service/dbus-service/src/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/configuration.cpp (renamed from enhanced-position-service/dbus-service/src/configuration.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/configuration.h (renamed from enhanced-position-service/dbus-service/src/configuration.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/enhanced-position.cpp (renamed from enhanced-position-service/dbus-service/src/enhanced-position.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/enhanced-position.h (renamed from enhanced-position-service/dbus-service/src/enhanced-position.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/log.h (renamed from enhanced-position-service/commonapi-service/src/log.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/main.cpp (renamed from enhanced-position-service/dbus-service/src/main.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/position-feedback.cpp (renamed from enhanced-position-service/dbus-service/src/position-feedback.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/src/position-feedback.h (renamed from enhanced-position-service/dbus-service/src/position-feedback.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/CMakeLists.txt (renamed from enhanced-position-service/dbus-service/test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/compliance-test/CMakeLists.txt (renamed from enhanced-position-service/dbus-service/test/compliance-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/compliance-test/NOTE (renamed from enhanced-position-service/dbus-service/test/compliance-test/NOTE) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/compliance-test/README (renamed from enhanced-position-service/dbus-service/test/compliance-test/README) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/compliance-test/enhanced-position-service-compliance-test.c (renamed from enhanced-position-service/dbus-service/test/compliance-test/enhanced-position-service-compliance-test.c) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/enhanced-position-client.cpp (renamed from enhanced-position-service/dbus-service/test/enhanced-position-client.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/enhanced-position-client.h (renamed from enhanced-position-service/dbus-service/test/enhanced-position-client.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/log.h (renamed from enhanced-position-service/dbus-service/src/log.h) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/dbus/test/test-scripts/positioning-monitor.pl (renamed from enhanced-position-service/dbus-service/test/test-scripts/positioning-monitor.pl) | 0 | ||||
-rw-r--r-- | enhanced-position-service/dbus/test/test-scripts/test-enhanced-position-service-tk-gui.py (renamed from enhanced-position-service/dbus-service/test/test-scripts/test-enhanced-position-service-tk-gui.py) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/dbus/test/test-scripts/test-enhanced-position-service.py (renamed from enhanced-position-service/dbus-service/test/test-scripts/test-enhanced-position-service.py) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/CMakeLists.txt (renamed from enhanced-position-service/commonapi-service/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | enhanced-position-service/franca/api/.gitignore (renamed from enhanced-position-service/dbus-service/api/.gitignore) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/franca/api/Configuration.fidl (renamed from enhanced-position-service/commonapi-service/api/Configuration.fidl) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/franca/api/EnhancedPosition.fidl (renamed from enhanced-position-service/commonapi-service/api/EnhancedPosition.fidl) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/franca/api/EnhancedPositionServiceTypes.fidl (renamed from enhanced-position-service/commonapi-service/api/EnhancedPositionServiceTypes.fidl) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/franca/api/PositionFeedback.fidl (renamed from enhanced-position-service/commonapi-service/api/PositionFeedback.fidl) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/api/README (renamed from enhanced-position-service/commonapi-service/api/README) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/franca/src/CMakeLists.txt (renamed from enhanced-position-service/commonapi-service/src/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/ConfigurationStubImpl.cpp (renamed from enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/ConfigurationStubImpl.h (renamed from enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.h) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/franca/src/EnhancedPositionClient.cpp (renamed from enhanced-position-service/commonapi-service/src/EnhancedPositionClient.cpp) | 6 | ||||
-rwxr-xr-x | enhanced-position-service/franca/src/EnhancedPositionService.cpp (renamed from enhanced-position-service/commonapi-service/src/EnhancedPositionService.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/EnhancedPositionStubImpl.cpp (renamed from enhanced-position-service/commonapi-service/src/EnhancedPositionStubImpl.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/EnhancedPositionStubImpl.h (renamed from enhanced-position-service/commonapi-service/src/EnhancedPositionStubImpl.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/PositionFeedbackStubImpl.cpp (renamed from enhanced-position-service/commonapi-service/src/PositionFeedbackStubImpl.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/PositionFeedbackStubImpl.h (renamed from enhanced-position-service/commonapi-service/src/PositionFeedbackStubImpl.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/Configuration.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/Configuration.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPosition.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPosition.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedback.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedback.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/README (renamed from enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/README) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/log.h (renamed from enhanced-position-service/dbus-service/test/log.h) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/res/README (renamed from enhanced-position-service/commonapi-service/src/res/README) | 0 | ||||
-rw-r--r-- | enhanced-position-service/franca/src/res/dbusAddresses.conf (renamed from enhanced-position-service/commonapi-service/src/res/dbusAddresses.conf) | 0 | ||||
-rwxr-xr-x | enhanced-position-service/franca/test/test-scripts/run-test.sh (renamed from enhanced-position-service/commonapi-service/test/test-scripts/run-test.sh) | 9 | ||||
-rwxr-xr-x | run-test.sh | 36 |
96 files changed, 53 insertions, 89 deletions
@@ -13,7 +13,7 @@ The Positioning repository is a collection of 5 proofs of concept: Directory Structure =============================== -enhanced-position-service //enhanced-position-service PoCs (a dbus-service and a commonapi-service) +enhanced-position-service //2 enhanced-position-service PoCs (one with dbus interfaces and one with commonapi interfaces) gnss-service //gnss-service PoC log-replayer //log-replayer-PoC sensors-service //sensors-service PoC diff --git a/build-all.sh b/build-all.sh index 0d54be6..e0fa11c 100755 --- a/build-all.sh +++ b/build-all.sh @@ -36,14 +36,14 @@ TOP_BIN_DIR=$PWD/build GNSS_SERVICE_SRC_DIR=$TOP_SRC_DIR/gnss-service SENSORS_SERVICE_SRC_DIR=$TOP_SRC_DIR/sensors-service -ENHANCED_POSITION_SERVICE_DBUS_SRC_DIR=$TOP_SRC_DIR/enhanced-position-service/dbus-service -ENHANCED_POSITION_SERVICE_COMMONAPI_SRC_DIR=$TOP_SRC_DIR/enhanced-position-service/commonapi-service +ENHANCED_POSITION_SERVICE_DBUS_SRC_DIR=$TOP_SRC_DIR/enhanced-position-service/dbus +ENHANCED_POSITION_SERVICE_FRANCA_SRC_DIR=$TOP_SRC_DIR/enhanced-position-service/franca LOG_REPLAYER_SRC_DIR=$TOP_SRC_DIR/log-replayer GNSS_SERVICE_BIN_DIR=$TOP_BIN_DIR/gnss-service SENSORS_SERVICE_BIN_DIR=$TOP_BIN_DIR/sensors-service -ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR=$TOP_BIN_DIR/enhanced-position-service/dbus-service -ENHANCED_POSITION_SERVICE_COMMONAPI_BIN_DIR=$TOP_BIN_DIR/enhanced-position-service/commonapi-service +ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR=$TOP_BIN_DIR/enhanced-position-service/dbus +ENHANCED_POSITION_SERVICE_FRANCA_BIN_DIR=$TOP_BIN_DIR/enhanced-position-service/franca LOG_REPLAYER_BIN_DIR=$TOP_BIN_DIR/log-replayer usage() { @@ -81,15 +81,15 @@ buildSensorsService() { buildEnhancedPositionService() { echo '' - echo 'Building EnhancedPositionService (D-Bus) ->' $SENSORS_SERVICE_SRC_DIR + echo 'Building EnhancedPositionService (D-Bus PoC) ->' $SENSORS_SERVICE_SRC_DIR mkdir -p $ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR cd $ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR cmake $ENHANCED_POSITION_SERVICE_FLAGS $ENHANCED_POSITION_SERVICE_DBUS_SRC_DIR && make echo '' - echo 'Building EnhancedPositionService (CommonAPI) ->' $SENSORS_SERVICE_SRC_DIR - mkdir -p $ENHANCED_POSITION_SERVICE_COMMONAPI_BIN_DIR - cd $ENHANCED_POSITION_SERVICE_COMMONAPI_BIN_DIR + echo 'Building EnhancedPositionService (Franca PoC) ->' $SENSORS_SERVICE_SRC_DIR + mkdir -p $ENHANCED_POSITION_SERVICE_FRANCA_BIN_DIR + cd $ENHANCED_POSITION_SERVICE_FRANCA_BIN_DIR cmake $ENHANCED_POSITION_SERVICE_FLAGS $ENHANCED_POSITION_SERVICE_COMMONAPI_SRC_DIR && make } @@ -137,7 +137,7 @@ if [ $# -ge 1 ]; then rm -rf $SENSORS_SERVICE_BIN_DIR elif [ "$2" = "enhpos" ]; then rm -rf $ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR - rm -rf $ENHANCED_POSITION_SERVICE_COMMONAPI_BIN_DIR + rm -rf $ENHANCED_POSITION_SERVICE_FRANCA_BIN_DIR elif [ "$2" = "repl" ]; then rm -rf $LOG_REPLAYER_BIN_DIR fi diff --git a/enhanced-position-service/README b/enhanced-position-service/README new file mode 100644 index 0000000..8a13f37 --- /dev/null +++ b/enhanced-position-service/README @@ -0,0 +1,9 @@ +The folder 'dbus' contains: +- the interface description in DBU-XML (offcial GENIVI APIs) +- a version of the PoC that offers D-Bus interfaces + +The folder 'franca' contains: +- the interface description in Franca IDL (draft) +- a version of the PoC that offers C++ interfaces generated using commonapi + + diff --git a/enhanced-position-service/commonapi-service/FindDLT.cmake b/enhanced-position-service/commonapi-service/FindDLT.cmake deleted file mode 100644 index 354f1d5..0000000 --- a/enhanced-position-service/commonapi-service/FindDLT.cmake +++ /dev/null @@ -1,30 +0,0 @@ -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# Component Name: EnhancedPositionService -# -# Author: Marco Residori -# -# Copyright (C) 2014, XS Embedded GmbH -# -# License: -# This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# @licence end@ -########################################################################### - -set(DLT_INCLUDE_DIRS /usr/include/dlt) -set(DLT_LIBRARIES dlt) -set(DLT_LIBRARY_DIRS /usr/lib) - -find_package(PkgConfig) -pkg_check_modules(DLT REQUIRED automotive-dlt) - -if(${DLT_FOUND}) - #message(STATUS "found and use automotive-dlt: version ${DLT_VERSION}") -else() - message("missing DLT - check with 'pkg-config automotive-dlt --cflags-only-I'") -endif() diff --git a/enhanced-position-service/dbus-service/FindDLT.cmake b/enhanced-position-service/dbus-service/FindDLT.cmake deleted file mode 100644 index 354f1d5..0000000 --- a/enhanced-position-service/dbus-service/FindDLT.cmake +++ /dev/null @@ -1,30 +0,0 @@ -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# Component Name: EnhancedPositionService -# -# Author: Marco Residori -# -# Copyright (C) 2014, XS Embedded GmbH -# -# License: -# This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# @licence end@ -########################################################################### - -set(DLT_INCLUDE_DIRS /usr/include/dlt) -set(DLT_LIBRARIES dlt) -set(DLT_LIBRARY_DIRS /usr/lib) - -find_package(PkgConfig) -pkg_check_modules(DLT REQUIRED automotive-dlt) - -if(${DLT_FOUND}) - #message(STATUS "found and use automotive-dlt: version ${DLT_VERSION}") -else() - message("missing DLT - check with 'pkg-config automotive-dlt --cflags-only-I'") -endif() diff --git a/enhanced-position-service/dbus-service/CMakeLists.txt b/enhanced-position-service/dbus/CMakeLists.txt index 0862ad4..0862ad4 100644 --- a/enhanced-position-service/dbus-service/CMakeLists.txt +++ b/enhanced-position-service/dbus/CMakeLists.txt diff --git a/enhanced-position-service/commonapi-service/api/.gitignore b/enhanced-position-service/dbus/api/.gitignore index c52045f..c52045f 100644 --- a/enhanced-position-service/commonapi-service/api/.gitignore +++ b/enhanced-position-service/dbus/api/.gitignore diff --git a/enhanced-position-service/dbus-service/api/CMakeLists.txt b/enhanced-position-service/dbus/api/CMakeLists.txt index 8763ed1..8763ed1 100644 --- a/enhanced-position-service/dbus-service/api/CMakeLists.txt +++ b/enhanced-position-service/dbus/api/CMakeLists.txt diff --git a/enhanced-position-service/dbus-service/api/constants.xsl b/enhanced-position-service/dbus/api/constants.xsl index b9db1c7..b9db1c7 100644 --- a/enhanced-position-service/dbus-service/api/constants.xsl +++ b/enhanced-position-service/dbus/api/constants.xsl diff --git a/enhanced-position-service/dbus-service/api/enum.xsl b/enhanced-position-service/dbus/api/enum.xsl index 672d64d..672d64d 100644 --- a/enhanced-position-service/dbus-service/api/enum.xsl +++ b/enhanced-position-service/dbus/api/enum.xsl diff --git a/enhanced-position-service/dbus-service/api/genivi-positioning-configuration.xml b/enhanced-position-service/dbus/api/genivi-positioning-configuration.xml index 88bef22..88bef22 100644 --- a/enhanced-position-service/dbus-service/api/genivi-positioning-configuration.xml +++ b/enhanced-position-service/dbus/api/genivi-positioning-configuration.xml diff --git a/enhanced-position-service/dbus-service/api/genivi-positioning-constants.xml b/enhanced-position-service/dbus/api/genivi-positioning-constants.xml index 96c7608..96c7608 100644 --- a/enhanced-position-service/dbus-service/api/genivi-positioning-constants.xml +++ b/enhanced-position-service/dbus/api/genivi-positioning-constants.xml diff --git a/enhanced-position-service/dbus-service/api/genivi-positioning-enhancedposition.xml b/enhanced-position-service/dbus/api/genivi-positioning-enhancedposition.xml index f5e2f99..f5e2f99 100644 --- a/enhanced-position-service/dbus-service/api/genivi-positioning-enhancedposition.xml +++ b/enhanced-position-service/dbus/api/genivi-positioning-enhancedposition.xml diff --git a/enhanced-position-service/dbus-service/api/genivi-positioning-positionfeedback.xml b/enhanced-position-service/dbus/api/genivi-positioning-positionfeedback.xml index 6af0a9e..6af0a9e 100644 --- a/enhanced-position-service/dbus-service/api/genivi-positioning-positionfeedback.xml +++ b/enhanced-position-service/dbus/api/genivi-positioning-positionfeedback.xml diff --git a/enhanced-position-service/dbus-service/api/introspect.xsd b/enhanced-position-service/dbus/api/introspect.xsd index 76ed7ef..76ed7ef 100644 --- a/enhanced-position-service/dbus-service/api/introspect.xsd +++ b/enhanced-position-service/dbus/api/introspect.xsd diff --git a/enhanced-position-service/dbus-service/api/introspect.xsl b/enhanced-position-service/dbus/api/introspect.xsl index 786e211..786e211 100644 --- a/enhanced-position-service/dbus-service/api/introspect.xsl +++ b/enhanced-position-service/dbus/api/introspect.xsl diff --git a/enhanced-position-service/dbus-service/doc/GENIVI_EnhancedPositionService_ComponentSpecification.pdf b/enhanced-position-service/dbus/doc/GENIVI_EnhancedPositionService_ComponentSpecification.pdf Binary files differindex 5268419..5268419 100644 --- a/enhanced-position-service/dbus-service/doc/GENIVI_EnhancedPositionService_ComponentSpecification.pdf +++ b/enhanced-position-service/dbus/doc/GENIVI_EnhancedPositionService_ComponentSpecification.pdf diff --git a/enhanced-position-service/dbus-service/doc/testplan.txt b/enhanced-position-service/dbus/doc/testplan.txt index 17f4f55..17f4f55 100644 --- a/enhanced-position-service/dbus-service/doc/testplan.txt +++ b/enhanced-position-service/dbus/doc/testplan.txt diff --git a/enhanced-position-service/dbus-service/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.docx b/enhanced-position-service/dbus/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.docx Binary files differindex 3b6c7b6..3b6c7b6 100755 --- a/enhanced-position-service/dbus-service/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.docx +++ b/enhanced-position-service/dbus/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.docx diff --git a/enhanced-position-service/dbus-service/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.pdf b/enhanced-position-service/dbus/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.pdf Binary files differindex af0925d..af0925d 100755 --- a/enhanced-position-service/dbus-service/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.pdf +++ b/enhanced-position-service/dbus/doc/tools/GENIVI_EnhancedPositionService_ComponentSpecification-part1.pdf diff --git a/enhanced-position-service/dbus-service/doc/tools/README.txt b/enhanced-position-service/dbus/doc/tools/README.txt index bc7b868..bc7b868 100755 --- a/enhanced-position-service/dbus-service/doc/tools/README.txt +++ b/enhanced-position-service/dbus/doc/tools/README.txt diff --git a/enhanced-position-service/dbus-service/doc/tools/generate-doc.sh b/enhanced-position-service/dbus/doc/tools/generate-doc.sh index 57bb840..57bb840 100755 --- a/enhanced-position-service/dbus-service/doc/tools/generate-doc.sh +++ b/enhanced-position-service/dbus/doc/tools/generate-doc.sh diff --git a/enhanced-position-service/dbus-service/src/CMakeLists.txt b/enhanced-position-service/dbus/src/CMakeLists.txt index 8f18022..8f18022 100644 --- a/enhanced-position-service/dbus-service/src/CMakeLists.txt +++ b/enhanced-position-service/dbus/src/CMakeLists.txt diff --git a/enhanced-position-service/dbus-service/src/configuration.cpp b/enhanced-position-service/dbus/src/configuration.cpp index e047819..e047819 100644 --- a/enhanced-position-service/dbus-service/src/configuration.cpp +++ b/enhanced-position-service/dbus/src/configuration.cpp diff --git a/enhanced-position-service/dbus-service/src/configuration.h b/enhanced-position-service/dbus/src/configuration.h index 78c319a..78c319a 100644 --- a/enhanced-position-service/dbus-service/src/configuration.h +++ b/enhanced-position-service/dbus/src/configuration.h diff --git a/enhanced-position-service/dbus-service/src/enhanced-position.cpp b/enhanced-position-service/dbus/src/enhanced-position.cpp index 3258222..3258222 100644 --- a/enhanced-position-service/dbus-service/src/enhanced-position.cpp +++ b/enhanced-position-service/dbus/src/enhanced-position.cpp diff --git a/enhanced-position-service/dbus-service/src/enhanced-position.h b/enhanced-position-service/dbus/src/enhanced-position.h index 2561c53..2561c53 100644 --- a/enhanced-position-service/dbus-service/src/enhanced-position.h +++ b/enhanced-position-service/dbus/src/enhanced-position.h diff --git a/enhanced-position-service/commonapi-service/src/log.h b/enhanced-position-service/dbus/src/log.h index 4d946fb..4d946fb 100644 --- a/enhanced-position-service/commonapi-service/src/log.h +++ b/enhanced-position-service/dbus/src/log.h diff --git a/enhanced-position-service/dbus-service/src/main.cpp b/enhanced-position-service/dbus/src/main.cpp index bc08563..bc08563 100644 --- a/enhanced-position-service/dbus-service/src/main.cpp +++ b/enhanced-position-service/dbus/src/main.cpp diff --git a/enhanced-position-service/dbus-service/src/position-feedback.cpp b/enhanced-position-service/dbus/src/position-feedback.cpp index 0538c0c..0538c0c 100644 --- a/enhanced-position-service/dbus-service/src/position-feedback.cpp +++ b/enhanced-position-service/dbus/src/position-feedback.cpp diff --git a/enhanced-position-service/dbus-service/src/position-feedback.h b/enhanced-position-service/dbus/src/position-feedback.h index 59c0490..59c0490 100644 --- a/enhanced-position-service/dbus-service/src/position-feedback.h +++ b/enhanced-position-service/dbus/src/position-feedback.h diff --git a/enhanced-position-service/dbus-service/test/CMakeLists.txt b/enhanced-position-service/dbus/test/CMakeLists.txt index 0ccc280..0ccc280 100644 --- a/enhanced-position-service/dbus-service/test/CMakeLists.txt +++ b/enhanced-position-service/dbus/test/CMakeLists.txt diff --git a/enhanced-position-service/dbus-service/test/compliance-test/CMakeLists.txt b/enhanced-position-service/dbus/test/compliance-test/CMakeLists.txt index 918e579..918e579 100644 --- a/enhanced-position-service/dbus-service/test/compliance-test/CMakeLists.txt +++ b/enhanced-position-service/dbus/test/compliance-test/CMakeLists.txt diff --git a/enhanced-position-service/dbus-service/test/compliance-test/NOTE b/enhanced-position-service/dbus/test/compliance-test/NOTE index 27ef794..27ef794 100644 --- a/enhanced-position-service/dbus-service/test/compliance-test/NOTE +++ b/enhanced-position-service/dbus/test/compliance-test/NOTE diff --git a/enhanced-position-service/dbus-service/test/compliance-test/README b/enhanced-position-service/dbus/test/compliance-test/README index 1f817d7..1f817d7 100644 --- a/enhanced-position-service/dbus-service/test/compliance-test/README +++ b/enhanced-position-service/dbus/test/compliance-test/README diff --git a/enhanced-position-service/dbus-service/test/compliance-test/enhanced-position-service-compliance-test.c b/enhanced-position-service/dbus/test/compliance-test/enhanced-position-service-compliance-test.c index 9abd5e6..9abd5e6 100644 --- a/enhanced-position-service/dbus-service/test/compliance-test/enhanced-position-service-compliance-test.c +++ b/enhanced-position-service/dbus/test/compliance-test/enhanced-position-service-compliance-test.c diff --git a/enhanced-position-service/dbus-service/test/enhanced-position-client.cpp b/enhanced-position-service/dbus/test/enhanced-position-client.cpp index bba79ca..bba79ca 100644 --- a/enhanced-position-service/dbus-service/test/enhanced-position-client.cpp +++ b/enhanced-position-service/dbus/test/enhanced-position-client.cpp diff --git a/enhanced-position-service/dbus-service/test/enhanced-position-client.h b/enhanced-position-service/dbus/test/enhanced-position-client.h index 5bbe0f1..5bbe0f1 100644 --- a/enhanced-position-service/dbus-service/test/enhanced-position-client.h +++ b/enhanced-position-service/dbus/test/enhanced-position-client.h diff --git a/enhanced-position-service/dbus-service/src/log.h b/enhanced-position-service/dbus/test/log.h index 4d946fb..4d946fb 100644 --- a/enhanced-position-service/dbus-service/src/log.h +++ b/enhanced-position-service/dbus/test/log.h diff --git a/enhanced-position-service/dbus-service/test/test-scripts/positioning-monitor.pl b/enhanced-position-service/dbus/test/test-scripts/positioning-monitor.pl index e006b9b..e006b9b 100755 --- a/enhanced-position-service/dbus-service/test/test-scripts/positioning-monitor.pl +++ b/enhanced-position-service/dbus/test/test-scripts/positioning-monitor.pl diff --git a/enhanced-position-service/dbus-service/test/test-scripts/test-enhanced-position-service-tk-gui.py b/enhanced-position-service/dbus/test/test-scripts/test-enhanced-position-service-tk-gui.py index 6ef7fc0..6ef7fc0 100644 --- a/enhanced-position-service/dbus-service/test/test-scripts/test-enhanced-position-service-tk-gui.py +++ b/enhanced-position-service/dbus/test/test-scripts/test-enhanced-position-service-tk-gui.py diff --git a/enhanced-position-service/dbus-service/test/test-scripts/test-enhanced-position-service.py b/enhanced-position-service/dbus/test/test-scripts/test-enhanced-position-service.py index ee784aa..ee784aa 100755 --- a/enhanced-position-service/dbus-service/test/test-scripts/test-enhanced-position-service.py +++ b/enhanced-position-service/dbus/test/test-scripts/test-enhanced-position-service.py diff --git a/enhanced-position-service/commonapi-service/CMakeLists.txt b/enhanced-position-service/franca/CMakeLists.txt index e8d7f1b..dbbe9fc 100644 --- a/enhanced-position-service/commonapi-service/CMakeLists.txt +++ b/enhanced-position-service/franca/CMakeLists.txt @@ -19,7 +19,7 @@ # @licence end@ ########################################################################### -project(enhanced-position-service-commonapi) +project(enhanced-position-service-franca) cmake_minimum_required(VERSION 2.6.0) option(WITH_DLT diff --git a/enhanced-position-service/dbus-service/api/.gitignore b/enhanced-position-service/franca/api/.gitignore index c52045f..c52045f 100644 --- a/enhanced-position-service/dbus-service/api/.gitignore +++ b/enhanced-position-service/franca/api/.gitignore diff --git a/enhanced-position-service/commonapi-service/api/Configuration.fidl b/enhanced-position-service/franca/api/Configuration.fidl index 391f250..391f250 100755 --- a/enhanced-position-service/commonapi-service/api/Configuration.fidl +++ b/enhanced-position-service/franca/api/Configuration.fidl diff --git a/enhanced-position-service/commonapi-service/api/EnhancedPosition.fidl b/enhanced-position-service/franca/api/EnhancedPosition.fidl index 92cc9b3..92cc9b3 100755 --- a/enhanced-position-service/commonapi-service/api/EnhancedPosition.fidl +++ b/enhanced-position-service/franca/api/EnhancedPosition.fidl diff --git a/enhanced-position-service/commonapi-service/api/EnhancedPositionServiceTypes.fidl b/enhanced-position-service/franca/api/EnhancedPositionServiceTypes.fidl index 29a729e..29a729e 100755 --- a/enhanced-position-service/commonapi-service/api/EnhancedPositionServiceTypes.fidl +++ b/enhanced-position-service/franca/api/EnhancedPositionServiceTypes.fidl diff --git a/enhanced-position-service/commonapi-service/api/PositionFeedback.fidl b/enhanced-position-service/franca/api/PositionFeedback.fidl index 550593c..550593c 100755 --- a/enhanced-position-service/commonapi-service/api/PositionFeedback.fidl +++ b/enhanced-position-service/franca/api/PositionFeedback.fidl diff --git a/enhanced-position-service/commonapi-service/api/README b/enhanced-position-service/franca/api/README index f0d8e31..f0d8e31 100644 --- a/enhanced-position-service/commonapi-service/api/README +++ b/enhanced-position-service/franca/api/README diff --git a/enhanced-position-service/commonapi-service/src/CMakeLists.txt b/enhanced-position-service/franca/src/CMakeLists.txt index bc0dbc8..bc0dbc8 100755 --- a/enhanced-position-service/commonapi-service/src/CMakeLists.txt +++ b/enhanced-position-service/franca/src/CMakeLists.txt diff --git a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.cpp b/enhanced-position-service/franca/src/ConfigurationStubImpl.cpp index 219cb12..219cb12 100644 --- a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.cpp +++ b/enhanced-position-service/franca/src/ConfigurationStubImpl.cpp diff --git a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.h b/enhanced-position-service/franca/src/ConfigurationStubImpl.h index 8492c69..8492c69 100644 --- a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.h +++ b/enhanced-position-service/franca/src/ConfigurationStubImpl.h diff --git a/enhanced-position-service/commonapi-service/src/EnhancedPositionClient.cpp b/enhanced-position-service/franca/src/EnhancedPositionClient.cpp index 084b416..df37764 100755 --- a/enhanced-position-service/commonapi-service/src/EnhancedPositionClient.cpp +++ b/enhanced-position-service/franca/src/EnhancedPositionClient.cpp @@ -22,9 +22,9 @@ void getPositionInfoAsyncCallback(const CommonAPI::CallStatus& callStatus, const for ( auto it = posInfo.begin(); it != posInfo.end(); ++it ) { if (it->first == PositionInfoKey::LATITUDE) - { - LOG_INFO(gCtx,"LAT=%lf", it->second.get<double>()); - } + { + LOG_INFO(gCtx,"LAT=%lf", it->second.get<double>()); + } if (it->first == PositionInfoKey::LONGITUDE) { LOG_INFO(gCtx,"LON=%lf", it->second.get<double>()); diff --git a/enhanced-position-service/commonapi-service/src/EnhancedPositionService.cpp b/enhanced-position-service/franca/src/EnhancedPositionService.cpp index 774ca5b..774ca5b 100755 --- a/enhanced-position-service/commonapi-service/src/EnhancedPositionService.cpp +++ b/enhanced-position-service/franca/src/EnhancedPositionService.cpp diff --git a/enhanced-position-service/commonapi-service/src/EnhancedPositionStubImpl.cpp b/enhanced-position-service/franca/src/EnhancedPositionStubImpl.cpp index 7c28d3b..7c28d3b 100644 --- a/enhanced-position-service/commonapi-service/src/EnhancedPositionStubImpl.cpp +++ b/enhanced-position-service/franca/src/EnhancedPositionStubImpl.cpp diff --git a/enhanced-position-service/commonapi-service/src/EnhancedPositionStubImpl.h b/enhanced-position-service/franca/src/EnhancedPositionStubImpl.h index 5e549c3..5e549c3 100644 --- a/enhanced-position-service/commonapi-service/src/EnhancedPositionStubImpl.h +++ b/enhanced-position-service/franca/src/EnhancedPositionStubImpl.h diff --git a/enhanced-position-service/commonapi-service/src/PositionFeedbackStubImpl.cpp b/enhanced-position-service/franca/src/PositionFeedbackStubImpl.cpp index 629268f..629268f 100644 --- a/enhanced-position-service/commonapi-service/src/PositionFeedbackStubImpl.cpp +++ b/enhanced-position-service/franca/src/PositionFeedbackStubImpl.cpp diff --git a/enhanced-position-service/commonapi-service/src/PositionFeedbackStubImpl.h b/enhanced-position-service/franca/src/PositionFeedbackStubImpl.h index 1f3ec0c..1f3ec0c 100644 --- a/enhanced-position-service/commonapi-service/src/PositionFeedbackStubImpl.h +++ b/enhanced-position-service/franca/src/PositionFeedbackStubImpl.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/Configuration.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/Configuration.h index ef181a6..ef181a6 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/Configuration.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/Configuration.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp index e620d7e..e620d7e 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h index 16c7092..16c7092 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp index 8df18e9..8df18e9 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h index 3e8b531..3e8b531 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h index c1cc85e..c1cc85e 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h index 38ae3b5..38ae3b5 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h index 74406a6..74406a6 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp index da37eb9..da37eb9 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h index a9dd97d..a9dd97d 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPosition.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPosition.h index b6565a0..b6565a0 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPosition.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPosition.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp index e02adfe..e02adfe 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h index 60e4df9..60e4df9 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp index c7420c2..c7420c2 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h index 5eb5c72..5eb5c72 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h index f769438..f769438 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h index 87f9506..87f9506 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.cpp index b83d313..b83d313 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h index 4a05726..4a05726 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h index 8df954b..8df954b 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp index 0712337..0712337 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h index cb8c784..cb8c784 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedback.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedback.h index c648ad0..c648ad0 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedback.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedback.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp index 2ddf9c5..2ddf9c5 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h index 6273398..6273398 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp index c5c4b0f..c5c4b0f 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h index da41534..da41534 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h index dfc01d3..dfc01d3 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h index 0deae02..0deae02 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h index cc3c150..cc3c150 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp index f80e0d7..f80e0d7 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h index 79fd96d..79fd96d 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/README b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/README index e74cc3a..e74cc3a 100644 --- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/README +++ b/enhanced-position-service/franca/src/gen/org/genivi/EnhancedPositionService/README diff --git a/enhanced-position-service/dbus-service/test/log.h b/enhanced-position-service/franca/src/log.h index 4d946fb..4d946fb 100644 --- a/enhanced-position-service/dbus-service/test/log.h +++ b/enhanced-position-service/franca/src/log.h diff --git a/enhanced-position-service/commonapi-service/src/res/README b/enhanced-position-service/franca/src/res/README index 20f5175..20f5175 100644 --- a/enhanced-position-service/commonapi-service/src/res/README +++ b/enhanced-position-service/franca/src/res/README diff --git a/enhanced-position-service/commonapi-service/src/res/dbusAddresses.conf b/enhanced-position-service/franca/src/res/dbusAddresses.conf index 7854468..7854468 100644 --- a/enhanced-position-service/commonapi-service/src/res/dbusAddresses.conf +++ b/enhanced-position-service/franca/src/res/dbusAddresses.conf diff --git a/enhanced-position-service/commonapi-service/test/test-scripts/run-test.sh b/enhanced-position-service/franca/test/test-scripts/run-test.sh index 5764d12..9ef089c 100755 --- a/enhanced-position-service/commonapi-service/test/test-scripts/run-test.sh +++ b/enhanced-position-service/franca/test/test-scripts/run-test.sh @@ -4,7 +4,7 @@ # @licence app begin@ # SPDX-License-Identifier: MPL-2.0 # -# Component Name: Positioning poC +# Component Name: EnhancedPositionService # Author: Marco Residori # # Copyright (C) 2013, XS Embedded GmbH @@ -21,17 +21,22 @@ TOP_DIR=../../../.. LOGS_DIR=$TOP_DIR/log-replayer/logs LOGREPLAYER_DIR=$TOP_DIR/build/log-replayer/src -ENHPOS_DIR=$TOP_DIR/build/enhanced-position-service/commonapi-service/src +ENHPOS_DIR=$TOP_DIR/build/enhanced-position-service/franca/src echo "Test started" $LOGREPLAYER_DIR/log-replayer $LOGS_DIR/geneve-cologny.log > /dev/null 2>&1 & + $ENHPOS_DIR/EnhancedPositionService & + sleep 1 + $ENHPOS_DIR/EnhancedPositionClient & + sleep 10 echo "Test finished" + killall EnhancedPositionClient killall EnhancedPositionService killall log-replayer diff --git a/run-test.sh b/run-test.sh index fd05d6b..63f80a8 100755 --- a/run-test.sh +++ b/run-test.sh @@ -17,6 +17,16 @@ # @licence end@ ########################################################################### +TOP_SRC_DIR=$PWD +TOP_BIN_DIR=$PWD/build + +GNSS_SERVICE_BIN_DIR=$TOP_BIN_DIR/gnss-service +SENSORS_SERVICE_BIN_DIR=$TOP_BIN_DIR/sensors-service +ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR=$TOP_BIN_DIR/enhanced-position-service/dbus +ENHANCED_POSITION_SERVICE_FRANCA_BIN_DIR=$TOP_BIN_DIR/enhanced-position-service/franca +LOG_REPLAYER_BIN_DIR=$TOP_BIN_DIR/log-replayer +LOG_REPLAYER_LOGS_DIR=$TOP_BIN_DIR/log-replayer/logs + usage() { echo "Usage: ./run-test.sh [service]" echo @@ -32,10 +42,10 @@ usage() { testGnssService() { - build/gnss-service/test/gnss-service-client & + $GNSS_SERVICE_BIN_DIR/test/gnss-service-client & sleep 3 echo 'Starting log replayer...' - build/log-replayer/src/log-replayer log-replayer/logs/20100411_Geko_Regensburg_short.log > /dev/null 2>&1 & + $LOG_REPLAYER_BIN_DIR/src/log-replayer $LOG_REPLAYER_LOGS_DIR/20100411_Geko_Regensburg_short.log > /dev/null 2>&1 & sleep 10 echo 'Stopping test...' killall log-replayer @@ -44,10 +54,10 @@ testGnssService() testSensorsService() { - build/sensors-service/test/sensors-service-client & + $SENSORS_SERVICE_BIN_DIR/test/sensors-service-client & sleep 3 echo 'Starting log replayer...' - build/log-replayer/src/log-replayer log-replayer/logs/20100411_Geko_Regensburg_short.log > /dev/null 2>&1 & + $LOG_REPLAYER_BIN_DIR/src/log-replayer $LOG_REPLAYER_LOGS_DIR/20100411_Geko_Regensburg_short.log > /dev/null 2>&1 & sleep 10 echo 'Stopping test...' killall log-replayer @@ -56,12 +66,12 @@ testSensorsService() testEnhancedPositionService() { - build/enhanced-position-service/src/enhanced-position-service > /dev/null 2>&1 & + $ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR/src/enhanced-position-service > /dev/null 2>&1 & sleep 3 - build/enhanced-position-service/test/enhanced-position-client & + $ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR/test/enhanced-position-client & sleep 3 echo 'Starting log replayer...' - build/log-replayer/src/log-replayer log-replayer/logs/geneve-cologny.log > /dev/null 2>&1 & + $LOG_REPLAYER_BIN_DIR/src/log-replayer $LOG_REPLAYER_LOGS_DIR/geneve-cologny.log > /dev/null 2>&1 & sleep 20 echo 'Stopping test...' killall enhanced-position-client @@ -72,10 +82,10 @@ testEnhancedPositionService() testEnhancedPositionService2() { echo 'Starting enhanced position service...' - build/log-replayer/src/log-replayer log-replayer/logs/geneve-cologny.log > /dev/null 2>&1 & + $LOG_REPLAYER_BIN_DIR/log-replayer $LOG_REPLAYER_LOGS_DIR/geneve-cologny.log > /dev/null 2>&1 & echo 'Starting log replayer...' - build/enhanced-position-service/src/enhanced-position-service > /dev/null 2>&1 & - sleep 300 + $ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR/src/enhanced-position-service > /dev/null 2>&1 & + sleep 10 echo 'Stopping test...' killall enhanced-position-service killall log-replayer @@ -84,11 +94,11 @@ testEnhancedPositionService2() testLogReplayer() { echo 'Starting log replayer...' - build/log-replayer/src/log-replayer log-replayer/logs/geneve-cologny.log > /dev/null 2>&1 & - #build/log-replayer/src/log-replayer log-replayer/logs/20100411_Geko_Regensburg_short.log > /dev/null 2>&1 & + $LOG_REPLAYER_BIN_DIR/src/log-replayer $LOG_REPLAYER_LOGS_DIR/geneve-cologny.log > /dev/null 2>&1 & + #$LOG_REPLAYER_LOGS_DIR/src/log-replayer $LOG_REPLAYER_LOGS_DIR/20100411_Geko_Regensburg_short.log > /dev/null 2>&1 & sleep 1 echo 'Starting test application...' - build/log-replayer/test/test-log-replayer 9930 & + $LOG_REPLAYER_BIN_DIR/test/test-log-replayer 9930 & sleep 10 echo 'Stopping test...' killall log-replayer |