diff options
author | Scott Murray <scott.murray@konsulko.com> | 2022-12-07 22:10:39 +0900 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2022-12-13 03:54:05 +0000 |
commit | e6ecc5d46c7ebb11efbc674289c87e50f6d5dfbc (patch) | |
tree | e941e20c556af79cb944a28a32a4df5e27765bb6 | |
parent | 5db65d9bb45a1022c37556506ef0c15c3cc8c263 (diff) |
Update Tier -> Tire
Bug-AGL: SPEC-4642
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I8540eb55d83bf617a4c0d7fb9f97a16c72611603
(cherry picked from commit 1a5706e55524f8ba16d28ea9e9748e3ff0ac48c1)
-rw-r--r-- | lib/HomePage.dart | 26 | ||||
-rw-r--r-- | lib/Kuksa-server/vehicle_methods.dart | 24 | ||||
-rw-r--r-- | lib/Kuksa-server/vehicle_server_path.dart | 8 | ||||
-rw-r--r-- | lib/Tire_pressure.dart (renamed from lib/Tier_pressure.dart) | 8 |
4 files changed, 33 insertions, 33 deletions
diff --git a/lib/HomePage.dart b/lib/HomePage.dart index 6487ef5..b6a0349 100644 --- a/lib/HomePage.dart +++ b/lib/HomePage.dart @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -import 'package:dashboard_app/Tier_pressure.dart'; +import 'package:dashboard_app/Tire_pressure.dart'; import 'package:dashboard_app/drawArrow.dart'; import 'package:dashboard_app/provider.dart'; import 'package:dashboard_app/size.dart'; @@ -66,8 +66,8 @@ class _HomePageState extends ConsumerState<HomePage> { child: Column( children: [ - TierPressure( - tname: 'L Front Tier', + TirePressure( + tname: 'L Front Tire', tpress: vehicle.frontLeftTP, mainAxisAlignment: MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end, @@ -98,8 +98,8 @@ class _HomePageState extends ConsumerState<HomePage> { ), ), ), - TierPressure( - tname: 'L Rear Tier', + TirePressure( + tname: 'L Rear Tire', tpress: vehicle.rearLeftTP, crossAxisAlignment: CrossAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.start, @@ -112,8 +112,8 @@ class _HomePageState extends ConsumerState<HomePage> { right: SizeConfig.safeBlockHorizontal * 7, child: Column( children: [ - TierPressure( - tname: 'R Front Tier', + TirePressure( + tname: 'R Front Tire', tpress: vehicle.frontRightTP, mainAxisAlignment: MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.start, @@ -143,8 +143,8 @@ class _HomePageState extends ConsumerState<HomePage> { ), ), ), - TierPressure( - tname: 'R Rear Tier', + TirePressure( + tname: 'R Rear Tire', tpress: vehicle.rearRightTP, mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -285,7 +285,7 @@ class _HomePageState extends ConsumerState<HomePage> { crossAxisAlignment: CrossAxisAlignment.end, children: [ - TierPressure( + TirePressure( tname: 'L Front Tire', tpress: vehicle.frontLeftTP, mainAxisAlignment: @@ -330,7 +330,7 @@ class _HomePageState extends ConsumerState<HomePage> { ), ), ), - TierPressure( + TirePressure( tname: 'L Rear Tire', tpress: vehicle.rearLeftTP, mainAxisAlignment: @@ -362,7 +362,7 @@ class _HomePageState extends ConsumerState<HomePage> { top: 0, child: Column( children: [ - TierPressure( + TirePressure( tname: 'R Front Tire', tpress: vehicle.frontRightTP, mainAxisAlignment: @@ -407,7 +407,7 @@ class _HomePageState extends ConsumerState<HomePage> { ), ), ), - TierPressure( + TirePressure( tname: 'R Rear Tire', tpress: vehicle.rearRightTP, mainAxisAlignment: diff --git a/lib/Kuksa-server/vehicle_methods.dart b/lib/Kuksa-server/vehicle_methods.dart index 099d480..1a99bc7 100644 --- a/lib/Kuksa-server/vehicle_methods.dart +++ b/lib/Kuksa-server/vehicle_methods.dart @@ -14,10 +14,10 @@ class VISS { subscribe(socket,ref, VSPath.vehicleSpeed); subscribe(socket,ref, VSPath.vehicleEngineRPM); subscribe(socket,ref, VSPath.vehicleFuelLevel); - subscribe(socket,ref, VSPath.vehicleFrontLeftTier); - subscribe(socket, ref,VSPath.vehicleFrontRightTier); - subscribe(socket, ref,VSPath.vehicleRearLeftTier); - subscribe(socket,ref, VSPath.vehicleRearRightTier); + subscribe(socket,ref, VSPath.vehicleFrontLeftTire); + subscribe(socket, ref,VSPath.vehicleFrontRightTire); + subscribe(socket, ref,VSPath.vehicleRearLeftTire); + subscribe(socket,ref, VSPath.vehicleRearRightTire); subscribe(socket, ref,VSPath.vehicleIsChildLockActiveLeft); subscribe(socket,ref, VSPath.vehicleIsChildLockActiveRight); subscribe(socket,ref, VSPath.vehicleCurrentLatitude); @@ -32,10 +32,10 @@ class VISS { get(socket,ref, VSPath.vehicleEngineRPM); get(socket,ref, VSPath.vehicleFuelLevel); get(socket,ref,VSPath.vehicleAmbientAirTemperature); - get(socket,ref,VSPath.vehicleFrontLeftTier); - get(socket,ref, VSPath.vehicleFrontRightTier); - get(socket,ref, VSPath.vehicleRearLeftTier); - get(socket,ref, VSPath.vehicleRearRightTier); + get(socket,ref,VSPath.vehicleFrontLeftTire); + get(socket,ref, VSPath.vehicleFrontRightTire); + get(socket,ref, VSPath.vehicleRearLeftTire); + get(socket,ref, VSPath.vehicleRearRightTire); get(socket,ref,VSPath.vehicleIsChildLockActiveLeft); get(socket,ref, VSPath.vehicleIsChildLockActiveRight); get(socket,ref,VSPath.vehicleCurrentLatitude); @@ -127,16 +127,16 @@ class VISS { case VSPath.vehicleFuelLevel: vehicleSignal.update(fuelLevel: dp["value"]); break; - case VSPath.vehicleFrontLeftTier: + case VSPath.vehicleFrontLeftTire: vehicleSignal.update(frontLeftTP: dp["value"]); break; - case VSPath.vehicleFrontRightTier: + case VSPath.vehicleFrontRightTire: vehicleSignal.update(frontRightTP: dp["value"]); break; - case VSPath.vehicleRearLeftTier: + case VSPath.vehicleRearLeftTire: vehicleSignal.update(rearLeftTP: dp["value"]); break; - case VSPath.vehicleRearRightTier: + case VSPath.vehicleRearRightTire: vehicleSignal.update(rearRightTP: dp["value"]); break; diff --git a/lib/Kuksa-server/vehicle_server_path.dart b/lib/Kuksa-server/vehicle_server_path.dart index de33502..8d8923c 100644 --- a/lib/Kuksa-server/vehicle_server_path.dart +++ b/lib/Kuksa-server/vehicle_server_path.dart @@ -11,14 +11,14 @@ class VSPath { static const String vehicleAmbientAirTemperature = "Vehicle.AmbientAirTemperature"; - static const String vehicleFrontLeftTier = + static const String vehicleFrontLeftTire = "Vehicle.Chassis.Axle.Row1.Wheel.Left.Tire.Pressure"; - static const String vehicleFrontRightTier = + static const String vehicleFrontRightTire = "Vehicle.Chassis.Axle.Row1.Wheel.Right.Tire.Pressure"; - static const String vehicleRearLeftTier = + static const String vehicleRearLeftTire = "Vehicle.Chassis.Axle.Row2.Wheel.Left.Tire.Pressure"; - static const String vehicleRearRightTier = + static const String vehicleRearRightTire = "Vehicle.Chassis.Axle.Row2.Wheel.Right.Tire.Pressure"; static const String vehicleIsChildLockActiveLeft = "Vehicle.Cabin.Door.Row2.Left.IsChildLockActive"; diff --git a/lib/Tier_pressure.dart b/lib/Tire_pressure.dart index cb8ace5..2f68bf3 100644 --- a/lib/Tier_pressure.dart +++ b/lib/Tire_pressure.dart @@ -5,12 +5,12 @@ import 'package:percent_indicator/linear_percent_indicator.dart'; -class TierPressure extends StatefulWidget { +class TirePressure extends StatefulWidget { String tname; double tpress; CrossAxisAlignment crossAxisAlignment; MainAxisAlignment mainAxisAlignment; - TierPressure( + TirePressure( {Key? key, required this.tname, required this.tpress, @@ -19,10 +19,10 @@ class TierPressure extends StatefulWidget { : super(key: key); @override - State<TierPressure> createState() => _TierPressureState(); + State<TirePressure> createState() => _TirePressureState(); } -class _TierPressureState extends State<TierPressure> { +class _TirePressureState extends State<TirePressure> { @override Widget build(BuildContext context) { return SizedBox( |