Skip to content

Commit

Permalink
Merge pull request #2224 from JackLivio/feature/tire_pressure_additions
Browse files Browse the repository at this point in the history
Add tire pressure parameters
  • Loading branch information
Jack-Byrne authored May 31, 2018
2 parents 33b00a8 + d073d38 commit 31ed739
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ void SetDisplayLayoutRequest::Run() {
// Template layout is the same as previous layout
// Reject message if colors are set
if (msg_params.keyExists(strings::day_color_scheme) &&
app->day_color_scheme() != NULL &&
!(msg_params[strings::day_color_scheme] ==
*(app->day_color_scheme()))) {
app->day_color_scheme() != NULL &&
!(msg_params[strings::day_color_scheme] ==
*(app->day_color_scheme()))) {
// Color scheme param exists and has been previously set, do not allow
// color change
LOG4CXX_DEBUG(logger_, "Reject Day Color Scheme Change");
Expand Down
35 changes: 34 additions & 1 deletion src/components/interfaces/HMI_API.xml
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,33 @@
</element>
</enum>

<enum name="TPMS">
<element name="UNKNOWN">
<description>If set the status of the tire is not known.</description>
</element>
<element name="SYSTEM_FAULT">
<description>TPMS does not function.</description>
</element>
<element name="SENSOR_FAULT">
<description>The sensor of the tire does not function.</description>
</element>
<element name="LOW">
<description>TPMS is reporting a low tire pressure for the tire.</description>
</element>
<element name="SYSTEM_ACTIVE">
<description>TPMS is active and the tire pressure is monitored.</description>
</element>
<element name="TRAIN">
<description>TPMS is reporting that the tire must be trained.</description>
</element>
<element name="TRAINING_COMPLETE">
<description>TPMS reports the training for the tire is completed.</description>
</element>
<element name="NOT_TRAINED">
<description>TPMS reports the tire is not trained.</description>
</element>
</enum>

<enum name="PRNDL">
<description>The selected gear.</description>
<element name="PARK">
Expand Down Expand Up @@ -2314,7 +2341,13 @@
<struct name="SingleTireStatus">
<param name="status" type="Common.ComponentVolumeStatus" mandatory="true">
<description>The status of component volume. See ComponentVolumeStatus.</description>
</param>
</param>
<param name="tpms" type="TPMS" mandatory="false">
<description>The status of TPMS according to the particular tire.</description>
</param>
<param name="pressure" type="Float" mandatory="false" minvalue="0" maxvalue="2000">
<description>The pressure value of the particular tire in kilo pascal.</description>
</param>
</struct>

<struct name="DIDResult">
Expand Down
33 changes: 33 additions & 0 deletions src/components/interfaces/MOBILE_API.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1094,6 +1094,33 @@
<element name="NOT_SUPPORTED" internal_name="CVS_NOT_SUPPORTED">
</element>
</enum>

<enum name="TPMS">
<element name="UNKNOWN">
<description>If set the status of the tire is not known.</description>
</element>
<element name="SYSTEM_FAULT">
<description>TPMS does not function.</description>
</element>
<element name="SENSOR_FAULT">
<description>The sensor of the tire does not function.</description>
</element>
<element name="LOW">
<description>TPMS is reporting a low tire pressure for the tire.</description>
</element>
<element name="SYSTEM_ACTIVE">
<description>TPMS is active and the tire pressure is monitored.</description>
</element>
<element name="TRAIN">
<description>TPMS is reporting that the tire must be trained.</description>
</element>
<element name="TRAINING_COMPLETE">
<description>TPMS reports the training for the tire is completed.</description>
</element>
<element name="NOT_TRAINED">
<description>TPMS reports the tire is not trained.</description>
</element>
</enum>

<enum name="FuelType">
<element name="GASOLINE" />
Expand Down Expand Up @@ -1129,6 +1156,12 @@
<param name="status" type="ComponentVolumeStatus" mandatory="true">
<description>See ComponentVolumeStatus.</description>
</param>
<param name="tpms" type="TPMS" mandatory="false">
<description>The status of TPMS according to the particular tire.</description>
</param>
<param name="pressure" type="Float" mandatory="false" minvalue="0" maxvalue="2000">
<description>The pressure value of the particular tire in kilo pascal.</description>
</param>
</struct>

<enum name="WarningLightStatus">
Expand Down

0 comments on commit 31ed739

Please # to comment.