commit 7079fbd4f464477f881a43d41ad17d4c7d2096c7
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 01 01:40:11 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 01 01:40:11 2022 +0000
tree a4c06f967c9845bd64b3c66b72a492442091321a
parent f8060b9f8f083ac661396fbbcbf78cd6b5138997
parent 073e68f29ff3522d820dc1bc3c720324555410bd

Merge "Implemented EV_BATTERY_DISPLAY_UNITS" into tm-qpr-dev

automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h

diff --git a/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h b/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
index 83d148a..7dcaa94 100644
--- a/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
+++ b/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
@@ -173,6 +173,17 @@
 
         {.config =
                  {
+                         .prop = toInt(VehicleProperty::EV_BATTERY_DISPLAY_UNITS),
+                         .access = VehiclePropertyAccess::READ_WRITE,
+                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+                         .configArray = {toInt(VehicleUnit::WATT_HOUR),
+                                         toInt(VehicleUnit::AMPERE_HOURS),
+                                         toInt(VehicleUnit::KILOWATT_HOUR)},
+                 },
+         .initialValue = {.int32Values = {toInt(VehicleUnit::KILOWATT_HOUR)}}},
+
+        {.config =
+                 {
                          .prop = toInt(VehicleProperty::SEAT_OCCUPANCY),
                          .access = VehiclePropertyAccess::READ,
                          .changeMode = VehiclePropertyChangeMode::ON_CHANGE,