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

Commit bb68774d authored by Kai Wang's avatar Kai Wang Committed by Android (Google) Code Review
Browse files

Merge "Add FAN_DIRECTION for assistant's test case"

parents 04cd025c 36588116

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

+6 −2
Original line number Diff line number Diff line
@@ -476,8 +476,12 @@ const ConfigDeclaration kVehicleProperties[]{ 
                    .changeMode = VehiclePropertyChangeMode::STATIC,

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

         .initialValue = {.int32Values = {FAN_DIRECTION_FACE, FAN_DIRECTION_FLOOR,

                                          FAN_DIRECTION_FACE | FAN_DIRECTION_FLOOR}}},



                                          FAN_DIRECTION_FACE | FAN_DIRECTION_FLOOR,

                                          FAN_DIRECTION_DEFROST,

                                          FAN_DIRECTION_FACE | FAN_DIRECTION_DEFROST,

                                          FAN_DIRECTION_FLOOR | FAN_DIRECTION_DEFROST,

                                          FAN_DIRECTION_FLOOR | FAN_DIRECTION_DEFROST |

                                                  FAN_DIRECTION_FACE}}},

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

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ constexpr int WINDOW_2_RIGHT = (int)VehicleAreaWindow::ROW_2_RIGHT; 
constexpr int WINDOW_ROOF_TOP_1 = (int)VehicleAreaWindow::ROOF_TOP_1;

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

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

constexpr int FAN_DIRECTION_DEFROST = (int)VehicleHvacFanDirection::DEFROST;

constexpr int OBD2_LIVE_FRAME = (int)VehicleProperty::OBD2_LIVE_FRAME;

constexpr int OBD2_FREEZE_FRAME = (int)VehicleProperty::OBD2_FREEZE_FRAME;

constexpr int OBD2_FREEZE_FRAME_INFO = (int)VehicleProperty::OBD2_FREEZE_FRAME_INFO;