diff options
| -rw-r--r-- | src/3rd_party/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/appMain/sdl_preloaded_pt.json | 40 | ||||
| -rw-r--r-- | src/components/interfaces/HMI_API.xml | 98 | ||||
| m--------- | tools/rpc_spec | 0 |
4 files changed, 109 insertions, 32 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index 4415a1bd7b..0fdc0ba013 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -235,7 +235,8 @@ if (NOT ${Boost_FOUND}) include(ExternalProject) ExternalProject_Add( Boost - URL https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz + URL https://mirror.bazel.build/dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz + URL_HASH SHA256=da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf DOWNLOAD_DIR ${BOOST_LIB_SOURCE_DIRECTORY} SOURCE_DIR ${BOOST_LIB_SOURCE_DIRECTORY} CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=system,thread,date_time,filesystem,regex --prefix=${3RD_PARTY_INSTALL_PREFIX} diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json index 4f97d90b09..a325eacbff 100644 --- a/src/appMain/sdl_preloaded_pt.json +++ b/src/appMain/sdl_preloaded_pt.json @@ -3334,13 +3334,17 @@ "type": "Float", "mandatory": false, "minvalue": -6, - "maxvalue": 106 + "maxvalue": 106, + "deprecated": true, + "since": "7.0" }, { "name": "fuelLevel_State", "key": "OEM_REF_FUEL_LEV_ST", "type": "ComponentVolumeStatus", - "mandatory": false + "mandatory": false, + "deprecated": true, + "since": "7.0" }, { "name": "instantFuelConsumption", @@ -3366,6 +3370,38 @@ "mandatory": false, "minvalue": 0, "maxvalue": 10000 + }, + { + "name": "level", + "key": "OEM_REF_FUEL_RAN_LVL", + "type": "Float", + "minvalue": -6, + "maxvalue": 1000000, + "mandatory": false, + "since": "7.0" + }, + { + "name": "levelState", + "key": "OEM_REF_FUEL_RAN_LVL_STATE", + "type": "ComponentVolumeStatus", + "mandatory": false, + "since": "7.0" + }, + { + "name": "capacity", + "key": "OEM_REF_FUEL_RAN_CAP", + "type": "Float", + "minvalue": 0, + "maxvalue": 1000000, + "mandatory": false, + "since": "7.0" + }, + { + "name": "capacityUnit", + "key": "OEM_REF_FUEL_RAN_CAP_UNIT", + "type": "CapacityUnit", + "mandatory": false, + "since": "7.0" } ], "key": "OEM_REF_FUEL_RAN", diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index b40076e9d0..65a5c881a1 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -79,6 +79,12 @@ </element> </enum> +<enum name="CapacityUnit"> + <element name="LITERS" /> + <element name="KILOWATTHOURS" /> + <element name="KILOGRAMS" /> +</enum> + <enum name="PredefinedWindows"> <element name="DEFAULT_WINDOW" value="0"> <description>The default window is a main window pre-created on behalf of the app.</description> @@ -856,14 +862,6 @@ </element> </enum> -<struct name="FuelRange"> - <param name="type" type="Common.FuelType" mandatory="false"/> - <param name="range" type="Float" minvalue="0" maxvalue="10000" mandatory="false"> - <description> - The estimate range in KM the vehicle can travel based on fuel level and consumption. - </description> - </param> -</struct> <enum name="ComponentVolumeStatus"> <description>The volume status of a vehicle component.</description> @@ -887,6 +885,27 @@ </element> </enum> +<struct name="FuelRange"> + <param name="type" type="Common.FuelType" mandatory="false"/> + <param name="range" type="Float" minvalue="0" maxvalue="10000" mandatory="false"> + <description> + The estimate range in KM the vehicle can travel based on fuel level and consumption. + </description> + </param> + <param name="level" type="Float" minvalue="-6" maxvalue="1000000" mandatory="false"> + <description>The relative remaining capacity of this fuel type (percentage).</description> + </param> + <param name="levelState" type="Common.ComponentVolumeStatus" mandatory="false"> + <description>The fuel level state</description> + </param> + <param name="capacity" type="Float" minvalue="0" maxvalue="1000000" mandatory="false"> + <description>The absolute capacity of this fuel type.</description> + </param> + <param name="capacityUnit" type="Common.CapacityUnit" mandatory="false"> + <description>The unit of the capacity of this fuel type such as liters for gasoline or kWh for batteries.</description> + </param> +</struct> + <enum name="TPMS"> <element name="UNKNOWN"> <description>If set the status of the tire is not known.</description> @@ -5988,16 +6007,19 @@ <description>The number of revolutions per minute of the engine</description> </param> <param name="fuelLevel" type="Boolean" mandatory="false"> - <description>The fuel level in the tank (percentage)</description> + <description>The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="fuelLevel_State" type="Boolean" mandatory="false"> - <description>The fuel level state</description> + <description>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="instantFuelConsumption" type="Boolean" mandatory="false"> <description>The instantaneous fuel consumption in microlitres</description> </param> <param name="fuelRange" type="Boolean" mandatory="false"> - <description>The estimate range in KM the vehicle can travel based on fuel level and consumption</description> + <description> + The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. + See struct FuelRange for details. + </description> </param> <param name="externalTemperature" type="Boolean" mandatory="false"> <description>The external temperature in degrees celsius</description> @@ -6081,16 +6103,19 @@ <description>The number of revolutions per minute of the engine</description> </param> <param name="fuelLevel" type="Common.VehicleDataResult" mandatory="false"> - <description>The fuel level in the tank (percentage)</description> + <description>The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="fuelLevel_State" type="Common.VehicleDataResult" mandatory="false"> - <description>The fuel level state</description> + <description>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="instantFuelConsumption" type="Common.VehicleDataResult" mandatory="false"> <description>The instantaneous fuel consumption in microlitres</description> </param> <param name="fuelRange" type="Common.VehicleDataResult" mandatory="false"> - <description>The estimate range in KM the vehicle can travel based on fuel level and consumption</description> + <description> + The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. + See struct FuelRange for details. + </description> </param> <param name="externalTemperature" type="Common.VehicleDataResult" mandatory="false"> <description>The external temperature in degrees celsius.</description> @@ -6177,16 +6202,19 @@ <description>The number of revolutions per minute of the engine</description> </param> <param name="fuelLevel" type="Boolean" mandatory="false"> - <description>The fuel level in the tank (percentage)</description> + <description>The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="fuelLevel_State" type="Boolean" mandatory="false"> - <description>The fuel level state</description> + <description>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="instantFuelConsumption" type="Boolean" mandatory="false"> <description>The instantaneous fuel consumption in microlitres</description> </param> <param name="fuelRange" type="Boolean" mandatory="false"> - <description>The estimate range in KM the vehicle can travel based on fuel level and consumption</description> + <description> + The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. + See struct FuelRange for details. + </description> </param> <param name="externalTemperature" type="Boolean" mandatory="false"> <description>The external temperature in degrees celsius.</description> @@ -6270,16 +6298,19 @@ <description>The number of revolutions per minute of the engine</description> </param> <param name="fuelLevel" type="Common.VehicleDataResult" mandatory="false"> - <description>The fuel level in the tank (percentage)</description> + <description>The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="fuelLevel_State" type="Common.VehicleDataResult" mandatory="false"> - <description>The fuel level state</description> + <description>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="instantFuelConsumption" type="Common.VehicleDataResult" mandatory="false"> <description>The instantaneous fuel consumption in microlitres</description> </param> <param name="fuelRange" type="Common.VehicleDataResult" mandatory="false"> - <description>The estimate range in KM the vehicle can travel based on fuel level and consumption</description> + <description> + The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. + See struct FuelRange for details. + </description> </param> <param name="externalTemperature" type="Common.VehicleDataResult" mandatory="false"> <description>The external temperature in degrees celsius</description> @@ -6364,16 +6395,19 @@ <description>The number of revolutions per minute of the engine</description> </param> <param name="fuelLevel" type="Boolean" mandatory="false"> - <description>The fuel level in the tank (percentage)</description> + <description>The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="fuelLevel_State" type="Boolean" mandatory="false"> - <description>The fuel level state</description> + <description>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="instantFuelConsumption" type="Boolean" mandatory="false"> <description>The instantaneous fuel consumption in microlitres</description> </param> <param name="fuelRange" type="Boolean" mandatory="false"> - <description>The estimate range in KM the vehicle can travel based on fuel level and consumption</description> + <description> + The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. + See struct FuelRange for details. + </description> </param> <param name="externalTemperature" type="Boolean" mandatory="false"> <description>The external temperature in degrees celsius</description> @@ -6460,16 +6494,19 @@ <description>The number of revolutions per minute of the engine</description> </param> <param name="fuelLevel" type="Float" minvalue="-6" maxvalue="106" mandatory="false"> - <description>The fuel level in the tank (percentage)</description> + <description>The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="fuelLevel_State" type="Common.ComponentVolumeStatus" mandatory="false"> - <description>The fuel level state</description> + <description>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="instantFuelConsumption" type="Float" minvalue="0" maxvalue="25575" mandatory="false"> <description>The instantaneous fuel consumption in microlitres</description> </param> <param name="fuelRange" type="Common.FuelRange" minsize="0" maxsize="100" array="true" mandatory="false"> - <description>The estimate range in KM the vehicle can travel based on fuel level and consumption</description> + <description> + The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. + See struct FuelRange for details. + </description> </param> <param name="externalTemperature" type="Float" minvalue="-40" maxvalue="100" mandatory="false"> <description>The external temperature in degrees celsius</description> @@ -6557,16 +6594,19 @@ <description>The number of revolutions per minute of the engine</description> </param> <param name="fuelLevel" type="Float" minvalue="-6" maxvalue="106" mandatory="false"> - <description>The fuel level in the tank (percentage)</description> + <description>The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="fuelLevel_State" type="Common.ComponentVolumeStatus" mandatory="false"> - <description>The fuel level state</description> + <description>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange</description> </param> <param name="instantFuelConsumption" type="Float" minvalue="0" maxvalue="25575" mandatory="false"> <description>The instantaneous fuel consumption in microlitres</description> </param> <param name="fuelRange" type="Common.FuelRange" minsize="0" maxsize="100" array="true" mandatory="false"> - <description>The estimate range in KM the vehicle can travel based on fuel level and consumption</description> + <description> + The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. + See struct FuelRange for details. + </description> </param> <param name="externalTemperature" type="Float" minvalue="-40" maxvalue="100" mandatory="false"> <description>The external temperature in degrees celsius</description> diff --git a/tools/rpc_spec b/tools/rpc_spec -Subproject 53e3dfb3cd7ff75a3425312ae4aeb758a1e0fc5 +Subproject 49247bf3cd55aa46f10ab4d3abb21e1b2d340a2 |