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

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

Merge "Added the DOOR_POS and WINDOW_POS properties."

parents d6a27747 b06432c9

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

+36 −9
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 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_1_RIGHT = (int)VehicleAreaWindow::ROW_1_RIGHT;

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;
@@ -379,11 +380,8 @@ const ConfigDeclaration kVehicleProperties[]{ 
                .areaConfigs = {VehicleAreaConfig{.areaId = HVAC_ALL}},

                // TODO(bryaneyler): Ideally, this is generated dynamically from

                // kHvacPowerProperties.

                .configArray =

                    {

                        toInt(VehicleProperty::HVAC_FAN_SPEED),

                        toInt(VehicleProperty::HVAC_FAN_DIRECTION)

                    }},

                .configArray = {toInt(VehicleProperty::HVAC_FAN_SPEED),

                                toInt(VehicleProperty::HVAC_FAN_DIRECTION)}},

     .initialValue = {.int32Values = {1}}},



    {
@@ -575,16 +573,45 @@ const ConfigDeclaration kVehicleProperties[]{ 
                .access = VehiclePropertyAccess::READ_WRITE,

                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                .areaConfigs = {VehicleAreaConfig{.areaId = DOOR_1_LEFT},

                                VehicleAreaConfig{.areaId = DOOR_1_RIGHT}}},

                                VehicleAreaConfig{.areaId = DOOR_1_RIGHT},

                                VehicleAreaConfig{.areaId = DOOR_2_LEFT},

                                VehicleAreaConfig{.areaId = DOOR_2_RIGHT}}},

     .initialAreaValues = {{DOOR_1_LEFT, {.int32Values = {1}}},

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

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

                           {DOOR_2_LEFT, {.int32Values = {1}}},

                           {DOOR_2_RIGHT, {.int32Values = {1}}}}},



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

                .access = VehiclePropertyAccess::READ_WRITE,

                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                .areaConfigs = {VehicleAreaConfig{.areaId = DOOR_1_LEFT},

                                VehicleAreaConfig{.areaId = DOOR_1_RIGHT},

                                VehicleAreaConfig{.areaId = DOOR_2_LEFT},

                                VehicleAreaConfig{.areaId = DOOR_2_RIGHT}}},

     .initialAreaValues = {{DOOR_1_LEFT, {.int32Values = {0}}},

                           {DOOR_1_RIGHT, {.int32Values = {0}}},

                           {DOOR_2_LEFT, {.int32Values = {0}}},

                           {DOOR_2_RIGHT, {.int32Values = {0}}}}},



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

                .access = VehiclePropertyAccess::READ_WRITE,

                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

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

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

                                                            WINDOW_2_RIGHT}}},

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

     .initialAreaValues = {{WINDOW_1_RIGHT | WINDOW_2_LEFT | WINDOW_2_RIGHT,

                            {.int32Values = {0}}}}},



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

                .access = VehiclePropertyAccess::READ_WRITE,

                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                .areaConfigs = {VehicleAreaConfig{.areaId = WINDOW_1_LEFT},

                                VehicleAreaConfig{.areaId = WINDOW_1_RIGHT},

                                VehicleAreaConfig{.areaId = WINDOW_2_LEFT},

                                VehicleAreaConfig{.areaId = WINDOW_2_RIGHT}}},

     .initialAreaValues = {{WINDOW_1_LEFT, {.int32Values = {0}}},

                           {WINDOW_1_RIGHT, {.int32Values = {0}}},

                           {WINDOW_2_LEFT, {.int32Values = {0}}},

                           {WINDOW_2_RIGHT, {.int32Values = {0}}}}},



    {.config =

         {