[SDL 0253] Feature/New vehicle data StabilityControlsStatus (#3304)

* Change rpc_spec url to fork

* Update Mobile API for the StabilityControlsStatus

* Update HMI API for the StabilityControlsStatus

Add StabilityControlsStatus for GetVehicleData,
SubscribeVehicleData, UnsubscribeVehicleData &
OnVehicleData RPCs

* Add new vehicle data StabilityControlsStatus

* Update the sdl_preloaded_pr.json file with the new schema item

These changes are not as necessary, but to keep project in consistent state,
they were added.

* Add StabilityControlsStatus to json test files

* fixup! Change rpc_spec url to fork

* Temporary commit to rpc_spec

Should be removed before merge

* Update src/appMain/sdl_preloaded_pt.json

Co-authored-by: Shobhit Adlakha <ShobhitAd@users.noreply.github.com>

* Update rpc_spec reference

Co-authored-by: sniukalov <sniukaov@luxoft.com>
Co-authored-by: Igor Gapchuk <igapchuck@luxoft.com>
Co-authored-by: Yevhenii <ydementieiev@luxoft.com>
Co-authored-by: Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com>
Co-authored-by: Shobhit Adlakha <ShobhitAd@users.noreply.github.com>

9 files changed, 90 insertions, 16 deletions

diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json
index a325eacbff..dbe134958c 100644
--- a/src/appMain/sdl_preloaded_pt.json
+++ b/src/appMain/sdl_preloaded_pt.json
@@ -587,7 +587,8 @@
                             "odometer",
                             "tirePressure",
                             "vin",
-                            "wiperStatus"
+                            "wiperStatus",
+                            "stabilityControlsStatus"
                         ]
                     },
                     "OnVehicleData": {
@@ -612,7 +613,8 @@
                             "odometer",
                             "tirePressure",
                             "vin",
-                            "wiperStatus"
+                            "wiperStatus",
+                            "stabilityControlsStatus"
                         ]
                     },
                     "SubscribeVehicleData": {
@@ -636,7 +638,8 @@
                             "cloudAppVehicleID",
                             "odometer",
                             "tirePressure",
-                            "wiperStatus"
+                            "wiperStatus",
+                            "stabilityControlsStatus"
                         ]
                     },
                     "UnsubscribeVehicleData": {
@@ -660,7 +663,8 @@
                             "cloudAppVehicleID",
                             "odometer",
                             "tirePressure",
-                            "wiperStatus"
+                            "wiperStatus",
+                            "stabilityControlsStatus"
                         ]
                     }
                 }
