commit 93f22c85c7a7ca916b3b6b3d2c334eaf793e75d4
author Jordan Jozwiak <jjoz@google.com> Thu Apr 23 19:19:54 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 23 19:19:54 2020 +0000
tree cf48a0341c4d5ef59d3d27c26208f436f4a02f18
parent d0ce2154bb66e5006a0ae365655350517efb8059
parent 7faa170ff1edc3526b92c1caba126bb83b33bb6a

Merge "Add config for tire pressure display units" into rvc-dev

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
index ea75986..bad9ffe 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
@@ -439,6 +439,16 @@
 
         {.config =
                  {
+                         .prop = toInt(VehicleProperty::TIRE_PRESSURE_DISPLAY_UNITS),
+                         .access = VehiclePropertyAccess::READ_WRITE,
+                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+                         .configArray = {(int)VehicleUnit::KILOPASCAL, (int)VehicleUnit::PSI,
+                                         (int)VehicleUnit::BAR},
+                 },
+         .initialValue = {.int32Values = {toInt(VehicleUnit::PSI)}}},
+
+        {.config =
+                 {
                          .prop = toInt(VehicleProperty::CURRENT_GEAR),
                          .access = VehiclePropertyAccess::READ,
                          .changeMode = VehiclePropertyChangeMode::ON_CHANGE,