fix some mismatches into the franca files and preset version to 4.0

19 files changed, 40 insertions, 27 deletions

diff --git a/api/franca/CommonTypes.fidl b/api/franca/CommonTypes.fidl
index 7517aa8..32cb306 100755
--- a/api/franca/CommonTypes.fidl
+++ b/api/franca/CommonTypes.fidl
@@ -7,6 +7,10 @@
 package org.genivi

 

 typeCollection CommonTypes {

+	version {

+		major 4 

+		minor 0

+	}

 

 	<** @description: version.**>			

 	struct Version {

diff --git a/api/franca/hmi/speechoutputservice/SpeechOutput.fidl b/api/franca/hmi/speechoutputservice/SpeechOutput.fidl
index 99091f1..fbd4a50 100644
--- a/api/franca/hmi/speechoutputservice/SpeechOutput.fidl
+++ b/api/franca/hmi/speechoutputservice/SpeechOutput.fidl
@@ -16,8 +16,8 @@ import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
 **> 
 interface SpeechOutput {
 	version {
-		major 0
-		minor 1
+		major 4
+		minor 0
 	}
 	
 	<**	@description : This method returns the API version implemented by the content access module.**>
diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl
index 1a51aa8..8b8864f 100755
--- a/api/franca/navigation/NavigationTypes.fidl
+++ b/api/franca/navigation/NavigationTypes.fidl
@@ -7,7 +7,10 @@
 package org.genivi.navigation

 

 typeCollection NavigationTypes {

-

+	version {

+		major 4 

+		minor 0

+	}

 

 	<** @description: Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value.**>

 	typedef Handle is UInt32

diff --git a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
index 2fb84be..7cb8fe4 100755
--- a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
+++ b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
@@ -36,8 +36,8 @@ To indicate that the search has finished an FtsDone signal is sent.
 
 interface FreeTextSearch {
 	version {
-		major 0
-		minor 1
+		major 4
+		minor 0
 	}
 		
     <** @description: A requestId is an identifier used to match a response to a request.
diff --git a/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl b/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
index 8e2eba1..ab4e203 100644
--- a/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
@@ -13,8 +13,8 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 <** @description : This interface offers methods that implement the map viewer configuration functionality of a navigation system.**>
 interface Configuration {
 	version {
-		major 0 
-		minor 1
+		major 4 
+		minor 0
 	}
 		<**	@description : This method returns the API version .**>
 	method getVersion {
diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl
index 56c7a59..3732038 100755
--- a/api/franca/navigation/mapviewer/MapViewerControl.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl
@@ -14,7 +14,7 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 **>

 interface MapViewerControl {

 	version {

-		major 1 

+		major 4 

 		minor 0

 	}

 	

diff --git a/api/franca/navigation/mapviewer/MapViewerSession.fidl b/api/franca/navigation/mapviewer/MapViewerSession.fidl
index af1f229..2200b64 100644
--- a/api/franca/navigation/mapviewer/MapViewerSession.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerSession.fidl
@@ -13,8 +13,8 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 <** @description : This interface offers methods that implement the navigation core session functionality of a navigation system.**>
 interface MapViewerSession {
 	version {
-		major 0 
-		minor 1
+		major 4 
+		minor 0
 	}
 
 	<**	@description : This method returns the API version .**>
diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl
index 6fe3ed0..8f78cbe 100644
--- a/api/franca/navigation/navigationcore/Guidance.fidl
+++ b/api/franca/navigation/navigationcore/Guidance.fidl
@@ -15,7 +15,7 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 

 interface Guidance {

 	version {

-		major 1 

+		major 4 

 		minor 0

 	}

 

@@ -122,7 +122,7 @@ interface Guidance {
 	}

 

     union ManeuverDataValue {

-	    UInt16 uint16Value

+	    ManeuverDirection enumValue

 	    String stringValue

 	    LaneInfo[] laneInfoValue

 	    Coordinate3D coordinate3DValue

diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl
index aa52438..1825fb4 100644
--- a/api/franca/navigation/navigationcore/LocationInput.fidl
+++ b/api/franca/navigation/navigationcore/LocationInput.fidl
@@ -16,7 +16,7 @@ import org.genivi.navigation.navigationcore.NavigationCoreTypes.* from "Navigati
 

 interface LocationInput {

 	version {

-		major 1 

+		major 4 

 		minor 0

 	}

 

diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
index b54966e..0658eab 100644
--- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
+++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
@@ -16,7 +16,7 @@ import org.genivi.navigation.navigationcore.NavigationCoreTypes.* from "Navigati
 

 interface MapMatchedPosition {

 	version {

-		major 1 

+		major 4 

 		minor 0

 	}

 

diff --git a/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl b/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
index d3032ce..adfb82a 100644
--- a/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
+++ b/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
@@ -13,8 +13,8 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 <** @description : This interface offers methods that implement the navigation core configuration functionality of a navigation system.**>
 interface Configuration {
 	version {
-		major 0 
-		minor 1
+		major 4 
+		minor 0
 	}
 		<**	@description : This method returns the API version .**>
 	method getVersion {
diff --git a/api/franca/navigation/navigationcore/NavigationCoreSession.fidl b/api/franca/navigation/navigationcore/NavigationCoreSession.fidl
index 5d4b029..7c45f36 100644
--- a/api/franca/navigation/navigationcore/NavigationCoreSession.fidl
+++ b/api/franca/navigation/navigationcore/NavigationCoreSession.fidl
@@ -13,8 +13,8 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 <** @description : This interface offers methods that implement the navigation core session functionality of a navigation system.**>
 interface NavigationCoreSession {
 	version {
-		major 0 
-		minor 1
+		major 4 
+		minor 0
 	}
 
 	<**	@description : This method returns the API version .**>
diff --git a/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
index 5ad0d0b..636d526 100644
--- a/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
+++ b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
@@ -9,6 +9,11 @@ import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 
 typeCollection NavigationCoreTypes {
+	version {
+		major 4 
+		minor 0
+	}
+
  	enumeration TimeStampedEnum extends BasicEnum { //Base 0x0010
 		TIMESTAMP	= 16
 	}
diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl
index 590e4a9..ec9aacc 100644
--- a/api/franca/navigation/navigationcore/Routing.fidl
+++ b/api/franca/navigation/navigationcore/Routing.fidl
@@ -17,7 +17,7 @@ import org.genivi.navigation.navigationcore.NavigationCoreTypes.* from "Navigati
 

 interface Routing {

 	version {

-		major 1 

+		major 4 

 		minor 0

 	}

 

@@ -142,6 +142,7 @@ interface Routing {
 		START_OFFSET			= 335

 		INTERMEDIATE_POINTS		= 288

         HIGHWAY_EXIT			= 116

+        SPEED 					= 164

         ALL						= 65535

 	}

 	

diff --git a/api/franca/navigation/poiservice/ContentAccessModule.fidl b/api/franca/navigation/poiservice/ContentAccessModule.fidl
index 2e71653..a2256f5 100644
--- a/api/franca/navigation/poiservice/ContentAccessModule.fidl
+++ b/api/franca/navigation/poiservice/ContentAccessModule.fidl
@@ -14,8 +14,8 @@ import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.
 <** @description : This interface offers methods that implement the POI search functionality of a navigation system.**>

 interface POIContentAccessModule {

 	version {

-		major 0 

-		minor 1

+		major 4 

+		minor 0

 	}

 	

 	<**	@description : This method returns the API version implemented by the content access module.**>

diff --git a/api/franca/navigation/poiservice/POIConfiguration.fidl b/api/franca/navigation/poiservice/POIConfiguration.fidl
index 43ee539..bcad95b 100644
--- a/api/franca/navigation/poiservice/POIConfiguration.fidl
+++ b/api/franca/navigation/poiservice/POIConfiguration.fidl
@@ -14,8 +14,8 @@ import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.
 <** @description : This interface offers methods that implement the POI configuration functionality of a navigation system.**>
 interface POIConfiguration {
 	version {
-		major 0 
-		minor 1
+		major 4 
+		minor 0
 	}
 		<**	@description : This method returns the API version .**>
 	method getVersion {
diff --git a/api/franca/navigation/poiservice/POISearch.fidl b/api/franca/navigation/poiservice/POISearch.fidl
index fc0fef5..4fda51e 100644
--- a/api/franca/navigation/poiservice/POISearch.fidl
+++ b/api/franca/navigation/poiservice/POISearch.fidl
@@ -14,7 +14,7 @@ import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.
 <** @description : This interface offers methods that implement the POI search functionality of a navigation system.**>

 interface POISearch {

 	version {

-		major 1 

+		major 4 

 		minor 0

 	}

 	<**	@description : This method returns the API version implemented by the content access module.**>

diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl
index b5769ea..a57f27d 100644
--- a/api/franca/navigation/poiservice/POIServiceTypes.fidl
+++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl
@@ -11,8 +11,8 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 

 typeCollection POIServiceTypes {

 	version {

-		 major 0 

-		 minor 1 

+		 major 4 

+		 minor 0 

 	}

 	

    <** @description:Unique ID for a POI results**>

diff --git a/api/franca/navigation/poiservice/ServiceContentAccess.fidl b/api/franca/navigation/poiservice/ServiceContentAccess.fidl
index bad62c2..29101a3 100644
--- a/api/franca/navigation/poiservice/ServiceContentAccess.fidl
+++ b/api/franca/navigation/poiservice/ServiceContentAccess.fidl
@@ -13,7 +13,7 @@ import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.
 <** @description : This interface offers a set of common methods for Content Access Modules (CAM). The CAM provide and update POI and categories information from remote sources to the POIService modules.**>

 interface POIContentAccess {

 	version {

-		major 1 

+		major 4 

 		minor 0

 	}

     <** @description : Register to the POI provider module