Update fidl files (use franca 0.9.0)

4 files changed, 80 insertions, 81 deletions

diff --git a/enhanced-position-service/api/franca/EnhancedPosition.fidl b/enhanced-position-service/api/franca/EnhancedPosition.fidl
index 2ee69d6..f629ec5 100755
--- a/enhanced-position-service/api/franca/EnhancedPosition.fidl
+++ b/enhanced-position-service/api/franca/EnhancedPosition.fidl
@@ -37,10 +37,10 @@ interface EnhancedPosition {
 	**>

 	method GetData {

 		in {

-			PositioningDataKey[] valuesToReturn

+			DataType[] valuesToReturn

 		}

 		out {

-			PositioningData data

+			Data data

 		}

 	}

 

@@ -109,7 +109,7 @@ interface EnhancedPosition {
 	**>

 	broadcast PositionUpdate {

 		out {

-			PositionInfoKey[] changedValues

+			DataType[] changedValues

 		}

 	}

 

@@ -118,7 +118,7 @@ interface EnhancedPosition {
 	**>

 	broadcast RotationRateUpdate {

 		out {

-			RotationRateKey[] changedValues

+			RotationRateType[] changedValues

 		}

 	}

 

@@ -127,7 +127,7 @@ interface EnhancedPosition {
 	**>

 	broadcast AccuracyUpdate {

 		out {

-			AccuracyInfoKey[] changedValues

+			AccuracyInfoType[] changedValues

 		}

 	}

 

@@ -136,7 +136,7 @@ interface EnhancedPosition {
 	**>

 	broadcast SatelliteInfoUpdate {

 		out {

-			SatelliteInfoKey[] changedValues

+			SatelliteInfoType[] changedValues

 		}

 	}

 

diff --git a/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl b/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
index 0551393..1b692a2 100755
--- a/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
+++ b/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
@@ -14,12 +14,11 @@ typeCollection EnhancedPositionServiceTypes {
 	

 	<** @description : A template to generate a dbus 'v'.**>

 	union Value {

-		UInt32 uInt32Value

-		Float floatValue		

+		UInt32 uInt32Value	

 	}

 

 	enumeration BasicEnum {

-		INVALID = "0x0000"

+		INVALID = 0x0000

 	}

 	

     typedef Handle is UInt32

diff --git a/enhanced-position-service/api/franca/EnhancedPositionTypes.fidl b/enhanced-position-service/api/franca/EnhancedPositionTypes.fidl
index 22cb9ac..2d97075 100755
--- a/enhanced-position-service/api/franca/EnhancedPositionTypes.fidl
+++ b/enhanced-position-service/api/franca/EnhancedPositionTypes.fidl
@@ -18,30 +18,30 @@ typeCollection EnhancedPositionTypes {
 		 minor 1 
 	}
 	
-	enumeration PositioningDataKey extends BasicEnum {
-		TIMESTAMP       = "0x0001"
-		LATITUDE        = "0x0020"
-		LONGITUDE       = "0x0021"
-		ALTITUDE        = "0x0022"
-		HEADING         = "0x0030"
-		SPEED           = "0x0031"
-		CLIMB           = "0x0032"
-		ROLL_RATE       = "0x0060"
-		PITCH_RATE      = "0x0061"
-		YAW_RATE        = "0x0062"
-		PDOP            = "0x0080"
-		HDOP            = "0x0081"
-		VDOP            = "0x0082"
-		SIGMA_LATITUDE  = "0x0083"
-		SIGMA_LONGITUDE = "0x0084"
-		SIGMA_ALTITUDE  = "0x0085"
-		SIGMA_HEADING   = "0x0086"
-		ALL             = "0xffff"
+	enumeration DataType extends BasicEnum {
+		TIMESTAMP       = 0x0001
+		LATITUDE        = 0x0020
+		LONGITUDE       = 0x0021
+		ALTITUDE        = 0x0022
+		HEADING         = 0x0030
+		SPEED           = 0x0031
+		CLIMB           = 0x0032
+		ROLL_RATE       = 0x0060
+		PITCH_RATE      = 0x0061
+		YAW_RATE        = 0x0062
+		PDOP            = 0x0080
+		HDOP            = 0x0081
+		VDOP            = 0x0082
+		SIGMA_LATITUDE  = 0x0083
+		SIGMA_LONGITUDE = 0x0084
+		SIGMA_ALTITUDE  = 0x0085
+		SIGMA_HEADING   = 0x0086
+		ALL             = 0xffff
 	} 
 	
 	<**	  
        @description : PositioningData = array of tuples (key,value)
-	      key = enumeration PositioningDataKey
+	      key = enumeration DataType
           key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
           key = LATITUDE, value = value of type 'Double', that expresses the latitude of the current position. Range [-90:+90]. Example: 48.053250
           key = LONGITUDE, value = value of type 'Double', that expresses the longitude of the current position. Range [-180:+180]. Example: 8.324500
@@ -60,18 +60,18 @@ typeCollection EnhancedPositionTypes {
           key = SIGMA_ALTITUDE, value = value of type 'Double', that represents the standard deviation for altitude in m
           key = SIGMA_HEADING, value = value of type 'Double', that represents the standard deviation for altitude in degrees
     **>
-	map PositioningData {
-		PositioningDataKey to Value
+	map Data {
+		DataType to Value
 	}
 	
-	enumeration PositionInfoKey extends BasicEnum {
-		TIMESTAMP       = "0x0001"
-		LATITUDE        = "0x0020"
-		LONGITUDE       = "0x0021"
-		ALTITUDE        = "0x0022"
-		HEADING         = "0x0030"
-		SPEED           = "0x0031"
-		CLIMB           = "0x0032"
+	enumeration PositionInfoType extends BasicEnum {
+		TIMESTAMP       = 0x0001
+		LATITUDE        = 0x0020
+		LONGITUDE       = 0x0021
+		ALTITUDE        = 0x0022
+		HEADING         = 0x0030
+		SPEED           = 0x0031
+		CLIMB           = 0x0032
 	} 
 	
 	<**	  
@@ -86,42 +86,42 @@ typeCollection EnhancedPositionTypes {
           key = CLIMB, value = value of type 'Int32', that expresses the road gradient in degrees
     **>   
 	map PositionInfo {
-		PositionInfoKey to Value
+		PositionInfoType to Value
 	}
 	
-	enumeration RotationRateKey extends BasicEnum {
-		TIMESTAMP       = "0x0001"
-		ROLL_RATE       = "0x0060"
-		PITCH_RATE      = "0x0061"
-		YAW_RATE        = "0x0062"
+	enumeration RotationRateType extends BasicEnum {
+		TIMESTAMP       = 0x0001
+		ROLL_RATE       = 0x0060
+		PITCH_RATE      = 0x0061
+		YAW_RATE        = 0x0062
 	}
 	
 	<**	  
        @description : RotationRate = array of tuples (key,value)
-          key = enumeration RotationRateKey
+          key = enumeration RotationRateType
           key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
           key = ROLL_RATE, value = rotation rate around the X-axis in degrees/s. Range [-100:+100]
           key = PITCH_RATE, value = rotation rate around the Y-axis in degrees/s. Range [-100:+100]
           key = YAW_RATE, value = rotation rate around the Z-axis in degrees/s. Range [-100:+100]
     **>
 	map RotationRate {
-		RotationRateKey to Value
+		RotationRateType to Value
 	}
 	
-	enumeration AccuracyInfoKey extends BasicEnum {
-		TIMESTAMP       = "0x0001"
-		PDOP            = "0x0080"
-		HDOP            = "0x0081"
-		VDOP            = "0x0082"
-		SIGMA_LATITUDE  = "0x0083"
-		SIGMA_LONGITUDE = "0x0084"
-		SIGMA_ALTITUDE  = "0x0085"
-		SIGMA_HEADING   = "0x0086"
+	enumeration AccuracyInfoType extends BasicEnum {
+		TIMESTAMP       = 0x0001
+		PDOP            = 0x0080
+		HDOP            = 0x0081
+		VDOP            = 0x0082
+		SIGMA_LATITUDE  = 0x0083
+		SIGMA_LONGITUDE = 0x0084
+		SIGMA_ALTITUDE  = 0x0085
+		SIGMA_HEADING   = 0x0086
 	}	
 		
     <**	  
        @description : AccuracyInfo = array of tuples (key,value)
-          key = enumeration AccuracyInfoKey
+          key = enumeration AccuracyInfoType
           key = TIMESTAMP, value = value of type 't', that represents a timestamp in ms
           key = PDOP, value = value of type 'd', that represents the positional (3D) dilution of precision
           key = HDOP, value = value of type 'd', that represents the horizontal (2D) dilution of precision
@@ -132,15 +132,15 @@ typeCollection EnhancedPositionTypes {
           key = SIGMA_HEADING, value = value of type 'd', that represents the standard deviation for altitude in degrees
     **>    
 	map AccuracyInfo {
-		AccuracyInfoKey to Value
+		AccuracyInfoType to Value
 	}
 	
-	enumeration SatelliteInfoKey extends BasicEnum {
-	    TIMESTAMP           = "0x0001"
-	    USED_SATELLITES     = "0x00c0"
-	    TRACKED_SATELLITES  = "0x00c1"
-	    VISIBLE_SATELLITES  = "0x00c2"
-	    SATELLITE_DETAILS   = "0x00c3"
+	enumeration SatelliteInfoType extends BasicEnum {
+	    TIMESTAMP           = 0x0001
+	    USED_SATELLITES     = 0x00c0
+	    TRACKED_SATELLITES  = 0x00c1
+	    VISIBLE_SATELLITES  = 0x00c2
+	    SATELLITE_DETAILS   = 0x00c3
 	}
 	
 	struct SatelliteDetails {
@@ -153,7 +153,7 @@ typeCollection EnhancedPositionTypes {
 	
 	<**	
 	   @description : SatelliteInfo = array of tuples (key,value)
-          key = enumeration SatelliteInfoKey
+          key = enumeration SatelliteInfoType
           key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
           key = USED_SATELLITES, value = value of type 'UInt8', that represents the number of used satellites
           key = TRACKED_SATELLITES, value = value of type 'UInt8', that represents the number of tracked satellites 
@@ -164,13 +164,13 @@ typeCollection EnhancedPositionTypes {
                 Note: Later NMEA-0183 versions probably already have Galileo support 
     **>
 	map SatelliteInfo {
-		SatelliteInfoKey to Value
+		SatelliteInfoType to Value
 	}
 	
 	enumeration StatusKey extends BasicEnum {
-		TIMESTAMP       = "0x0001"
-		GNSS_FIX_STATUS = "0x0070"
-		DR_STATUS       = "0x0071"
+		TIMESTAMP       = 0x0001
+		GNSS_FIX_STATUS = 0x0070
+		DR_STATUS       = 0x0071
 	}
 	
     <**	  
@@ -184,20 +184,20 @@ typeCollection EnhancedPositionTypes {
 		StatusKey to Value
 	}
 	
-	enumeration TimeKey extends BasicEnum {
-		TIMESTAMP       = "0x0001"
-	    YEAR            = "0x00a0"
-	    MONTH           = "0x00a1"
-	    DAY             = "0x00a2"
-	    HOUR            = "0x00a3"
-	    MINUTE          = "0x00a4"
-	    SECOND          = "0x00a5"
-	    MS              = "0x00a6"
+	enumeration TimeInfoType extends BasicEnum {
+		TIMESTAMP       = 0x0001
+	    YEAR            = 0x00a0
+	    MONTH           = 0x00a1
+	    DAY             = 0x00a2
+	    HOUR            = 0x00a3
+	    MINUTE          = 0x00a4
+	    SECOND          = 0x00a5
+	    MS              = 0x00a6
 	}
 
     <**	  
        @description : TimeInfo = array of tuples (key,value)
-          key = enumeration TimeKey
+          key = enumeration TimeInfoType
           key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
           key = YEAR, value = value of type 'UInt16', 4 digits number that indicates the year. Example: 2012
           key = MONTH, value = value of type 'UInt8', 2 digits number that indicates the month. Example: 03 means March
@@ -208,7 +208,7 @@ typeCollection EnhancedPositionTypes {
           key = MS, value = value of type 'UInt16', 3 digits number that represents the milliseconds. Range [0:999]. Example: 007
 	**>
 	map TimeInfo {
-		TimeKey to Value
+		TimeInfoType to Value
 	}
 	
 }
diff --git a/enhanced-position-service/api/franca/PositionFeedback.fidl b/enhanced-position-service/api/franca/PositionFeedback.fidl
index 74ef704..73fc1e6 100755
--- a/enhanced-position-service/api/franca/PositionFeedback.fidl
+++ b/enhanced-position-service/api/franca/PositionFeedback.fidl
@@ -16,7 +16,7 @@ import org.genivi.positioning.EnhancedPositionService.EnhancedPositionServiceTyp
 	@description : PositionFeedback = This interface allows the application implementing the map-matching algorithm to provide a position feedback to the EnahncedPositionService

 **>

 

-interface org.genivi.positioning.EnhancedPositionService.PositionFeedback {

+interface PositionFeedback {

 	version {

 		major 0

 		minor 0