diff options
author | JackLivio <jack@livio.io> | 2018-07-10 10:02:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-10 10:02:21 -0400 |
commit | b7da3b5378c7367ce373b43d278a1831f3580cf0 (patch) | |
tree | 677e96509952b382b0f3c5db98187bfd6d0c6535 /src/components | |
parent | f80e75e030ab3e628c5202e2ed84095ebb861856 (diff) | |
parent | 1d72721a598bb64c51c4e5e76becba3acc7fad53 (diff) | |
download | sdl_core-b7da3b5378c7367ce373b43d278a1831f3580cf0.tar.gz |
Merge pull request #2291 from smartdevicelink/feature/new_vehicle_data_EPB_status
Feature/new vehicle data epb status
Diffstat (limited to 'src/components')
50 files changed, 296 insertions, 11 deletions
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 ba4b5d113a..991937f11f 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 @@ -261,6 +261,7 @@ extern const char* prndl; extern const char* tire_pressure; extern const char* odometer; extern const char* belt_status; +extern const char* electronic_park_brake_status; extern const char* body_information; extern const char* device_status; extern const char* driver_braking; 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 3905920d05..8e04251928 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -191,6 +191,9 @@ std::pair<std::string, mobile_apis::VehicleDataType::VEHICLEDATA_ODOMETER), std::make_pair(strings::belt_status, mobile_apis::VehicleDataType::VEHICLEDATA_BELTSTATUS), + std::make_pair( + strings::electronic_park_brake_status, + mobile_apis::VehicleDataType::VEHICLEDATA_ELECTRONICPARKBRAKESTATUS), std::make_pair(strings::body_information, mobile_apis::VehicleDataType::VEHICLEDATA_BODYINFO), std::make_pair(strings::device_status, diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc index 0e221885f1..96d2a925fd 100644 --- a/src/components/application_manager/src/smart_object_keys.cc +++ b/src/components/application_manager/src/smart_object_keys.cc @@ -225,6 +225,7 @@ const char* prndl = "prndl"; const char* tire_pressure = "tirePressure"; const char* odometer = "odometer"; const char* belt_status = "beltStatus"; +const char* electronic_park_brake_status = "electronicParkBrakeStatus"; const char* body_information = "bodyInformation"; const char* device_status = "deviceStatus"; const char* driver_braking = "driverBraking"; diff --git a/src/components/application_manager/test/sdl_preloaded_pt.json b/src/components/application_manager/test/sdl_preloaded_pt.json index 7f5436b5b6..59e3f947c3 100644 --- a/src/components/application_manager/test/sdl_preloaded_pt.json +++ b/src/components/application_manager/test/sdl_preloaded_pt.json @@ -297,6 +297,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -309,6 +310,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -321,6 +323,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -333,6 +336,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/application_manager/test/sdl_pt_update.json b/src/components/application_manager/test/sdl_pt_update.json index e5fdb33a93..23c75e8475 100644 --- a/src/components/application_manager/test/sdl_pt_update.json +++ b/src/components/application_manager/test/sdl_pt_update.json @@ -1433,6 +1433,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1445,6 +1446,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1457,6 +1459,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1469,6 +1472,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index c4e53f1db3..96a85d055d 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -730,6 +730,33 @@ </enum> <!--IVI part--> +<enum name="ElectronicParkBrakeStatus"> + <element name="CLOSED"> + <description> + Park brake actuators have been fully applied. + </description> + </element> + <element name="TRANSITION"> + <description> + Park brake actuators are transitioning to either Apply/Closed or Release/Open state. + </description> + </element> + <element name="OPEN"> + <description> + Park brake actuators are released. + </description> + </element> + <element name="DRIVE_ACTIVE"> + <description> + When driver pulls the Electronic Park Brake switch while driving "at speed". + </description> + </element> + <element name="FAULT"> + <description> + When system has a fault or is under maintenance. + </description> + </element> +</enum> <enum name="FuelType"> <element name="GASOLINE" /> <element name="DIESEL" /> @@ -1042,6 +1069,7 @@ <element name="VEHICLEDATA_STEERINGWHEEL" /> <element name="VEHICLEDATA_FUELRANGE" /> <element name="VEHICLEDATA_ENGINEOILLIFE" /> + <element name="VEHICLEDATA_ELECTRONICPARKBRAKESTATUS" /> </enum> <enum name="WiperStatus"> @@ -1454,21 +1482,21 @@ <element name="UPDATING" /> <element name="UPDATE_NEEDED"/> </enum> - + <enum name="SystemError"> <element name="SYNC_REBOOTED"/> <element name="SYNC_OUT_OF_MEMMORY" /> </enum> - + <enum name="StatisticsType"> <element name="iAPP_BUFFER_FULL"/> </enum> - + <enum name="ConsentSource"> <element name="GUI"/> <element name="VUI" /> </enum> - + <enum name="DeviceState"> <element name="UNKNOWN"/> <element name="UNPAIRED"/> @@ -1481,7 +1509,7 @@ <param name="line2" type="String" mandatory="false"/> <param name="textBody" type="String" mandatory="false"/> </struct> - + <struct name="PermissionItem"> <param name="name" type="String" mandatory="true"> <description>Code of message of user-friendly text about functional group to be allowed/disallowed</description> @@ -1492,7 +1520,7 @@ <param name="allowed" type="Boolean" mandatory="false"> <description>Specifies whether functionality was allowed/disallowed. If ommited - no information about User Consent is yet found for app.</description> </param> - </struct> + </struct> <struct name="ServiceInfo"> <param name="url" type="String" mandatory="true"> <description>Get URL based on service type.</description> @@ -2028,7 +2056,7 @@ </description> </param> <param name="dayColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param> - <param name="nightColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param> + <param name="nightColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param> </struct> <struct name="MenuParams"> @@ -2622,7 +2650,7 @@ <struct name="DateTime"> <param name="millisecond" type="Integer" minvalue="0" maxvalue="999" mandatory="false"> - <description>Milliseconds </description> + <description>Milliseconds </description> </param> <param name="second" type="Integer" minvalue="0" maxvalue="60" mandatory="false"> <description>Seconds part of time</description> @@ -3822,7 +3850,7 @@ <description>ID of application related to this RPC.</description> </param> <param name="dayColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param> - <param name="nightColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param> + <param name="nightColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param> </function> <function name="SetDisplayLayout" messagetype="response"> <param name="displayCapabilities" type="Common.DisplayCapabilities" mandatory="false"> @@ -4017,7 +4045,7 @@ </function> </interface> -<interface name="Navigation" version="1.5.0" date="2017-08-15"> +<interface name="Navigation" version="1.5.0" date="2017-08-15"> <function name="IsReady" messagetype="request"> <description>Method is invoked at system startup. Response must provide the information about presence of UI Navigation module and its readiness to cooperate with SDL.</description> @@ -4396,6 +4424,9 @@ <param name="engineOilLife" type="Boolean" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> <description>Emergency Call notification and confirmation data</description> @@ -4481,6 +4512,9 @@ <param name="engineOilLife" type="Common.VehicleDataResult" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Common.VehicleDataResult" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Common.VehicleDataResult" mandatory="false"> <description>Emergency Call notification and confirmation data</description> @@ -4572,6 +4606,9 @@ <param name="engineOilLife" type="Boolean" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> <description>Emergency Call notification and confirmation data</description> @@ -4657,6 +4694,9 @@ <param name="engineOilLife" type="Common.VehicleDataResult" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Common.VehicleDataResult" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Common.VehicleDataResult" mandatory="false"> <description>Emergency Call notification and confirmation data</description> @@ -4746,6 +4786,9 @@ <param name="engineOilLife" type="Boolean" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> <param name="eCallInfo" type="Boolean" mandatory="false"> <description>Emergency Call notification and confirmation data</description> </param> @@ -4832,6 +4875,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="electronicParkBrakeStatus" type="Common.ElectronicParkBrakeStatus" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> <param name="eCallInfo" type="Common.ECallInfo" mandatory="false"> <description>Emergency Call notification and confirmation data</description> </param> @@ -4869,7 +4915,7 @@ <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 estimate range in KM the vehicle can travel based on fuel level and consumption</description> </param> <param name="externalTemperature" type="Float" minvalue="-40" maxvalue="100" mandatory="false"> <description>The external temperature in degrees celsius</description> @@ -4892,6 +4938,9 @@ <param name="beltStatus" type="Common.BeltStatus" mandatory="false"> <description>The status of the seat belts</description> </param> + <param name="electronicParkBrakeStatus" type="Common.ElectronicParkBrakeStatus" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> <param name="bodyInformation" type="Common.BodyInformation" mandatory="false"> <description>The body information including power modes</description> </param> diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml index 4e4b096c1d..3667475bb1 100644 --- a/src/components/interfaces/MOBILE_API.xml +++ b/src/components/interfaces/MOBILE_API.xml @@ -526,6 +526,7 @@ <element name="VEHICLEDATA_STEERINGWHEEL" /> <element name="VEHICLEDATA_FUELRANGE" /> <element name="VEHICLEDATA_ENGINEOILLIFE" /> + <element name="VEHICLEDATA_ELECTRONICPARKBRAKESTATUS" /> </enum> <enum name="ButtonName"> @@ -1130,6 +1131,34 @@ </element> </enum> + <enum name="ElectronicParkBrakeStatus"> + <element name="CLOSED"> + <description> + Park brake actuators have been fully applied. + </description> + </element> + <element name="TRANSITION"> + <description> + Park brake actuators are transitioning to either Apply/Closed or Release/Open state. + </description> + </element> + <element name="OPEN"> + <description> + Park brake actuators are released. + </description> + </element> + <element name="DRIVE_ACTIVE"> + <description> + When driver pulls the Electronic Park Brake switch while driving "at speed". + </description> + </element> + <element name="FAULT"> + <description> + When system has a fault or is under maintenance. + </description> + </element> + </enum> + <enum name="FuelType"> <element name="GASOLINE" /> <element name="DIESEL" /> @@ -4239,6 +4268,10 @@ <param name="engineOilLife" type="Boolean" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> + <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> @@ -4351,6 +4384,10 @@ <param name="engineOilLife" type="VehicleDataResult" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="VehicleDataResult" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> + <!-- Ford Specific Data Items --> <param name="eCallInfo" type="VehicleDataResult" mandatory="false"> @@ -4441,6 +4478,10 @@ <param name="engineOilLife" type="Boolean" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> + <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> @@ -4551,6 +4592,10 @@ <param name="engineOilLife" type="VehicleDataResult" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="VehicleDataResult" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> + <!-- Ford Specific Data Items --> <param name="eCallInfo" type="VehicleDataResult" mandatory="false"> @@ -4644,6 +4689,10 @@ <param name="engineOilLife" type="Boolean" mandatory="false"> <description>The estimated percentage of remaining oil life of the engine.</description> </param> + <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> + <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> @@ -4758,6 +4807,10 @@ <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="electronicParkBrakeStatus" type="ElectronicParkBrakeStatus" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> + <!-- Ford Specific Data Items --> <param name="eCallInfo" type="ECallInfo" mandatory="false"> @@ -6000,6 +6053,10 @@ <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="electronicParkBrakeStatus" type="ElectronicParkBrakeStatus" mandatory="false"> + <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> + </param> + <!-- Ford Specific Vehicle Data --> <param name="eCallInfo" type="ECallInfo" mandatory="false"> diff --git a/src/components/policy/policy_external/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h index 2804166f17..02dad1ac3e 100644 --- a/src/components/policy/policy_external/include/policy/policy_table/enums.h +++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h @@ -78,6 +78,7 @@ enum Parameter { P_VIN, P_ACCPEDALPOSITION, P_BELTSTATUS, + P_ELECTRONICPARKBRAKESTATUS, P_DRIVERBRAKING, P_PRNDL, P_RPM, 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 401a5dcb9f..7979a0f2ba 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 @@ -38,6 +38,7 @@ <element name="vin" /> <element name="accPedalPosition" /> <element name="beltStatus" /> + <element name="electronicParkBrakeStatus" /> <element name="driverBraking" /> <element name="prndl" /> <element name="rpm" /> diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc index cb724e93b1..12ee0326de 100644 --- a/src/components/policy/policy_external/src/policy_table/enums.cc +++ b/src/components/policy/policy_external/src/policy_table/enums.cc @@ -142,6 +142,8 @@ bool IsValidEnum(Parameter val) { return true; case P_BELTSTATUS: return true; + case P_ELECTRONICPARKBRAKESTATUS: + return true; case P_DRIVERBRAKING: return true; case P_PRNDL: @@ -235,6 +237,8 @@ const char* EnumToJsonString(Parameter val) { return "accPedalPosition"; case P_BELTSTATUS: return "beltStatus"; + case P_ELECTRONICPARKBRAKESTATUS: + return "electronicParkBrakeStatus"; case P_DRIVERBRAKING: return "driverBraking"; case P_PRNDL: @@ -343,6 +347,9 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) { } else if ("beltStatus" == literal) { *result = P_BELTSTATUS; return true; + } else if ("electronicParkBrakeStatus" == literal) { + *result = P_ELECTRONICPARKBRAKESTATUS; + return true; } else if ("driverBraking" == literal) { *result = P_DRIVERBRAKING; return true; diff --git a/src/components/policy/policy_external/test/json/PTU.json b/src/components/policy/policy_external/test/json/PTU.json index 5209030eec..4cd71d6004 100644 --- a/src/components/policy/policy_external/test/json/PTU.json +++ b/src/components/policy/policy_external/test/json/PTU.json @@ -403,6 +403,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -419,6 +420,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -435,6 +437,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -451,6 +454,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/PTU2.json b/src/components/policy/policy_external/test/json/PTU2.json index 30746123d4..9c9436144e 100644 --- a/src/components/policy/policy_external/test/json/PTU2.json +++ b/src/components/policy/policy_external/test/json/PTU2.json @@ -403,6 +403,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -419,6 +420,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -435,6 +437,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -451,6 +454,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/PTU3.json b/src/components/policy/policy_external/test/json/PTU3.json index f3bd615c73..279051e7bf 100644 --- a/src/components/policy/policy_external/test/json/PTU3.json +++ b/src/components/policy/policy_external/test/json/PTU3.json @@ -403,6 +403,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -419,6 +420,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -435,6 +437,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -451,6 +454,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json b/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json index 6db3836e4a..08027f2786 100644 --- a/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json +++ b/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json @@ -1438,6 +1438,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1450,6 +1451,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1462,6 +1464,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1474,6 +1477,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json b/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json index 22f7bd2930..a88bcfbd08 100644 --- a/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json +++ b/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json @@ -1441,6 +1441,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1453,6 +1454,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1465,6 +1467,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1477,6 +1480,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json b/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json index 83a2b308bb..250bfb21f2 100644 --- a/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json +++ b/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json @@ -1438,6 +1438,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1450,6 +1451,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1462,6 +1464,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1474,6 +1477,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json b/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json index 8509935752..85910c098c 100644 --- a/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json +++ b/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json @@ -1437,6 +1437,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1449,6 +1450,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1461,6 +1463,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1473,6 +1476,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json index 4d99dfbc35..1c1b04ca2b 100644 --- a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json +++ b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json @@ -296,6 +296,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -308,6 +309,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -320,6 +322,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -332,6 +335,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json index aeed9655e1..51690d7b8e 100644 --- a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json +++ b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json @@ -296,6 +296,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -308,6 +309,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -320,6 +322,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -332,6 +335,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json b/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json index 2e99c6c8ee..cfa6c4010c 100644 --- a/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json +++ b/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json @@ -296,6 +296,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -308,6 +309,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -320,6 +322,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -332,6 +335,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/ptu2_requestType.json b/src/components/policy/policy_external/test/json/ptu2_requestType.json index 9a6ad3720d..d7177f2251 100644 --- a/src/components/policy/policy_external/test/json/ptu2_requestType.json +++ b/src/components/policy/policy_external/test/json/ptu2_requestType.json @@ -415,6 +415,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -431,6 +432,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -447,6 +449,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -463,6 +466,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/ptu_requestType.json b/src/components/policy/policy_external/test/json/ptu_requestType.json index 87fcf17aee..6a531dd2ad 100644 --- a/src/components/policy/policy_external/test/json/ptu_requestType.json +++ b/src/components/policy/policy_external/test/json/ptu_requestType.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json index 7f5436b5b6..59e3f947c3 100644 --- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json +++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json @@ -297,6 +297,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -309,6 +310,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -321,6 +323,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -333,6 +336,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json index 37e0476683..a4491fd449 100644 --- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json +++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json @@ -2051,6 +2051,7 @@ [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -2065,6 +2066,7 @@ [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -2079,6 +2081,7 @@ [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -2093,6 +2096,7 @@ [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json index 2a503ab4a1..83c4ccf15c 100644 --- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json +++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json @@ -415,6 +415,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -431,6 +432,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -447,6 +449,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -463,6 +466,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_pt_first_update.json b/src/components/policy/policy_external/test/json/sdl_pt_first_update.json index d28f70379c..7b882c6ceb 100644 --- a/src/components/policy/policy_external/test/json/sdl_pt_first_update.json +++ b/src/components/policy/policy_external/test/json/sdl_pt_first_update.json @@ -1431,6 +1431,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1443,6 +1444,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1455,6 +1457,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1467,6 +1470,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_pt_second_update.json b/src/components/policy/policy_external/test/json/sdl_pt_second_update.json index 7bf287671e..7d90275328 100644 --- a/src/components/policy/policy_external/test/json/sdl_pt_second_update.json +++ b/src/components/policy/policy_external/test/json/sdl_pt_second_update.json @@ -1431,6 +1431,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1443,6 +1444,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1455,6 +1457,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1467,6 +1470,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_pt_update.json b/src/components/policy/policy_external/test/json/sdl_pt_update.json index 6b130c8f60..807b0eb312 100644 --- a/src/components/policy/policy_external/test/json/sdl_pt_update.json +++ b/src/components/policy/policy_external/test/json/sdl_pt_update.json @@ -1431,6 +1431,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1443,6 +1444,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1455,6 +1457,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1467,6 +1470,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json index be177335fe..3d0a004dbe 100644 --- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json +++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json index 58e3f2fad3..6a36f1f9c5 100644 --- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json +++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json index 4b10f8c80b..3303d56844 100644 --- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json +++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json index 7728b69a0b..e7a33ba2c0 100644 --- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json +++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json index aaa7664d06..08739f9d6a 100644 --- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json +++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json index 079892677d..21396b8cac 100644 --- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json +++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json index 82048d21e6..5aa467a23c 100644 --- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json +++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json @@ -414,6 +414,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -430,6 +431,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -446,6 +448,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -462,6 +465,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json b/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json index 81521a2e0b..5827ab287a 100644 --- a/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json +++ b/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json @@ -1431,6 +1431,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1443,6 +1444,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1455,6 +1457,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1467,6 +1470,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/include/policy/policy_table/enums.h b/src/components/policy/policy_regular/include/policy/policy_table/enums.h index 050ab63973..9c5fa2691e 100644 --- a/src/components/policy/policy_regular/include/policy/policy_table/enums.h +++ b/src/components/policy/policy_regular/include/policy/policy_table/enums.h @@ -78,6 +78,7 @@ enum Parameter { P_VIN, P_ACCPEDALPOSITION, P_BELTSTATUS, + P_ELECTRONICPARKBRAKESTATUS, P_DRIVERBRAKING, P_PRNDL, P_RPM, diff --git a/src/components/policy/policy_regular/policy_table_interface_ext.xml b/src/components/policy/policy_regular/policy_table_interface_ext.xml index 742ed547a8..393a419139 100644 --- a/src/components/policy/policy_regular/policy_table_interface_ext.xml +++ b/src/components/policy/policy_regular/policy_table_interface_ext.xml @@ -39,6 +39,7 @@ <element name="vin" /> <element name="accPedalPosition" /> <element name="beltStatus" /> + <element name="electronicParkBrakeStatus" /> <element name="driverBraking" /> <element name="prndl" /> <element name="rpm" /> diff --git a/src/components/policy/policy_regular/src/policy_table/enums.cc b/src/components/policy/policy_regular/src/policy_table/enums.cc index e05ed8f064..6768fc50e2 100644 --- a/src/components/policy/policy_regular/src/policy_table/enums.cc +++ b/src/components/policy/policy_regular/src/policy_table/enums.cc @@ -143,6 +143,8 @@ bool IsValidEnum(Parameter val) { return true; case P_BELTSTATUS: return true; + case P_ELECTRONICPARKBRAKESTATUS: + return true; case P_DRIVERBRAKING: return true; case P_PRNDL: @@ -207,6 +209,8 @@ const char* EnumToJsonString(Parameter val) { return "accPedalPosition"; case P_BELTSTATUS: return "beltStatus"; + case P_ELECTRONICPARKBRAKESTATUS: + return "electronicParkBrakeStatus"; case P_DRIVERBRAKING: return "driverBraking"; case P_PRNDL: @@ -287,6 +291,9 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) { } else if ("beltStatus" == literal) { *result = P_BELTSTATUS; return true; + } else if ("electronicParkBrakeStatus" == literal) { + *result = P_ELECTRONICPARKBRAKESTATUS; + return true; } else if ("driverBraking" == literal) { *result = P_DRIVERBRAKING; return true; diff --git a/src/components/policy/policy_regular/test/PTU.json b/src/components/policy/policy_regular/test/PTU.json index f53ceb735b..2f4735dd66 100644 --- a/src/components/policy/policy_regular/test/PTU.json +++ b/src/components/policy/policy_regular/test/PTU.json @@ -296,6 +296,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -308,6 +309,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -320,6 +322,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -332,6 +335,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/PTU2.json b/src/components/policy/policy_regular/test/PTU2.json index 6f24ee97f6..806ab8bcc0 100644 --- a/src/components/policy/policy_regular/test/PTU2.json +++ b/src/components/policy/policy_regular/test/PTU2.json @@ -296,6 +296,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -308,6 +309,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -320,6 +322,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -332,6 +335,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/PTU3.json b/src/components/policy/policy_regular/test/PTU3.json index e1aaa953c5..28396be29a 100644 --- a/src/components/policy/policy_regular/test/PTU3.json +++ b/src/components/policy/policy_regular/test/PTU3.json @@ -296,6 +296,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -308,6 +309,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -320,6 +322,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -332,6 +335,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/PTU4.json b/src/components/policy/policy_regular/test/PTU4.json index dad00de53e..4592e228df 100644 --- a/src/components/policy/policy_regular/test/PTU4.json +++ b/src/components/policy/policy_regular/test/PTU4.json @@ -296,6 +296,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -308,6 +309,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -320,6 +322,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -332,6 +335,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/ptu2_requestType.json b/src/components/policy/policy_regular/test/ptu2_requestType.json index 1f23adda1c..2a05a94f8b 100644 --- a/src/components/policy/policy_regular/test/ptu2_requestType.json +++ b/src/components/policy/policy_regular/test/ptu2_requestType.json @@ -416,6 +416,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -432,6 +433,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -448,6 +450,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -464,6 +467,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/ptu_requestType.json b/src/components/policy/policy_regular/test/ptu_requestType.json index 998ab7f5d4..b0d9117568 100644 --- a/src/components/policy/policy_regular/test/ptu_requestType.json +++ b/src/components/policy/policy_regular/test/ptu_requestType.json @@ -416,6 +416,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -432,6 +433,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -448,6 +450,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -464,6 +467,7 @@ "parameters": [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/sdl_preloaded_pt.json b/src/components/policy/policy_regular/test/sdl_preloaded_pt.json index 7f5436b5b6..59e3f947c3 100644 --- a/src/components/policy/policy_regular/test/sdl_preloaded_pt.json +++ b/src/components/policy/policy_regular/test/sdl_preloaded_pt.json @@ -297,6 +297,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -309,6 +310,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -321,6 +323,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -333,6 +336,7 @@ "LIMITED"], "parameters": ["accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/sdl_pt_first_update.json b/src/components/policy/policy_regular/test/sdl_pt_first_update.json index d28f70379c..7b882c6ceb 100644 --- a/src/components/policy/policy_regular/test/sdl_pt_first_update.json +++ b/src/components/policy/policy_regular/test/sdl_pt_first_update.json @@ -1431,6 +1431,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1443,6 +1444,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1455,6 +1457,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1467,6 +1470,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/sdl_pt_second_update.json b/src/components/policy/policy_regular/test/sdl_pt_second_update.json index 7bf287671e..7d90275328 100644 --- a/src/components/policy/policy_regular/test/sdl_pt_second_update.json +++ b/src/components/policy/policy_regular/test/sdl_pt_second_update.json @@ -1431,6 +1431,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1443,6 +1444,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1455,6 +1457,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1467,6 +1470,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/sdl_pt_update.json b/src/components/policy/policy_regular/test/sdl_pt_update.json index cb9f9bddf6..909e4d5238 100644 --- a/src/components/policy/policy_regular/test/sdl_pt_update.json +++ b/src/components/policy/policy_regular/test/sdl_pt_update.json @@ -1433,6 +1433,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1445,6 +1446,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1457,6 +1459,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1469,6 +1472,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", diff --git a/src/components/policy/policy_regular/test/valid_sdl_pt_update.json b/src/components/policy/policy_regular/test/valid_sdl_pt_update.json index 81521a2e0b..5827ab287a 100644 --- a/src/components/policy/policy_regular/test/valid_sdl_pt_update.json +++ b/src/components/policy/policy_regular/test/valid_sdl_pt_update.json @@ -1431,6 +1431,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1443,6 +1444,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1455,6 +1457,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", @@ -1467,6 +1470,7 @@ "parameters" : [ "accPedalPosition", "beltStatus", + "electronicParkBrakeStatus", "driverBraking", "myKey", "prndl", |