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

Commit c6c69ced authored by Sean Hong's avatar Sean Hong Committed by Android (Google) Code Review
Browse files

Merge changes I17742019,I2768b276 into tm-qpr-dev 

* changes:
  DO NOT MERGE Add seat lumbar properties to the emulator for CTS tests
  DO NOT MERGE Add seat tilt properties to the emulator for CTS tests
parents f16caf59 88ebf208

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

+120 −0
Original line number Diff line number Diff line
@@ -469,6 +469,126 @@ const std::vector<ConfigDeclaration> kVehicleProperties = { 
                                                      .maxInt32Value = 1}}},

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



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

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10}}},

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



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

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1}}},

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



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

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,

                                                      .minInt32Value = -10,

                                                      .maxInt32Value = 10}}},

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



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

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1}}},

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



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

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,

                                                      .minInt32Value = 0,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,

                                                      .minInt32Value = 0,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,

                                                      .minInt32Value = 0,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,

                                                      .minInt32Value = 0,

                                                      .maxInt32Value = 10},

                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,

                                                      .minInt32Value = 0,

                                                      .maxInt32Value = 10}}},

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



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

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1},

                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,

                                                      .minInt32Value = -1,

                                                      .maxInt32Value = 1}}},

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



        {.config =

                 {

                         .prop = toInt(VehicleProperty::SEAT_OCCUPANCY),