Feature/sdl 0269 new vehicle data climate data (#3586)

* Add new vehicle data ClimateData

* Temporary commit with link to rpc_spec fork

* Remove temporary commit

* Expand Temperature struct

* fixup! Expand Temperature struct

* Update link to rpc_spec

* Update link to rpc_spec

Co-authored-by: Dmitriy Boltovskiy <dboltovskyi@luxoft.com>

7 files changed, 104 insertions, 2 deletions

diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json
index dc6a615e82..1debd2918d 100644
--- a/src/appMain/sdl_preloaded_pt.json
+++ b/src/appMain/sdl_preloaded_pt.json
@@ -625,6 +625,7 @@
                             "deviceStatus",
                             "engineOilLife",
                             "engineTorque",
+                            "climateData",
                             "externalTemperature",
                             "turnSignal",
                             "fuelLevel",
@@ -652,6 +653,7 @@
                             "deviceStatus",
                             "engineOilLife",
                             "engineTorque",
+                            "climateData",
                             "externalTemperature",
                             "turnSignal",
                             "fuelLevel",
@@ -679,6 +681,7 @@
                             "deviceStatus",
                             "engineOilLife",
                             "engineTorque",
+                            "climateData",
                             "externalTemperature",
                             "turnSignal",
                             "fuelLevel",
@@ -705,6 +708,7 @@
                             "deviceStatus",
                             "engineOilLife",
                             "engineTorque",
+                            "climateData",
                             "externalTemperature",
                             "turnSignal",
                             "fuelLevel",
@@ -3480,12 +3484,71 @@
                     "since": "5.0"
                 },
                 {
+                    "name": "climateData",
+                    "params": [
+                        {
+                            "name": "externalTemperature",
+                            "key": "OEM_REF_EXT_TEMP",
+                            "params": [
+                                {
+                                    "name": "unit",
+                                    "key": "OEM_REF_EXT_TEMP_UNIT",
+                                    "type": "TemperatureUnit",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "value",
+                                    "key": "OEM_REF_EXT_TEMP_VALUE",
+                                    "type": "Float",
+                                    "mandatory": true
+                                }
+                            ],
+                            "type": "Struct",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "cabinTemperature",
+                            "key": "OEM_REF_CABIN_TEMP",
+                            "params": [
+                                {
+                                    "name": "unit",
+                                    "key": "OEM_REF_CABIN_TEMP_VALUE",
+                                    "type": "TemperatureUnit",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "value",
+                                    "key": "OEM_REF_CABIN_TEMP_VALUE",
+                                    "type": "Float",
+                                    "mandatory": true
+                                }
+                            ],
+                            "type": "Struct",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "atmosphericPressure",
+                            "key": "OEM_REF_ATMOSPHERIC_PRESSURE",
+                            "type": "Float",
+                            "minvalue": 0,
+                            "maxvalue": 2000,
+                            "mandatory": false
+                        }
+                    ],
+                    "key": "OEM_REF_CLIMATE_DATA",
+                    "type": "Struct",
+                    "mandatory": false,
+                    "since": "7.1"
+                },
+                {
                     "name": "externalTemperature",
                     "key": "OEM_REF_EXT_TEMP",
                     "type": "Float",
                     "mandatory": false,
                     "minvalue": -40,
-                    "maxvalue": 100
+                    "maxvalue": 100,
+                    "deprecated": true,
+                    "since": "7.1"
                 },
                 {
                     "name": "turnSignal",
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index bb5e08f6e2..07cc81c7aa 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -299,6 +299,7 @@ extern const char* fuel_level_state;
 extern const char* instant_fuel_consumption;
 extern const char* fuel_range;
 extern const char* cloud_app_vehicle_id;
+extern const char* climate_data;
 extern const char* external_temp;
 extern const char* turn_signal;
 extern const char* vin;
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index 9bf623d343..52a4afa974 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -183,6 +183,8 @@ std::pair<std::string, mobile_apis::VehicleDataType::eType>
         std::make_pair(
             strings::cloud_app_vehicle_id,
             mobile_apis::VehicleDataType::VEHICLEDATA_CLOUDAPPVEHICLEID),
+        std::make_pair(strings::climate_data,
+                       mobile_apis::VehicleDataType::VEHICLEDATA_CLIMATEDATA),
         std::make_pair(strings::external_temp,
                        mobile_apis::VehicleDataType::VEHICLEDATA_EXTERNTEMP),
         std::make_pair(strings::turn_signal,
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index a96c02f88f..20426355c1 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -266,6 +266,7 @@ const char* fuel_level_state = "fuelLevel_State";
 const char* instant_fuel_consumption = "instantFuelConsumption";
 const char* fuel_range = "fuelRange";
 const char* cloud_app_vehicle_id = "cloudAppVehicleID";
+const char* climate_data = "climateData";
 const char* external_temp = "externalTemperature";
 const char* turn_signal = "turnSignal";
 const char* vin = "vin";
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index 3ac14e4d54..1c700a82e8 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -1208,6 +1208,7 @@
   <element name="VEHICLEDATA_FUELLEVEL_STATE" />
   <element name="VEHICLEDATA_FUELCONSUMPTION" />
   <element name="VEHICLEDATA_EXTERNTEMP" />
+  <element name="VEHICLEDATA_CLIMATEDATA"/>
   <element name="VEHICLEDATA_VIN" />
   <element name="VEHICLEDATA_GEARSTATUS" />
   <element name="VEHICLEDATA_PRNDL" />
@@ -2241,7 +2242,7 @@
  </enum>
 
  <struct name="Temperature">
-    <param name="unit" type="TemperatureUnit" mandatory="true" >
+    <param name="unit" type="Common.TemperatureUnit" mandatory="true" >
       <description>Temperature Unit</description>
     </param>
     <param name="value" type="Float" mandatory="true" >
@@ -4356,6 +4357,18 @@
       </param>
     </struct>
 
+    <struct name="ClimateData">
+      <param name="externalTemperature" type="Common.Temperature" mandatory="false">
+        <description>The external temperature in degrees celsius</description>
+      </param>
+      <param name="cabinTemperature" type="Common.Temperature" mandatory="false">
+        <description>Internal ambient cabin temperature in degrees celsius</description>
+      </param>
+      <param name="atmosphericPressure" type="Float" minvalue="0" maxvalue="2000" mandatory="false">
+        <description>Current atmospheric pressure in mBar</description>
+      </param>
+    </struct>
+
     <struct name="GearStatus">
       <param name="userSelectedGear" type="Common.PRNDL" mandatory="false">
         <description>Gear position selected by the user i.e. Park, Drive, Reverse</description>
@@ -6314,6 +6327,9 @@
     <param name="externalTemperature" type="Boolean" mandatory="false">
       <description>The external temperature in degrees celsius</description>
     </param>
+    <param name="climateData" type="Boolean" mandatory="false">
+      <description>See ClimateData</description>
+    </param>
     <param name="turnSignal" type="Boolean" mandatory="false">
         <description>See TurnSignal</description>
     </param>
@@ -6425,6 +6441,9 @@
     <param name="externalTemperature" type="Common.VehicleDataResult" mandatory="false">
       <description>The external temperature in degrees celsius.</description>
     </param>
+    <param name="climateData" type="Common.VehicleDataResult" mandatory="false">
+      <description>See ClimateData</description>
+    </param>
     <param name="turnSignal" type="Common.VehicleDataResult" mandatory="false">
         <description>See TurnSignal</description>
     </param>
@@ -6539,6 +6558,9 @@
     <param name="externalTemperature" type="Boolean" mandatory="false">
       <description>The external temperature in degrees celsius.</description>
     </param>
+    <param name="climateData" type="Boolean" mandatory="false">
+      <description>See ClimateData</description>
+    </param>
     <param name="turnSignal" type="Boolean" mandatory="false">
         <description>See TurnSignal</description>
     </param>
@@ -6650,6 +6672,9 @@
     <param name="externalTemperature" type="Common.VehicleDataResult" mandatory="false">
       <description>The external temperature in degrees celsius</description>
     </param>
+    <param name="climateData" type="Common.VehicleDataResult" mandatory="false">
+      <description>See ClimateData</description>
+    </param>
     <param name="turnSignal" type="Common.VehicleDataResult" mandatory="false">
         <description>See TurnSignal</description>
     </param>
@@ -6762,6 +6787,9 @@
     <param name="externalTemperature" type="Boolean" mandatory="false">
       <description>The external temperature in degrees celsius</description>
     </param>
+    <param name="climateData" type="Boolean" mandatory="false">
+      <description>See ClimateData</description>
+    </param>
     <param name="turnSignal" type="Boolean" mandatory="false">
         <description>See TurnSignal</description>
     </param>
@@ -6876,6 +6904,9 @@
     <param name="externalTemperature" type="Float" minvalue="-40" maxvalue="100" mandatory="false">
       <description>The external temperature in degrees celsius</description>
     </param>
+    <param name="climateData" type="Common.ClimateData" mandatory="false">
+      <description>See ClimateData</description>
+    </param>
     <param name="turnSignal" type="Common.TurnSignal" mandatory="false">
         <description>See TurnSignal</description>
     </param>
@@ -6991,6 +7022,9 @@
     <param name="externalTemperature" type="Float" minvalue="-40" maxvalue="100" mandatory="false">
       <description>The external temperature in degrees celsius</description>
     </param>
+    <param name="climateData" type="Common.ClimateData" mandatory="false">
+      <description>See ClimateData</description>
+    </param>
     <param name="turnSignal" type="Common.TurnSignal" mandatory="false">
         <description>See TurnSignal</description>
     </param>
diff --git a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
index a5aa36f371..0e643acd84 100644
--- a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
+++ b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
@@ -25,6 +25,7 @@
         <element name="gps" />
         <element name="speed" />
         <element name="engineTorque" />
+        <element name="climateData" />
         <element name="externalTemperature" />
         <element name="turnSignal" />
         <element name="fuelLevel" />
diff --git a/tools/rpc_spec b/tools/rpc_spec
-Subproject 390394de357d3f097aef33ead9d17ef0f4c3d34
+Subproject 132dd9123ce3fc171a8f15bd9833bbcff0ed396