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

Commit 8ddf4367 authored by seanhong's avatar seanhong
Browse files

Add interior light switch properties to DefaultProperties.json for CTS 

tests

Test: atest CarPropertyManagerTest
Bug: 242740101
Change-Id: I0efa0622d6a24d2ef6873b04f65fe82a76326c11
parent 048085f7

automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ const std::unordered_map<std::string, int> CONSTANTS_BY_NAME = { 
         FAN_DIRECTION_FLOOR | FAN_DIRECTION_DEFROST | FAN_DIRECTION_FACE},

        {"FUEL_DOOR_REAR_LEFT", FUEL_DOOR_REAR_LEFT},

        {"LIGHT_STATE_ON", LIGHT_STATE_ON},

        {"LIGHT_SWITCH_OFF", LIGHT_SWITCH_OFF},

        {"LIGHT_SWITCH_AUTO", LIGHT_SWITCH_AUTO},

        {"MIRROR_DRIVER_LEFT_RIGHT",

         toInt(VehicleAreaMirror::DRIVER_LEFT) | toInt(VehicleAreaMirror::DRIVER_RIGHT)},

automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json

+33 −0
Original line number Diff line number Diff line
@@ -2254,6 +2254,39 @@ 
                ]

            }

        },

        {

            "property": "VehicleProperty::CABIN_LIGHTS_SWITCH",

            "defaultValue": {

                "int32Values": [

                    "Constants::LIGHT_SWITCH_OFF"

                ]

            }

        },

        {

            "property": "VehicleProperty::READING_LIGHTS_SWITCH",

            "defaultValue": {

                "int32Values": [

                    "Constants::LIGHT_SWITCH_OFF"

                ]

            },

            "areas": [

                {

                    "areaId": "Constants::SEAT_1_LEFT"

                },

                {

                    "areaId": "Constants::SEAT_1_RIGHT"

                },

                {

                    "areaId": "Constants::SEAT_2_LEFT"

                },

                {

                    "areaId": "Constants::SEAT_2_RIGHT"

                },

                {

                    "areaId": "Constants::SEAT_2_CENTER"

                }

            ]

        },

        {

            "property": "VehicleProperty::EVS_SERVICE_REQUEST",

            "defaultValue": {

automotive/vehicle/aidl/impl/utils/common/include/PropertyUtils.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ constexpr int FUEL_DOOR_REAR_LEFT = toInt(propertyutils_impl::PortLocationType:: 
constexpr int CHARGE_PORT_FRONT_LEFT = toInt(propertyutils_impl::PortLocationType::FRONT_LEFT);

constexpr int CHARGE_PORT_REAR_LEFT = toInt(propertyutils_impl::PortLocationType::REAR_LEFT);

constexpr int LIGHT_STATE_ON = toInt(propertyutils_impl::VehicleLightState::ON);

constexpr int LIGHT_SWITCH_OFF = toInt(propertyutils_impl::VehicleLightSwitch::OFF);

constexpr int LIGHT_SWITCH_AUTO = toInt(propertyutils_impl::VehicleLightSwitch::AUTOMATIC);

constexpr int WHEEL_FRONT_LEFT = toInt(propertyutils_impl::VehicleAreaWheel::LEFT_FRONT);

constexpr int WHEEL_FRONT_RIGHT = toInt(propertyutils_impl::VehicleAreaWheel::RIGHT_FRONT);