summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author <philippe colliot>2014-07-25 13:39:03 +0200
committer <philippe colliot>2014-07-25 13:39:03 +0200
commit17525d7011403ec339dd90ef8a4184b04440f678 (patch)
treee4e78495cc7d8582e50ab1e2ecc6bcb141d233ef
parent6ae94955e98b63bf4252fd8702dffb3a9953a959 (diff)
downloadnavigation-17525d7011403ec339dd90ef8a4184b04440f678.tar.gz
add getversion to enhanced position plugin
-rw-r--r--src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx17
-rw-r--r--src/navigation/script/0positioning.mk2
2 files changed, 11 insertions, 8 deletions
diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
index 0203a30..cca83b5 100644
--- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
+++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
@@ -103,15 +103,18 @@ class EnhancedPosition
"org.genivi.positioning.EnhancedPosition")
{
m_priv=priv;
- try {
- ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string>version;
- version=GetVersion();
- dbg(0,"EnhancedPosition version %d.%d.%d\n",version._1,version._2,version._3);
- } catch(...) {
- dbg(0,"Exception during GetVersion\n");
- }
}
+ ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > GetVersion()
+ {
+ DBus::Struct<uint16_t, uint16_t, uint16_t, std::string> Version;
+ Version._1=2;
+ Version._2=0;
+ Version._3=0;
+ Version._4=std::string("04-06-2013");
+ return Version;
+ }
+
void
PositionUpdate(const std::vector< uint16_t >& changedValues)
{
diff --git a/src/navigation/script/0positioning.mk b/src/navigation/script/0positioning.mk
index f1898cf..a9c85e6 100644
--- a/src/navigation/script/0positioning.mk
+++ b/src/navigation/script/0positioning.mk
@@ -35,7 +35,7 @@ sensors-service_BIN=$(positioning_BIN)/sensors-service
enhanced-position-service_BIN=$(positioning_BIN)/enhanced-position-service
positioning_URL=http://git.projects.genivi.org/lbs/positioning.git
-positioning_VERSION=963d70c3d3a1f534146372e24c4d53a57d14ade2
+positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026
positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION)
positioning_API=$(positioning_SRC)/enhanced-position-service/api