diff options
| -rwxr-xr-x | src/appMain/hmi_capabilities.json | 12 | ||||
| -rw-r--r-- | src/components/interfaces/HMI_API.xml | 17 | ||||
| -rw-r--r-- | tools/intergen/test/test_hmi_interface.xml | 6 | ||||
| m--------- | tools/rpc_spec | 0 |
4 files changed, 7 insertions, 28 deletions
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json index 4266f40cf3..a3e8155f44 100755 --- a/src/appMain/hmi_capabilities.json +++ b/src/appMain/hmi_capabilities.json @@ -105,12 +105,6 @@ "rows": 1 }, { - "name": "navigationText", - "characterSet": "UTF_8", - "width": 500, - "rows": 1 - }, - { "name": "audioPassThruDisplayText1", "characterSet": "UTF_8", "width": 500, @@ -135,12 +129,6 @@ "rows": 1 }, { - "name": "notificationText", - "characterSet": "UTF_8", - "width": 500, - "rows": 1 - }, - { "name": "menuName", "characterSet": "UTF_8", "width": 500, diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index 1c700a82e8..68046005f6 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -634,6 +634,12 @@ <element name="phoneNumber"> <description> Optional phone number of intended location / establishment (if applicable) for SendLocation.</description> </element> + <element name="timeToDestination"> + <description>Optional time to destination field for ShowConstantTBT</description> + </element> + <element name="turnText"> + <description>Turn text for turnList parameter of UpdateTurnList</description> + </element> <element name="subtleAlertText1"> <description>The first line of the subtle alert text field; applies to `SubtleAlert` `alertText1`</description> </element> @@ -643,15 +649,6 @@ <element name="subtleAlertSoftButtonText"> <description>A text field in the soft button of a subtle alert; applies to `SubtleAlert` `softButtons`</description> </element> - <element name="timeToDestination"/> - <!-- TO DO to be removed --> - <element name="turnText"/> - <element name="navigationText"> - <description>Navigation text for UpdateTurnList.</description> - </element> - <element name="notificationText"> - <description>Text of notification to be displayed on screen.</description> - </element> </enum> <enum name="MetadataType"> @@ -3189,7 +3186,7 @@ <struct name="Turn"> <param name="navigationText" type="Common.TextFieldStruct" mandatory="false"> - <description>Uses navigationText from TextFieldStruct.</description> + <description>Describes the `Turn` using `TextFieldName` `turnText`</description> </param> <param name="turnIcon" type="Common.Image" mandatory="false"> </param> diff --git a/tools/intergen/test/test_hmi_interface.xml b/tools/intergen/test/test_hmi_interface.xml index 7573d35ef9..c5978c543c 100644 --- a/tools/intergen/test/test_hmi_interface.xml +++ b/tools/intergen/test/test_hmi_interface.xml @@ -456,9 +456,6 @@ <element name="totalDistance"> <description> Total distance to destination for navigation</description> </element> - <element name="navigationText"> - <description>Navigation text for UpdateTurnList.</description> - </element> <element name="audioPassThruDisplayText1"> <description> First line of text for audio pass thru</description> </element> @@ -471,9 +468,6 @@ <element name="sliderFooter"> <description> Footer text for slider</description> </element> - <element name="notificationText"> - <description>Text of notification to be displayed on screen.</description> - </element> <element name="menuName"> <description> Primary text for Choice</description> </element> diff --git a/tools/rpc_spec b/tools/rpc_spec -Subproject 132dd9123ce3fc171a8f15bd9833bbcff0ed396 +Subproject f8be1a712f87705ec9580ab607dd0a3c8e63715 |