Enhance BodyInformation vehicle data

2 files changed, 84 insertions, 9 deletions

diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json
index eff433fd1e..78965b705b 100644
--- a/src/appMain/sdl_preloaded_pt.json
+++ b/src/appMain/sdl_preloaded_pt.json
@@ -3859,25 +3859,63 @@
                             "name": "driverDoorAjar",
                             "key": "OEM_REF_DR_DOOR_AJ",
                             "type": "Boolean",
-                            "mandatory": false
+                            "mandatory": false,
+                            "deprecated": true,
+                            "since": "7.1"
                         },
                         {
                             "name": "passengerDoorAjar",
                             "key": "OEM_REF_PAS_DOOR_AJ",
                             "type": "Boolean",
-                            "mandatory": false
+                            "mandatory": false,
+                            "deprecated": true,
+                            "since": "7.1"
                         },
                         {
                             "name": "rearLeftDoorAjar",
                             "key": "OEM_REF_REAR_LEFT_DOOR_AJ",
                             "type": "Boolean",
-                            "mandatory": false
+                            "mandatory": false,
+                            "deprecated": true,
+                            "since": "7.1"
                         },
                         {
                             "name": "rearRightDoorAjar",
                             "key": "OEM_REF_REAR_RIGHT_DOOR_AJ",
                             "type": "Boolean",
-                            "mandatory": false
+                            "mandatory": false,
+                            "deprecated": true,
+                            "since": "7.1"
+                        },
+                        {
+                            "name": "doorStatuses",
+                            "key": "OEM_REF_DOOR_STATUSES",
+                            "array": true,
+                            "type": "DoorStatus",
+                            "mandatory": false,
+                            "minsize": 0,
+                            "maxsize": 100,
+                            "since": "7.1"
+                        },
+                        {
+                            "name": "gateStatuses",
+                            "key": "OEM_REF_GATE_STATUSES",
+                            "array": true,
+                            "type": "GateStatus",
+                            "mandatory": false,
+                            "minsize": 0,
+                            "maxsize": 100,
+                            "since": "7.1"
+                        },
+                        {
+                            "name": "roofStatuses",
+                            "key": "OEM_REF_ROOF_STATUSES",
+                            "array": true,
+                            "type": "RoofStatus",
+                            "mandatory": false,
+                            "minsize": 0,
+                            "maxsize": 100,
+                            "since": "7.1"
                         }
                     ],
                     "key": "OEM_REF_BODY_INF",
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index a9ad0792ec..9090957a6f 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -1741,7 +1741,6 @@
 <!-- End of Policies -->
 
 <!-- Remote Control -->
-
 <struct name="Grid">
     <description>Describes a location (origin coordinates and span) of a vehicle component.</description>
     <param name="col" type="Integer" mandatory="true" minvalue="-1" maxvalue="100">
@@ -3334,6 +3333,35 @@
 	</param>
 </struct>
 
+<enum name="DoorStatusType">
+  <element name="CLOSED"/>
+  <element name="LOCKED"/>
+  <element name="AJAR"/>
+  <element name="REMOVED"/>
+</enum>
+
+<struct name="DoorStatus">
+  <description>Describes the status of a parameter of door.</description>
+  <param name="location" type="Common.Grid" mandatory="true"/>
+  <param name="status" type="Common.DoorStatusType" mandatory="true"/>
+</struct>
+
+<struct name="GateStatus">
+  <description>Describes the status of a parameter of trunk/hood/etc.</description>
+  <param name="location" type="Common.Grid" mandatory="true"/>
+  <param name="status" type="Common.DoorStatusType" mandatory="true"/>
+</struct>
+
+<struct name="RoofStatus">
+  <description>
+    Describes the status of a parameter of roof, convertible roof, sunroof/moonroof etc.
+    If roof is open (AJAR), state will determine percentage of roof open.
+  </description>
+  <param name="location" type="Common.Grid" mandatory="true"/>
+  <param name="status" type="Common.DoorStatusType" mandatory="true"/>
+  <param name="state" type="Common.WindowState" mandatory="false"/>
+</struct>
+
 <struct name="BodyInformation">
   <param name="parkBrakeActive" type="Boolean" mandatory="true">
     <description>Must be true if the park brake is active</description>
@@ -3345,16 +3373,25 @@
     <description>The status of the ignition. See IgnitionStatus.</description>
   </param>
   <param name="driverDoorAjar" type="Boolean" mandatory="false">
-    <description>References signal "DrStatDrv_B_Actl".</description>
+    <description>References signal "DrStatDrv_B_Actl". Deprecated starting with RPC Spec 7.1.0.</description>
   </param>
   <param name="passengerDoorAjar" type="Boolean" mandatory="false">
-    <description>References signal "DrStatPsngr_B_Actl".</description>
+    <description>References signal "DrStatPsngr_B_Actl". Deprecated starting with RPC Spec 7.1.0.</description>
   </param>
   <param name="rearLeftDoorAjar" type="Boolean" mandatory="false">
-    <description>References signal "DrStatRl_B_Actl".</description>
+    <description>References signal "DrStatRl_B_Actl". Deprecated starting with RPC Spec 7.1.0.</description>
   </param>
   <param name="rearRightDoorAjar" type="Boolean" mandatory="false">
-    <description>References signal "DrStatRr_B_Actl".</description>
+    <description>References signal "DrStatRr_B_Actl". Deprecated starting with RPC Spec 7.1.0.</description>
+  </param>
+  <param name="doorStatuses" type="Common.DoorStatus" array="true" minsize="0" maxsize="100" mandatory="false">
+    <description>Provides status for doors if Ajar/Closed/Locked</description>
+  </param>
+  <param name="gateStatuses" type="Common.GateStatus" array="true" minsize="0" maxsize="100" mandatory="false">
+    <description>Provides status for trunk/hood/etc. if Ajar/Closed/Locked</description>
+  </param>
+  <param name="roofStatuses" type="Common.RoofStatus" array="true" minsize="0" maxsize="100" mandatory="false">
+    <description>Provides status for roof/convertible roof/sunroof/moonroof etc., if Closed/Ajar/Removed etc.</description>
   </param>
 </struct>