From 1e99e3a52f3d4d81d7cc890630ac591d38f731df Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 15 Aug 2024 15:54:01 -0400
Subject: Fix engine speed signal type

Update use of the VSS engine speed (RPM) signal to match the fix
done to the AGL VSS overlays to restore the upstream integer data
type.

Bug-AGL: SPEC-5204

Change-Id: I1993cf291cdc2ca056f4fb2b389ef4eee5558473
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
(cherry picked from commit 3ef28eeae6e3336232ab13d0d934aa82892dfe74)
---
 lib/data/models/vehicle.dart | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/data/models/vehicle.dart')

diff --git a/lib/data/models/vehicle.dart b/lib/data/models/vehicle.dart
index dfeae05..0f1031b 100644
--- a/lib/data/models/vehicle.dart
+++ b/lib/data/models/vehicle.dart
@@ -5,7 +5,7 @@ import '../../export.dart';
 @immutable
 class Vehicle {
   final double speed;
-  final double engineSpeed;
+  final int engineSpeed;
   final double insideTemperature;
   final double outsideTemperature;
   final int range;
@@ -94,7 +94,7 @@ class Vehicle {
 
   Vehicle copyWith({
     double? speed,
-    double? engineSpeed,
+    int? engineSpeed,
     double? insideTemperature,
     double? outsideTemperature,
     int? range,
@@ -166,7 +166,7 @@ class Vehicle {
   factory Vehicle.fromMap(Map<String, dynamic> map) {
     return Vehicle(
       map['speed']?.toDouble() ?? 0.0,
-      map['engineSpeed']?.toDouble() ?? 0.0,
+      map['engineSpeed']?.toInt() ?? 0,
       map['insideTemperature']?.toDouble() ?? 0.0,
       map['outsideTemperature']?.toDouble() ?? 0.0,
       map['range']?.toInt() ?? 0,
@@ -204,13 +204,13 @@ class Vehicle {
 
     return other is Vehicle &&
         other.speed == speed &&
+        other.engineSpeed == engineSpeed &&
         other.insideTemperature == insideTemperature &&
         other.outsideTemperature == outsideTemperature &&
         other.range == range &&
         other.fuelLevel == fuelLevel &&
         other.isChildLockActiveLeft == isChildLockActiveLeft &&
         other.isChildLockActiveRight == isChildLockActiveRight &&
-        other.engineSpeed == engineSpeed &&
         other.frontLeftTire == frontLeftTire &&
         other.frontRightTire == frontRightTire &&
         other.rearLeftTire == rearLeftTire &&
@@ -228,13 +228,13 @@ class Vehicle {
   @override
   int get hashCode {
     return speed.hashCode ^
+        engineSpeed.hashCode ^
         insideTemperature.hashCode ^
         outsideTemperature.hashCode ^
         range.hashCode ^
         fuelLevel.hashCode ^
         isChildLockActiveLeft.hashCode ^
         isChildLockActiveRight.hashCode ^
-        engineSpeed.hashCode ^
         frontLeftTire.hashCode ^
         frontRightTire.hashCode ^
         rearLeftTire.hashCode ^
-- 
cgit 1.2.3-korg