diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-04-20 16:56:34 +0200 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-04-20 16:56:34 +0200 |
| commit | dd7740c3da7400d7e51544a686888441971ba4f0 (patch) | |
| tree | 822a1c0cae2884f250d92fdf7461633d54940ef9 /api | |
| parent | d475fb3b22d6dbc704f1208202f86a5393137537 (diff) | |
| download | poi-service-dd7740c3da7400d7e51544a686888441971ba4f0.tar.gz | |
GT-3501: Inconsistency of scaleID format
Diffstat (limited to 'api')
| -rw-r--r-- | api/franca/hmi/speechservice/SpeechOutput.fidl | 3 | ||||
| -rwxr-xr-x | api/franca/navigation/mapviewer/MapViewerControl.fidl | 12 | ||||
| -rw-r--r-- | api/map-viewer/genivi-mapviewer-mapviewercontrol.xml | 12 |
3 files changed, 12 insertions, 15 deletions
diff --git a/api/franca/hmi/speechservice/SpeechOutput.fidl b/api/franca/hmi/speechservice/SpeechOutput.fidl index be9cb40..98e94e1 100644 --- a/api/franca/hmi/speechservice/SpeechOutput.fidl +++ b/api/franca/hmi/speechservice/SpeechOutput.fidl @@ -28,9 +28,6 @@ interface SpeechOutput { } } - <** @description : Max length of a single prompt part. **> - const UInt32 MAX_CHUNK_LENGTH = 1024 - <** @description : String containing the prompt to play. **> typedef Chunk is String diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl index af090d0..e29af10 100755 --- a/api/franca/navigation/mapviewer/MapViewerControl.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl @@ -188,7 +188,7 @@ interface MapViewerControl { @description : struct generated for DBus argument GetScaleList_scaleList **> struct MapScale { - UInt16 scaleId + UInt8 scaleId UInt16 scaleValue MapScaleUnit unit UInt32 millimetersPerPixel @@ -877,7 +877,7 @@ interface MapViewerControl { Handle mapViewInstanceHandle <** - @description : scaleID = scale identifier. Range[0:256] + @description : scaleID = scale identifier. Range[0:255] **> UInt8 scaleID @@ -1120,9 +1120,9 @@ interface MapViewerControl { Handle mapViewInstanceHandle <** - @description : scaleID = scale identifier. Range[0:256] + @description : scaleID = scale identifier. Range[0:255] **> - UInt16 scaleID + UInt8 scaleID } } @@ -1186,7 +1186,7 @@ interface MapViewerControl { out { <** - @description : scaleID = scale identifier. Range[0:256] + @description : scaleID = scale identifier. Range[0:255] **> UInt8 scaleID @@ -1960,4 +1960,4 @@ interface MapViewerControl { SelectedMapElement [] selectedElements } } -}
\ No newline at end of file +} diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml index 261693a..6b4c65e 100644 --- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml +++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml @@ -595,7 +595,7 @@ </arg> <arg name="scaleID" type="y"> <doc> - <line>scaleID = scale identifier. Range[0:256]</line> + <line>scaleID = scale identifier. Range[0:255]</line> </doc> </arg> <arg name="isMinMax" type="i"> @@ -796,10 +796,10 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="scaleList" type="a(qqiu)" direction="out"> + <arg name="scaleList" type="a(yqiu)" direction="out"> <doc> <line>scaleList = array[struct(scaleId,scaleValue,scaleUnit,millimetersPerPixel)]</line> - <line>scaleId = scale identifier. Range [0:256]</line> + <line>scaleId = scale identifier. Range [0:255]</line> <line>scaleValue = scale value. It can assume values like 100, 200, 1000, ...</line> <line>scaleUnit = unit of measurement. It is an enum(INVALID,METER,KM,MILE,YARD,FOOT, ... )</line> <line>millimetersPerPixel = number indicating the number of millimeters per pixel</line> @@ -821,9 +821,9 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="scaleID" type="q" direction="in"> + <arg name="scaleID" type="y" direction="in"> <doc> - <line>scaleID = scale identifier. Range[0:256]</line> + <line>scaleID = scale identifier. Range[0:255]</line> </doc> </arg> </method> @@ -878,7 +878,7 @@ </arg> <arg name="scaleID" type="y" direction="out"> <doc> - <line>scaleID = scale identifier. Range[0:256]</line> + <line>scaleID = scale identifier. Range[0:255]</line> </doc> </arg> <arg name="isMinMax" type="i" direction="out"> |