From b0b9dcd407b493079ba97db14505cf49a688ec3d Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Tue, 13 Sep 2016 10:59:41 +0200 Subject: add error management into Franca files, change code and scripts, test OK --- api/franca/CMakeLists.txt | 2 +- api/franca/hmi/CMakeLists.txt | 8 ++ api/franca/hmi/speechservice/CMakeLists.txt | 8 ++ api/franca/navigation/CMakeLists.txt | 8 ++ .../freetextsearchservice/CMakeLists.txt | 8 ++ api/franca/navigation/mapviewer/CMakeLists.txt | 8 ++ .../navigation/mapviewer/MapViewerControl.fidl | 20 ++-- api/franca/navigation/mapviewer/Session.fidl | 20 ++-- .../navigation/navigationcore/CMakeLists.txt | 8 ++ api/franca/navigation/navigationcore/Guidance.fidl | 29 +++--- .../navigation/navigationcore/LocationInput.fidl | 19 ++-- .../navigationcore/MapMatchedPosition.fidl | 21 ++--- api/franca/navigation/navigationcore/Routing.fidl | 103 ++++++++++++--------- api/franca/navigation/navigationcore/Session.fidl | 20 ++-- api/franca/navigation/poiservice/CMakeLists.txt | 8 ++ 15 files changed, 175 insertions(+), 115 deletions(-) (limited to 'api') diff --git a/api/franca/CMakeLists.txt b/api/franca/CMakeLists.txt index ee3c795..51fbac0 100644 --- a/api/franca/CMakeLists.txt +++ b/api/franca/CMakeLists.txt @@ -32,7 +32,7 @@ option(COMMONAPI_DBUS_TOOL_DIR get_directory_property(hasParent PARENT_DIRECTORY) if(hasParent) - set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen" PARENT_SCOPE) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) else() set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") endif() diff --git a/api/franca/hmi/CMakeLists.txt b/api/franca/hmi/CMakeLists.txt index 5da841e..b3c4af8 100644 --- a/api/franca/hmi/CMakeLists.txt +++ b/api/franca/hmi/CMakeLists.txt @@ -24,4 +24,12 @@ cmake_minimum_required (VERSION 2.8.1) project(franca-hmi) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() + add_subdirectory(speechservice) diff --git a/api/franca/hmi/speechservice/CMakeLists.txt b/api/franca/hmi/speechservice/CMakeLists.txt index fb2dfd5..39dac66 100644 --- a/api/franca/hmi/speechservice/CMakeLists.txt +++ b/api/franca/hmi/speechservice/CMakeLists.txt @@ -24,6 +24,14 @@ cmake_minimum_required (VERSION 2.8.1) project(franca-speechoutput) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() + option(COMMONAPI_TOOL_DIR "Absolute path to CommonAPI tool" "") option(COMMONAPI_DBUS_TOOL_DIR diff --git a/api/franca/navigation/CMakeLists.txt b/api/franca/navigation/CMakeLists.txt index 44b854e..e910489 100644 --- a/api/franca/navigation/CMakeLists.txt +++ b/api/franca/navigation/CMakeLists.txt @@ -24,6 +24,14 @@ cmake_minimum_required (VERSION 2.8.1) project(franca-navigation) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() + add_subdirectory(freetextsearchservice) add_subdirectory(mapviewer) add_subdirectory(navigationcore) diff --git a/api/franca/navigation/freetextsearchservice/CMakeLists.txt b/api/franca/navigation/freetextsearchservice/CMakeLists.txt index ec1cb82..fdfd97f 100644 --- a/api/franca/navigation/freetextsearchservice/CMakeLists.txt +++ b/api/franca/navigation/freetextsearchservice/CMakeLists.txt @@ -24,6 +24,14 @@ cmake_minimum_required (VERSION 2.8.1) project(franca-freetextsearch) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() + option(COMMONAPI_TOOL_DIR "Absolute path to CommonAPI tool" "") option(COMMONAPI_DBUS_TOOL_DIR diff --git a/api/franca/navigation/mapviewer/CMakeLists.txt b/api/franca/navigation/mapviewer/CMakeLists.txt index 7e8049d..c861873 100644 --- a/api/franca/navigation/mapviewer/CMakeLists.txt +++ b/api/franca/navigation/mapviewer/CMakeLists.txt @@ -24,6 +24,14 @@ cmake_minimum_required (VERSION 2.8.1) project(franca-mapviewer) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() + option(COMMONAPI_TOOL_DIR "Absolute path to CommonAPI tool" "") option(COMMONAPI_DBUS_TOOL_DIR diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl index 2749ccb..a7df0c3 100755 --- a/api/franca/navigation/mapviewer/MapViewerControl.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl @@ -295,7 +295,6 @@ interface MapViewerControl { <** @description : createMapViewInstance = This method creates a new map instance - notify(MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES) is emitted if no more map view instance handles are available **> method createMapViewInstance { in { @@ -319,11 +318,14 @@ interface MapViewerControl { **> Handle mapViewInstanceHandle } + error { + OK + MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES //no more map view instance handles are available + } } <** @description : releaseMapViewInstance = This method releases (i.e. destroys) a given map instance. Only invisible map instances can be released - notify(MAPVIEWERCONTROL_ERROR_MAPVIEWINSTANCENOTAVAILABLE) is emitted if an application tries to delete a map view instance handle that is not available **> method releaseMapViewInstance { in { @@ -338,6 +340,10 @@ interface MapViewerControl { **> Handle mapViewInstanceHandle } + error { + OK + MAPVIEWERCONTROL_ERROR_MAPVIEWINSTANCENOTAVAILABLE //an application tries to delete a map view instance handle that is not available + } } <** @@ -1958,14 +1964,4 @@ interface MapViewerControl { SelectedMapElement [] selectedElements } } - - <** - @description : notify = This signal is emitted when something wrong occured when invoking the API - **> - broadcast notify { - out { - Notification notification - } - } - } \ No newline at end of file diff --git a/api/franca/navigation/mapviewer/Session.fidl b/api/franca/navigation/mapviewer/Session.fidl index 9fbe92e..7f38ecb 100644 --- a/api/franca/navigation/mapviewer/Session.fidl +++ b/api/franca/navigation/mapviewer/Session.fidl @@ -27,7 +27,6 @@ interface Session { } <** @description : createSession = This method creates a new session and retrieves a handle . - notify(SESSION_ERROR_NOMORESESSIONHANDLES) is emitted if no more session handles are available **> method createSession { in { @@ -43,16 +42,23 @@ interface Session { <** @description : sessionHandle **> Handle sessionHandle } + error { + OK + SESSION_ERROR_NOMORESESSIONHANDLES //no more session handles are available + } } <** @description : deleteSession = This method deletes a session and its associated resources . - notify(SESSION_ERROR_SESSIONNOTAVAILABLE) is emitted if an application tries to delete a session handle that is not available **> method deleteSession { in { <** @description : sessionHandle **> Handle sessionHandle } + error { + OK + SESSION_ERROR_SESSIONNOTAVAILABLE //an application tries to delete a session handle that is not available + } } <** @description : This method returns whether a given session handle is available or not (for example because it was deleted) .**> @@ -83,14 +89,4 @@ interface Session { Handle sessionHandle } } - - <** - @description : notify = This signal is emitted when something wrong occured when invoking the API - **> - broadcast notify { - out { - Notification notification - } - } - } diff --git a/api/franca/navigation/navigationcore/CMakeLists.txt b/api/franca/navigation/navigationcore/CMakeLists.txt index 91cc5cc..8a3a11b 100644 --- a/api/franca/navigation/navigationcore/CMakeLists.txt +++ b/api/franca/navigation/navigationcore/CMakeLists.txt @@ -24,6 +24,14 @@ cmake_minimum_required (VERSION 2.8.1) project(franca-navigationcore) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() + option(COMMONAPI_TOOL_DIR "Absolute path to CommonAPI tool" "") option(COMMONAPI_DBUS_TOOL_DIR diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl index e4c4f18..4e760e2 100644 --- a/api/franca/navigation/navigationcore/Guidance.fidl +++ b/api/franca/navigation/navigationcore/Guidance.fidl @@ -267,9 +267,12 @@ interface Guidance { <** @description : playVoiceManeuver = This method plays or repeats the last voice guidance - notify(GUIDANCE_ERROR_VOICENOTALLOWED) is emitted if the voice generation is inactive **> method playVoiceManeuver { + error { + OK + GUIDANCE_ERROR_VOICENOTALLOWED //the voice generation is inactive + } } <** @@ -333,7 +336,6 @@ interface Guidance { <** @description : getManeuversList = This method retrieves the list of next maneuvers - notify(GUIDANCE_ERROR_NOMANEUVER) is emitted in case there's no maneuver until the destination **> method getManeuversList { in { @@ -357,6 +359,10 @@ interface Guidance { Maneuver[] maneuversList } + error { + OK + GUIDANCE_ERROR_NOMANEUVER //there's no maneuver until the destination + } } <** @@ -379,7 +385,6 @@ interface Guidance { <** @description : skipNextManeuver = This method allows to jump behind the current maneuver - notify(GUIDANCE_ERROR_NOMANEUVER) is emitted in case there's no maneuver until the destination **> method skipNextManeuver { in { @@ -389,6 +394,10 @@ interface Guidance { **> Handle sessionHandle } + error { + OK + GUIDANCE_ERROR_NOMANEUVER //there's no maneuver until the destination + } } <** @@ -411,7 +420,6 @@ interface Guidance { <** @description : setVoiceGuidanceSettings = This method sets the voice guidance settings - notify(GUIDANCE_ERROR_VOICENOTALLOWED) is emitted if the voice generation is inactive **> method setVoiceGuidanceSettings { in { @@ -421,6 +429,10 @@ interface Guidance { **> PromptMode promptMode } + error { + OK + GUIDANCE_ERROR_VOICENOTALLOWED //the voice generation is inactive + } } <** @@ -535,13 +547,4 @@ interface Guidance { RouteChangedCause changeCause } } - - <** - @description : notify = This signal is emitted when something wrong occured when invoking the API - **> - broadcast notify { - out { - Notification notification - } - } } \ No newline at end of file diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl index 14f714d..1b57845 100644 --- a/api/franca/navigation/navigationcore/LocationInput.fidl +++ b/api/franca/navigation/navigationcore/LocationInput.fidl @@ -80,7 +80,6 @@ interface LocationInput { <** @description : createLocationInput = This method creates a new location input and retrieves a handle - notify(LOCATIONINPUT_ERROR_NOMORELOCATIONINPUTHANDLES) is emitted if no more location input handles are available **> method createLocationInput { in { @@ -97,11 +96,14 @@ interface LocationInput { **> LocationHandle locationInputHandle } + error { + OK + LOCATIONINPUT_ERROR_NOMORELOCATIONINPUTHANDLES //no more location input handles are available + } } <** @description : deleteLocationInput = This method deletes a location input and its associated resources - notify(LOCATIONINPUT_ERROR_LOCATIONINPUTNOTAVAILABLE) is emitted if an application tries to delete a location input handle that is not available **> method deleteLocationInput { in { @@ -116,6 +118,10 @@ interface LocationInput { **> LocationHandle locationInputHandle } + error { + OK + LOCATIONINPUT_ERROR_LOCATIONINPUTNOTAVAILABLE //an application tries to delete a location input handle that is not available + } } <** @@ -488,13 +494,4 @@ interface LocationInput { ValidationStatus [] validationStatusList } } - - <** - @description : notify = This signal is emitted when something wrong occured when invoking the API - **> - broadcast notify { - out { - Notification notification - } - } } \ No newline at end of file diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl index cd56c8d..82f52f9 100644 --- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl +++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl @@ -250,7 +250,6 @@ interface MapMatchedPosition { <** @description : getPosition = This method returns the current position - notify(MAPMATCHEDPOSITION_ERROR_NOPOSITION) is emitted if no position is available **> method getPosition { in { @@ -259,6 +258,10 @@ interface MapMatchedPosition { out { PositionItemDict position } + error { + OK + MAPMATCHEDPOSITION_ERROR_NOPOSITION //no position is available + } } <** @@ -278,8 +281,6 @@ interface MapMatchedPosition { <** @description : getCurrentAddress = This method returns the current address - notify(MAPMATCHEDPOSITION_ERROR_NOMAP) is emitted if no map is available - notify(MAPMATCHEDPOSITION_ERROR_OUTOFKNOWNMAP) is emitted if the vehicle is located in a position outside of the known map **> method getCurrentAddress { in { @@ -288,6 +289,11 @@ interface MapMatchedPosition { out { AddressItemDict address } + error { + OK + MAPMATCHEDPOSITION_ERROR_NOMAP //no map is available + MAPMATCHEDPOSITION_ERROR_OUTOFKNOWNMAP //the vehicle is located in a position outside of the known map + } } <** @@ -393,13 +399,4 @@ interface MapMatchedPosition { Int32 direction } } - - <** - @description : notify = This signal is emitted when something wrong occured when invoking the API - **> - broadcast notify { - out { - Notification notification - } - } } \ No newline at end of file diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index 03a741c..ddca1ff 100644 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl @@ -150,25 +150,25 @@ interface Routing { } enumeration RouteSegmentType extends BasicEnum { - LINK_ID = 320 //Base 0x0140 - START_LATITUDE = 321 - END_LATITUDE = 322 - START_LONGITUDE = 323 - END_LONGITUDE = 324 - START_ALTITUDE = 325 - END_ALTITUDE = 326 - ROAD_NAME = 327 - DISTANCE = 328 - TIME = 329 - MANEUVER = 330 - INSTRUCTION = 331 - BORDER_CROSSING = 332 - ADDITIONAL_INFORMATION = 333 - ROAD_NUMBER = 334 - START_OFFSET = 335 - INTERMEDIATE_POINTS = 288 - HIGHWAY_EXIT = 116 - SPEED = 164 + LINK_ID = 320 //value of type UInt8[], that represents a link-ID in a format whose interpretation is left to the navigationcore + START_LATITUDE = 321 //value of type Double, that expresses the latitude of the starting point in format %3.6f. Range [-90:+90]. Example: 48.053250 + END_LATITUDE = 322 //value idem of START_LATITUDE, it can be omitted, if it coincides with the latitude of the start point of the next segment + START_LONGITUDE = 323 //value of type Double, that expresses the longitude of the starting point in format %3.6f. Range [-180:+180]. Example: 8.321000 + END_LONGITUDE = 324 // + START_ALTITUDE = 325 // + END_ALTITUDE = 326 // + ROAD_NAME = 327 // + DISTANCE = 328 // + TIME = 329 // + MANEUVER = 330 // + INSTRUCTION = 331 // + BORDER_CROSSING = 332 // + ADDITIONAL_INFORMATION = 333 // + ROAD_NUMBER = 334 // + START_OFFSET = 335 // + INTERMEDIATE_POINTS = 288 // + HIGHWAY_EXIT = 116 // + SPEED = 164 // } //TODO: Incomplete @@ -180,6 +180,7 @@ interface Routing { Int32 int32Value Int16 int16Value UInt32 uInt32Value + UInt16 uInt16Value } map RouteSegment { @@ -205,7 +206,6 @@ interface Routing { <** @description : This method creates a route - notify(ROUTING_ERROR_NOMOREROUTEHANDLES) is emitted if no more routing handles are available **> method createRoute { in { @@ -222,12 +222,14 @@ interface Routing { **> Handle routeHandle } + error { + OK + ROUTING_ERROR_NOMOREROUTEHANDLES //no more routing handles are available + } } <** @description : This method deletes a route and its associated resources - notify(ROUTING_ERROR_ROUTENOTAVAILABLE) is emitted if an application tries to delete a route handle that is not available - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to delete a route which is not created manually (e.g. an alternative route calculated in the background) **> method deleteRoute { in { @@ -242,11 +244,15 @@ interface Routing { **> Handle routeHandle } + error { + OK + ROUTING_ERROR_ROUTENOTAVAILABLE //an application tries to delete a route handle that is not available + ROUTING_ERROR_OPERATIONNOTALLOWED //an application tries to delete a route which is not created manually (e.g. an alternative route calculated in the background) + } } <** @description : This method sets the cost model - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to set a cost model for a route which is not created manually (e.g. an alternative route calculated in the background) **> method setCostModel { in { @@ -266,6 +272,10 @@ interface Routing { **> CostModel costModel } + error { + OK + ROUTING_ERROR_OPERATIONNOTALLOWED // is emitted if an application tries to set a cost model for a route which is not created manually (e.g. an alternative route calculated in the background) + } } <** @@ -299,8 +309,6 @@ interface Routing { <** @description : This method sets a list of route preferences - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to set route preferences for a route which is not created manually (e.g. an alternative route calculated in the background) - notify(ROUTING_ERROR_ROUTEPREFERENCENOTSUPPORTED) is emitted if an application tries to set a route preference which is not supported (e.g. (USE,CRIME_AREA)). The preferences which are not supported are product dependent. **> method setRoutePreferences { in { @@ -324,6 +332,12 @@ interface Routing { ConditionPreference[] conditionPreferenceList } + error { + OK + ROUTING_ERROR_OPERATIONNOTALLOWED //an application tries to set route preferences for a route which is not created manually (e.g. an alternative route calculated in the background) + ROUTING_ERROR_ROUTEPREFERENCENOTSUPPORTED //an application tries to set a route preference which is not supported (e.g. (USE,CRIME_AREA)). The preferences which are not supported are product dependent. + + } } <** @@ -399,7 +413,6 @@ interface Routing { <** @description : This method sets a list of means of transportation that must be considered when calculating a route - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to set transportation means for a route which is not created manually (e.g. an alternative route calculated in the background) **> method setTransportationMeans { in { @@ -416,6 +429,10 @@ interface Routing { TransportationMeans[] transportationMeansList } + error { + OK + ROUTING_ERROR_OPERATIONNOTALLOWED //an application tries to set transportation means for a route which is not created manually (e.g. an alternative route calculated in the background) + } } <** @@ -445,7 +462,6 @@ interface Routing { <** @description : setExcludedAreas = This method sets the areas to be excluded when calculating a route - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to set excluded areas for a route which is not created manually (e.g. an alternative route calculated in the background) **> method setExcludedAreas { in { @@ -462,6 +478,10 @@ interface Routing { Polygon[] excludedAreas } + error { + OK + ROUTING_ERROR_OPERATIONNOTALLOWED //an application tries to set excluded areas for a route which is not created manually (e.g. an alternative route calculated in the background) + } } <** @@ -482,9 +502,6 @@ interface Routing { <** @description : setWaypoints = This method sets a list of waypoints - notify(ROUTING_ERROR_WAYPOINTCANNOTBECHANGED) is emitted when a client application tries to change the waypoints while the route guidance is active - notify(ROUTING_ERROR_TOOMANYWAYPOINTS) is emitted when a client application tries to set a number of waypoints that exceeds the system capabilities - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to set waypoints for a route which is not created manually (e.g. an alternative route calculated in the background) **> method setWaypoints { in { @@ -506,6 +523,12 @@ interface Routing { WayPoint[] waypointsList } + error { + OK + ROUTING_ERROR_WAYPOINTCANNOTBECHANGED //a client application tries to change the waypoints while the route guidance is active + ROUTING_ERROR_TOOMANYWAYPOINTS //a client application tries to set a number of waypoints that exceeds the system capabilities + ROUTING_ERROR_OPERATIONNOTALLOWED //an application tries to set waypoints for a route which is not created manually (e.g. an alternative route calculated in the background) + } } <** @@ -532,7 +555,6 @@ interface Routing { <** @description : calculateRoute = This method starts a route calculation - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to calculate a route which is not created manually (e.g. an alternative route calculated in the background) **> method calculateRoute { in { @@ -547,6 +569,10 @@ interface Routing { **> Handle routeHandle } + error { + OK + ROUTING_ERROR_OPERATIONNOTALLOWED //an application tries to calculate a route which is not created manually (e.g. an alternative route calculated in the background) + } } <** @@ -569,7 +595,6 @@ interface Routing { <** @description : calculateRoutes = This method allows a client to calculate alternative routes that differs from a list of already calculated routes - notify(ROUTING_ERROR_OPERATIONNOTALLOWED) is emitted if an application tries to calculate an alternative to a route which is not created manually (e.g. an alternative route calculated in the background) **> method calculateRoutes { in { @@ -583,6 +608,10 @@ interface Routing { out { Handle[] alternativeRoutesList } + error { + OK + ROUTING_ERROR_OPERATIONNOTALLOWED //an application tries to calculate an alternative to a route which is not created manually (e.g. an alternative route calculated in the background) + } } <** @@ -795,14 +824,4 @@ interface Routing { Handle[] routeHandlesList } } - - <** - @description : notify = This signal is emitted when something wrong occured when invoking the API - **> - broadcast notify { - out { - Notification notification - } - } - } \ No newline at end of file diff --git a/api/franca/navigation/navigationcore/Session.fidl b/api/franca/navigation/navigationcore/Session.fidl index 9da1b40..0898a12 100644 --- a/api/franca/navigation/navigationcore/Session.fidl +++ b/api/franca/navigation/navigationcore/Session.fidl @@ -27,7 +27,6 @@ interface Session { } <** @description : createSession = This method creates a new session and retrieves a handle . - notify(SESSION_ERROR_NOMORESESSIONHANDLES) is emitted if no more session handles are available **> method createSession { in { @@ -43,16 +42,23 @@ interface Session { <** @description : sessionHandle **> Handle sessionHandle } + error { + OK + SESSION_ERROR_NOMORESESSIONHANDLES //no more session handles are available + } } <** @description : deleteSession = This method deletes a session and its associated resources . - notify(SESSION_ERROR_SESSIONNOTAVAILABLE) is emitted if an application tries to delete a session handle that is not available **> method deleteSession { in { <** @description : sessionHandle **> Handle sessionHandle } + error { + OK + SESSION_ERROR_SESSIONNOTAVAILABLE //an application tries to delete a session handle that is not available + } } <** @description : This method returns whether a given session handle is available or not (for example because it was deleted) .**> @@ -83,14 +89,4 @@ interface Session { Handle sessionHandle } } - - <** - @description : notify = This signal is emitted when something wrong occured when invoking the API - **> - broadcast notify { - out { - Notification notification - } - } - } diff --git a/api/franca/navigation/poiservice/CMakeLists.txt b/api/franca/navigation/poiservice/CMakeLists.txt index 1323e47..154bd57 100644 --- a/api/franca/navigation/poiservice/CMakeLists.txt +++ b/api/franca/navigation/poiservice/CMakeLists.txt @@ -24,6 +24,14 @@ cmake_minimum_required (VERSION 2.8.1) project(franca-poiservice) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() + option(COMMONAPI_TOOL_DIR "Absolute path to CommonAPI tool" "") option(COMMONAPI_DBUS_TOOL_DIR -- cgit v1.2.1