diff options
-rwxr-xr-x | src/appMain/hmi_capabilities.json | 56 | ||||
-rw-r--r-- | src/components/application_manager/src/hmi_capabilities_impl.cc | 6 | ||||
-rw-r--r-- | src/components/interfaces/HMI_API.xml | 23 | ||||
m--------- | tools/rpc_spec | 0 |
4 files changed, 52 insertions, 33 deletions
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json index 417135fcb6..99a2e4c0cc 100755 --- a/src/appMain/hmi_capabilities.json +++ b/src/appMain/hmi_capabilities.json @@ -10,169 +10,169 @@ "displayName": "GENERIC_DISPLAY", "textFields": [{ "name": "mainField1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mainField2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mainField3", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mainField4", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "statusBar", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mediaClock", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mediaTrack", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "alertText1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "alertText2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "alertText3", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "scrollableMessageBody", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "initialInteractionText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "navigationText1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "navigationText2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "ETA", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "totalDistance", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "navigationText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "audioPassThruDisplayText1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "audioPassThruDisplayText2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "sliderHeader", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "sliderFooter", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "notificationText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "menuName", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "secondaryText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "tertiaryText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "timeToDestination", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "turnText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "menuTitle", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 } diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index c5ab78ade5..b9ab340614 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -413,6 +413,12 @@ void InitCapabilities() { std::string("CID1SET"), hmi_apis::Common_CharacterSet::CID1SET)); character_set_enum.insert(std::make_pair( std::string("CID2SET"), hmi_apis::Common_CharacterSet::CID2SET)); + character_set_enum.insert(std::make_pair( + std::string("ASCII"), hmi_apis::Common_CharacterSet::ASCII)); + character_set_enum.insert(std::make_pair( + std::string("ISO_8859_1"), hmi_apis::Common_CharacterSet::ISO_8859_1)); + character_set_enum.insert(std::make_pair( + std::string("UTF_8"), hmi_apis::Common_CharacterSet::UTF_8)); video_streaming_protocol_enum.insert(std::make_pair( std::string("RAW"), hmi_apis::Common_VideoStreamingProtocol::RAW)); diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index 02d62154f0..7c293ed858 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -1488,16 +1488,25 @@ <enum name="CharacterSet"> <description>The list of potential character sets</description> <element name="TYPE2SET"> - <description>See [@TODO: create file ref]</description> + <description>Note that this element is deprecated in the MOBILE API</description> </element> <element name="TYPE5SET"> - <description>See [@TODO: create file ref]</description> + <description>Note that this element is deprecated in the MOBILE API</description> </element> <element name="CID1SET"> - <description>See [@TODO: create file ref]</description> + <description>Note that this element is deprecated in the MOBILE API</description> </element> <element name="CID2SET"> - <description>See [@TODO: create file ref]</description> + <description>Note that this element is deprecated in the MOBILE API</description> + </element> + <element name="ASCII"> + <description>ASCII as defined in https://en.wikipedia.org/wiki/ASCII as defined in codes 0-127. Non-printable characters such as tabs and back spaces are ignored</description> + </element> + <element name="ISO_8859_1"> + <description>Latin-1, as defined in https://en.wikipedia.org/wiki/ISO/IEC_8859-1</description> + </element> + <element name="UTF_8"> + <description>The UTF-8 character set that uses variable bytes per code point. See https://en.wikipedia.org/wiki/UTF-8 for more details. This is the preferred character set</description> </element> </enum> @@ -2650,7 +2659,11 @@ <description>The name that identifies the field. See TextFieldName.</description> </param> <param name="characterSet" type="Common.CharacterSet" mandatory="true"> - <description>The character set that is supported in this field. See CharacterSet.</description> + <description> + The set of characters that are supported by this text field. + All text is sent in UTF-8 format, but not all systems may support all of the characters expressed by UTF-8. + All systems will support at least ASCII, but they may support more, either the LATIN-1 character set, or the full UTF-8 character set. + </description> </param> <param name="width" type="Integer" minvalue="1" maxvalue="500" mandatory="true"> <description>The number of characters in one row of this field.</description> diff --git a/tools/rpc_spec b/tools/rpc_spec -Subproject 117269e429c24a67bd1dd5ed10703f84fe1e58f +Subproject 082386d01f5277b293badfe9be989d454109b88 |