commit 691b6a1adc6bbd89f1399e49a1b343907b2afad3
author Aaqib Ismail <aaqibismail@google.com> Wed Dec 13 22:30:38 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 13 22:30:38 2023 +0000
tree d13d276eb516005428048fc06a070f9353811562
parent 60927e3ae5add8a4fa4d3bb5b4b98c20ca4ee797
parent 5e119598fa65287c1186000501823d5ea080112e

Merge "Change temp approximations to be accurate" into main

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

diff --git a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
index ee325ff..21c928c 100644
--- a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
+++ b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
@@ -2447,9 +2447,9 @@
                 160,
                 280,
                 5,
-                600,
-                840,
-                10
+                608,
+                824,
+                9
             ]
         },
         {
@@ -2459,7 +2459,7 @@
                     66.19999694824219,
                     "VehicleUnit::FAHRENHEIT",
                     19.0,
-                    66.0
+                    66.2
                 ]
             }
         },

automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp

diff --git a/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp b/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
index 0c1e4b9..5dc6f24 100644
--- a/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
+++ b/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
@@ -482,7 +482,7 @@
                                                   int increment) {
     requestedTemp = std::max(requestedTemp, minTemp);
     requestedTemp = std::min(requestedTemp, maxTemp);
-    int numIncrements = (requestedTemp - minTemp) / increment;
+    int numIncrements = std::round((requestedTemp - minTemp) / static_cast<float>(increment));
     return numIncrements;
 }