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

Commit 909e1fda authored by Steve Paik's avatar Steve Paik Committed by android-build-merger
Browse files

Merge "Use configArray for HVAC_POWER_ON" into pi-dev 

am: 7fa25dee

Change-Id: Ib64af6829d055b0c980ea3c19002e96be3bd1264
parents d2a5c74e 7fa25dee

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

+12 −11
Original line number Diff line number Diff line
@@ -242,17 +242,18 @@ const ConfigDeclaration kVehicleProperties[]{ 
         },

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



    {.config =

         {

             .prop = toInt(VehicleProperty::HVAC_POWER_ON),

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

                .access = VehiclePropertyAccess::READ_WRITE,

                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                .areaConfigs = {VehicleAreaConfig{

                    .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}},

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

                // kHvacPowerProperties.

             .configString = "0x12400500,0x12400501"  // HVAC_FAN_SPEED,HVAC_FAN_DIRECTION

         },

                .configArray =

                    {

                        0x12400500,  // HVAC_FAN_SPEED

                        0x12400501   // HVAC_FAN_DIRECTION

                    }},

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



    {