@@ -3944,6 +3948,27 @@
                     "since": "5.0"
                 },
                 {
+                    "name": "stabilityControlsStatus",
+                    "params": [
+                        {
+                            "name": "escSystem",
+                            "key": "OEM_REF_ESC_SYSTEM",
+                            "type": "VehicleDataStatus",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "trailerSwayControl",
+                            "key": "OEM_REF_TRAIL_SW_CTRL",
+                            "type": "VehicleDataStatus",
+                            "mandatory": false
+                        }
+                    ],
+                    "key": "OEM_REF_STAB_CTRLS_ST",
+                    "type": "Struct",
+                    "mandatory": false,
+                    "since": "7.0"
+                },
+                {
                     "name": "cloudAppVehicleID",
                     "key": "OEM_REF_CL_APP_VEH_ID",
                     "type": "String",
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 74cf37513b..f23e62832c 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
@@ -309,6 +309,7 @@ extern const char* head_lamp_status;
 extern const char* engine_torque;
 extern const char* acc_pedal_pos;
 extern const char* steering_wheel_angle;
+extern const char* stability_controls_status;
 extern const char* e_call_info;
 extern const char* airbag_status;
 extern const char* emergency_event;
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 2afecf037a..97fda4a6e3 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -211,6 +211,9 @@ std::pair<std::string, mobile_apis::VehicleDataType::eType>
         std::make_pair(
             strings::head_lamp_status,
             mobile_apis::VehicleDataType::VEHICLEDATA_HEADLAMPSTATUS),
+        std::make_pair(
+            strings::stability_controls_status,
+            mobile_apis::VehicleDataType::VEHICLEDATA_STABILITYCONTROLSSTATUS),
         std::make_pair(strings::e_call_info,
                        mobile_apis::VehicleDataType::VEHICLEDATA_ECALLINFO),
         std::make_pair(strings::airbag_status,
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index e0204fd6c7..bef092392d 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -276,6 +276,7 @@ const char* head_lamp_status = "headLampStatus";
 const char* engine_torque = "engineTorque";
 const char* acc_pedal_pos = "accPedalPosition";
 const char* steering_wheel_angle = "steeringWheelAngle";
+const char* stability_controls_status = "stabilityControlsStatus";
 const char* e_call_info = "eCallInfo";
 const char* airbag_status = "airbagStatus";
 const char* emergency_event = "emergencyEvent";
diff --git a/src/components/application_manager/test/sdl_preloaded_pt.json b/src/components/application_manager/test/sdl_preloaded_pt.json
index ad264c8518..e4818353d1 100644
--- a/src/components/application_manager/test/sdl_preloaded_pt.json
+++ b/src/components/application_manager/test/sdl_preloaded_pt.json
@@ -367,7 +367,8 @@
                         "odometer",
                         "tirePressure",
                         "vin",
-                        "wiperStatus"]
+                        "wiperStatus",
+                        "stabilityControlsStatus"]
                     },
                     "OnVehicleData": {
                         "hmi_levels": ["BACKGROUND",
@@ -388,7 +389,8 @@
                         "odometer",
                         "tirePressure",
                         "vin",
-                        "wiperStatus"]
+                        "wiperStatus",
+                        "stabilityControlsStatus"]
                     },
                     "SubscribeVehicleData": {
                         "hmi_levels": ["BACKGROUND",
@@ -408,7 +410,8 @@
                         "cloudAppVehicleID",
                         "odometer",
                         "tirePressure",
-                        "wiperStatus"]
+                        "wiperStatus",
+                        "stabilityControlsStatus"]
                     },
                     "UnsubscribeVehicleData": {
                         "hmi_levels": ["BACKGROUND",
@@ -428,7 +431,8 @@
                         "cloudAppVehicleID",
                         "odometer",
                         "tirePressure",
-                        "wiperStatus"]
+                        "wiperStatus",
+                        "stabilityControlsStatus"]
                     }
                 }
             },
diff --git a/src/components/application_manager/test/sdl_pt_update.json b/src/components/application_manager/test/sdl_pt_update.json
index aea3f7700b..205a962cc8 100644
--- a/src/components/application_manager/test/sdl_pt_update.json
+++ b/src/components/application_manager/test/sdl_pt_update.json
@@ -1610,7 +1610,8 @@
                      "odometer",
                      "tirePressure",
                      "vin",
-                     "wiperStatus"
+                     "wiperStatus",
+                     "stabilityControlsStatus"
                   ]
                },
                "OnVehicleData" : {
@@ -1629,7 +1630,8 @@
                      "odometer",
                      "tirePressure",
                      "vin",
-                     "wiperStatus"
+                     "wiperStatus",
+                     "stabilityControlsStatus"
                   ]
                },
                "SubscribeVehicleData" : {
@@ -1647,7 +1649,8 @@
                      "cloudAppVehicleID",
                      "odometer",
                      "tirePressure",
-                     "wiperStatus"
+                     "wiperStatus",
+                     "stabilityControlsStatus"
                   ]
                },
                "UnsubscribeVehicleData" : {
@@ -1665,7 +1668,8 @@
                      "cloudAppVehicleID",
                      "odometer",
                      "tirePressure",
-                     "wiperStatus"
+                     "wiperStatus",
+                     "stabilityControlsStatus"
                   ]
                }
             },
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index 65a5c881a1..5d207a7fa0 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -1181,6 +1181,7 @@
   <element name="VEHICLEDATA_ELECTRONICPARKBRAKESTATUS" />
   <element name="VEHICLEDATA_CLOUDAPPVEHICLEID" />
   <element name="VEHICLEDATA_OEM_CUSTOM_DATA" />
+  <element name="VEHICLEDATA_STABILITYCONTROLSSTATUS" />
 </enum>
 
 <enum name="WiperStatus">
@@ -3240,6 +3241,15 @@
   </param>
 </struct>
 
+<struct name="StabilityControlsStatus">
+	<param name="escSystem" type="Common.VehicleDataStatus" mandatory="false">
+		<description>true if vehicle stability control is ON, else false</description>
+	</param>
+	<param name="trailerSwayControl" type="Common.VehicleDataStatus" mandatory="false">
+		<description>true if vehicle trailer sway control is ON, else false</description>
+	</param>
+</struct>
+
 <struct name="BodyInformation">
   <param name="parkBrakeActive" type="Boolean" mandatory="true">
     <description>Must be true if the park brake is active</description>
