Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49e24cad authored by Gregory Clark's avatar Gregory Clark Committed by Android (Google) Code Review
Browse files

Merge "Add the window lock property."

parents 6295aca5 2c820039

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

+10 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ constexpr int DOOR_1_LEFT = (int)VehicleAreaDoor::ROW_1_LEFT; 
constexpr int DOOR_1_RIGHT = (int)VehicleAreaDoor::ROW_1_RIGHT;

constexpr int DOOR_2_LEFT = (int)VehicleAreaDoor::ROW_2_LEFT;

constexpr int DOOR_2_RIGHT = (int)VehicleAreaDoor::ROW_2_RIGHT;

constexpr int WINDOW_1_LEFT = (int)VehicleAreaWindow::ROW_1_LEFT;

constexpr int WINDOW_2_LEFT = (int)VehicleAreaWindow::ROW_2_LEFT;

constexpr int WINDOW_2_RIGHT = (int)VehicleAreaWindow::ROW_2_RIGHT;

constexpr int FAN_DIRECTION_FACE = (int)VehicleHvacFanDirection::FACE;

constexpr int FAN_DIRECTION_FLOOR = (int)VehicleHvacFanDirection::FLOOR;

constexpr int OBD2_LIVE_FRAME = (int)VehicleProperty::OBD2_LIVE_FRAME;
@@ -576,6 +579,13 @@ const ConfigDeclaration kVehicleProperties[]{ 
     .initialAreaValues = {{DOOR_1_LEFT, {.int32Values = {1}}},

                           {DOOR_1_RIGHT, {.int32Values = {1}}}}},



    {.config = {.prop = toInt(VehicleProperty::WINDOW_LOCK),

                .access = VehiclePropertyAccess::READ_WRITE,

                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                .areaConfigs = {VehicleAreaConfig{.areaId = WINDOW_1_LEFT | WINDOW_2_LEFT |

                                                            WINDOW_2_RIGHT}}},

     .initialAreaValues = {{WINDOW_1_LEFT | WINDOW_2_LEFT | WINDOW_2_RIGHT, {.int32Values = {0}}}}},



    {.config =

         {

             .prop = WHEEL_TICK,