Improve Franca interfaces: fixed problems with arrays and naming conflicts

3 files changed, 13 insertions, 11 deletions

diff --git a/enhanced-position-service/api/franca/EnhancedPosition.fidl b/enhanced-position-service/api/franca/EnhancedPosition.fidl
index 8b7bdba..342b072 100755
--- a/enhanced-position-service/api/franca/EnhancedPosition.fidl
+++ b/enhanced-position-service/api/franca/EnhancedPosition.fidl
@@ -31,15 +31,15 @@ interface EnhancedPosition {
 	**>

 	method GetPositionInfo {

             in {

-                <** @description : valuesToReturn = Bitmask obtained as result of a bitwise OR operation on the keys corresponding to the values to be returned **>

+                   <** @description : valuesToReturn = Bitmask obtained as result of a bitwise OR operation on the keys corresponding to the values to be returned **>

                    Bitmask valuesToReturn

                }

             out {

                 <** @description : timestamp = Timestamp of the acquisition of the position data [ms] **>

                 Timestamp timestamp 

                 <** @description : data = Position data **>

-                PositionInfo[] data

-            }

+                PositionInfo data

+                }

         }

 	

 	<**

@@ -51,8 +51,8 @@ interface EnhancedPosition {
                <** @description : timestamp = Timestamp of the acquisition of the satellite detail data [ms] **>

                Timestamp timestamp

                <** @description : satelliteInfo = satellite information **>

-               SatelliteInfo[] satelliteInfo

-           }

+               SatelliteInfo satelliteInfo

+               }

         }

 

 	<** @description : GetTime = This method returns UTC time and date.

diff --git a/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl b/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
index cdb66af..2c9566d 100755
--- a/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
+++ b/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
@@ -20,11 +20,11 @@ typeCollection EnhancedPositionServiceTypes {
         <** @description: version **>			

 	struct Version {

             <** @description : when the major changes, then backward compatibility with previous releases is not granted **>

-            UInt16 ^major

+            UInt16 maj

             <** @description : when the minor changes, then backward compatibility with previous releases is granted, but something changed in the implementation of the API (e.g. new methods may have been added) **>

-            UInt16 ^minor

+            UInt16 min

             <** @description : when the micro changes, then backward compatibility with previous releases is granted (bug fixes or documentation modifications) **>

-            UInt16 ^micro

+            UInt16 mic

             <** @description : release date (e.g. 21-06-2011) **>

             String date

 	}

@@ -32,6 +32,8 @@ typeCollection EnhancedPositionServiceTypes {
 	<** @description : Value = generic value (mapped to a dbus variant ('v') data type)**>

 	union Value {

             UInt64 uInt64Value

+            Double doubleValue

+            Float  floatValue

             String stringValue

 	}

 

diff --git a/enhanced-position-service/api/franca/PositionFeedback.fidl b/enhanced-position-service/api/franca/PositionFeedback.fidl
index 4700453..bab31a4 100755
--- a/enhanced-position-service/api/franca/PositionFeedback.fidl
+++ b/enhanced-position-service/api/franca/PositionFeedback.fidl
@@ -36,7 +36,7 @@ interface PositionFeedback {
 	**>

 	method SetPositionFeedback {

 		in {

-			PositionFeedback[] feedback

+			PositionFeedbackInfo feedback

 

 			<**

 				@description : timestamp = timestamp in ms

@@ -61,8 +61,8 @@ interface PositionFeedback {
           key = CLIMB, value = value of type ´i´, that expresses the inclination measured in degrees

           key = RELIABILTY_INDEX, value = value of type ´y´, that indicates the position feedabck reliabilty. It can assume values from 0 to 100

 	**>

-	map PositionFeedback {

-		PositionFeedbackKey to Value

+	map PositionFeedbackInfo {

+		PositionFeedbackType to Value

 	}

 

 }