@@ -6072,6 +6082,9 @@
     <param name="cloudAppVehicleID" type="Boolean" mandatory="false">
       <description>Parameter used by cloud apps to identify a head unit</description>
     </param>
+    <param name="stabilityControlsStatus" type="Boolean" mandatory="false">
+	    <description>See StabilityControlsStatus</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Boolean" mandatory="false">
@@ -6168,6 +6181,9 @@
     <param name="cloudAppVehicleID" type="Common.VehicleDataResult" mandatory="false">
       <description>Parameter used by cloud apps to identify a head unit</description>
     </param>
+    <param name="stabilityControlsStatus" type="Common.VehicleDataResult" mandatory="false">
+	    <description>See StabilityControlsStatus</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Common.VehicleDataResult" mandatory="false">
@@ -6267,6 +6283,9 @@
     <param name="cloudAppVehicleID" type="Boolean" mandatory="false">
       <description>Parameter used by cloud apps to identify a head unit</description>
     </param>
+    <param name="stabilityControlsStatus" type="Boolean" mandatory="false">
+	    <description>See StabilityControlsStatus</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Boolean" mandatory="false">
@@ -6363,6 +6382,9 @@
     <param name="cloudAppVehicleID" type="Common.VehicleDataResult" mandatory="false">
       <description>Parameter used by cloud apps to identify a head unit</description>
     </param>
+    <param name="stabilityControlsStatus" type="Common.VehicleDataResult" mandatory="false">
+	    <description>See StabilityControlsStatus</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Common.VehicleDataResult" mandatory="false">
@@ -6463,6 +6485,9 @@
     <param name="cloudAppVehicleID" type="Boolean" mandatory="false">
       <description>Parameter used by cloud apps to identify a head unit</description>
     </param>
+    <param name="stabilityControlsStatus" type="Boolean" mandatory="false">
+	    <description>See StabilityControlsStatus</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Boolean" mandatory="false">
@@ -6562,6 +6587,9 @@
     <param name="cloudAppVehicleID" type="String" mandatory="false">
       <description>Parameter used by cloud apps to identify a head unit</description>
     </param>
+    <param name="stabilityControlsStatus" type="Common.StabilityControlsStatus" mandatory="false">
+	    <description>See StabilityControlsStatus</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Common.ECallInfo" mandatory="false">
@@ -6662,6 +6690,9 @@
     <param name="engineOilLife" type="Float" minvalue="0" maxvalue="100" mandatory="false">
       <description>The estimated percentage of remaining oil life of the engine.</description>
     </param>
+    <param name="stabilityControlsStatus" type="Common.StabilityControlsStatus" mandatory="false">
+	    <description>See StabilityControlsStatus</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Common.ECallInfo" mandatory="false">
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 af7effd97f..8349b1475d 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
@@ -50,6 +50,7 @@
         <element name="clusterModeStatus" />
         <element name="deviceStatus" />
         <element name="emergencyEvent" />
+        <element name="stabilityControlsStatus" />
         <element name="eCallInfo" />
         <element name="abs_State" />
         <element name="turnSignal" />
diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_initial.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_initial.json
index 909fd2cb2f..dbef04e0b8 100644
--- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_initial.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_initial.json
@@ -2325,7 +2325,8 @@
               "odometer",
               "tirePressure",
               "vin",
-              "wiperStatus"
+              "wiperStatus",
+              "stabilityControlsStatus"
             ]
           },
           "OnVehicleData" :
@@ -2348,7 +2349,8 @@
               "odometer",
               "tirePressure",
               "vin",
-              "wiperStatus"
+              "wiperStatus",
+              "stabilityControlsStatus"
             ]
           },
           "SubscribeVehicleData" :
@@ -2370,7 +2372,8 @@
               "cloudAppVehicleID",
               "odometer",
               "tirePressure",
-              "wiperStatus"
+              "wiperStatus",
+              "stabilityControlsStatus"
             ]
           },
           "UnsubscribeVehicleData" :
@@ -2392,7 +2395,8 @@
               "cloudAppVehicleID",
               "odometer",
               "tirePressure",
-              "wiperStatus"
+              "wiperStatus",
+              "stabilityControlsStatus"
             ]
           }
         },