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

Commit c7fe6217 authored by Aaqib Ismail's avatar Aaqib Ismail
Browse files

Update emulator config to match real vehicle values 

Remove default value for HVAC_TEMPERATURE_VALUE_SUGGESTION as a default
value is not applicable for this property. By default it will throw
STATUS_CODE::NOT_AVAILABLE if a client tries to get.

Flag: EXEMPT config change
Bug: 391727316
Test: atest FakeVehicleHardwareTest
Test: atest CtsCarTestCases:CarPropertyManagerTest
Change-Id: I67203d17ccb12a5a618582de892b1a250568577b
parent 7df603b6

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

+17 −25
Original line number Diff line number Diff line
@@ -2549,57 +2549,49 @@ 
            "property": "VehicleProperty::HVAC_TEMPERATURE_SET",

            "defaultValue": {

                "floatValues": [

                    17.0

                    18.5

                ]

            },

            "areas": [

                {

                    "areaId": "Constants::SEAT_1_LEFT",

                    "minFloatValue": 16.0,

                    "maxFloatValue": 28.0

                    "minFloatValue": 17.5,

                    "maxFloatValue": 32.5

                },

                {

                    "areaId": "Constants::SEAT_1_RIGHT",

                    "minFloatValue": 16.0,

                    "maxFloatValue": 28.0

                    "minFloatValue": 17.5,

                    "maxFloatValue": 32.5

                },

                {

                    "areaId": "Constants::SEAT_2_LEFT",

                    "minFloatValue": 16.0,

                    "maxFloatValue": 28.0

                    "minFloatValue": 17.5,

                    "maxFloatValue": 32.5

                },

                {

                    "areaId": "Constants::SEAT_2_RIGHT",

                    "minFloatValue": 16.0,

                    "maxFloatValue": 28.0

                    "minFloatValue": 17.5,

                    "maxFloatValue": 32.5

                },

                {

                    "areaId": "Constants::SEAT_2_CENTER",

                    "minFloatValue": 16.0,

                    "maxFloatValue": 28.0

                    "minFloatValue": 17.5,

                    "maxFloatValue": 32.5

                }

            ],

            "comment":

                    "minFloatValue and maxFloatValue in area config should match corresponding values in configArray",

            "configArray": [

                160,

                280,

                175,

                325,

                5,

                608,

                824,

                9

                600,

                900,

                10

            ]

        },

        {

            "property": "VehicleProperty::HVAC_TEMPERATURE_VALUE_SUGGESTION",

            "defaultValue": {

                "floatValues": [

                    66.19999694824219,

                    "VehicleUnit::FAHRENHEIT",

                    19.0,

                    66.2

                ]

            }

            "property": "VehicleProperty::HVAC_TEMPERATURE_VALUE_SUGGESTION"

        },

        {

            "property": "VehicleProperty::ENV_OUTSIDE_TEMPERATURE",

automotive/vehicle/aidl/impl/current/fake_impl/hardware/test/FakeVehicleHardwareTest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -3064,8 +3064,8 @@ TEST_F(FakeVehicleHardwareTest, SetPropertyWithPropertyNameAreaName) { 
TEST_F(FakeVehicleHardwareTest, GetPropertyWithPropertyNameAreaName) {

    auto result = getHardware()->dump({"--get", "HVAC_TEMPERATURE_SET", "-a", "ROW_1_LEFT"});



    // Default value is 17

    ASSERT_THAT(result.buffer, ContainsRegex("17"));

    // Default value is 18.5

    ASSERT_THAT(result.buffer, ContainsRegex("18.5"));



    getHardware()->dump({"--set", "HVAC_TEMPERATURE_SET", "-a", "ROW_1_LEFT", "-f", "22"});

    result = getHardware()->dump({"--get", "HVAC_TEMPERATURE_SET", "-a", "ROW_1_LEFT"});
@@ -3680,7 +3680,7 @@ TEST_F(FakeVehicleHardwareTest, testSetHvacTemperatureValueSuggestion) { 
            .areaId = HVAC_ALL,

            .value.floatValues = {0, 0, 0, 0},

    };

    status = setValue(floatArraySizeFive);

    status = setValue(invalidUnit);

    EXPECT_EQ(status, StatusCode::INVALID_ARG);

    clearChangedProperties();
@@ -3924,9 +3924,9 @@ TEST_F(FakeVehicleHardwareTest, testSetHvacTemperatureValueSuggestion) { 
                                                    {minTempInFahrenheit +

                                                             incrementInFahrenheit * 2.5f,

                                                     FAHRENHEIT,

                                                     minTempInCelsius + incrementInCelsius * 2,

                                                     minTempInCelsius + incrementInCelsius * 3,

                                                     minTempInFahrenheit +

                                                             incrementInFahrenheit * 2},

                                                             incrementInFahrenheit * 3},

                                    },

                            },

            },