VSS 4.0 updates

Change Left/Right to Driver/Passenger in HVAC VSS signal names to
match VSS 4.0, and update fuel level signal.

Bug-AGL: SPEC-4970

Change-Id: Iedd0a8ac721cc9b48266d75b2ad03c8f15f990de
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/Widgets/HVACPage.py b/Widgets/HVACPage.py
index 56d7f8b..fd21f7b 100644 (file)
--- a/Widgets/HVACPage.py
+++ b/Widgets/HVACPage.py
@@ -34,10 +34,10 @@ Form, Base = uic.loadUiType(os.path.join(current_dir, "../ui/HVAC.ui"))
 
 class HVAC_Paths():
     def __init__(self):
-        self.leftTemp = "Vehicle.Cabin.HVAC.Station.Row1.Left.Temperature"
-        self.leftFanSpeed = "Vehicle.Cabin.HVAC.Station.Row1.Left.FanSpeed"
-        self.rightTemp = "Vehicle.Cabin.HVAC.Station.Row1.Right.Temperature"
-        self.rightFanSpeed = "Vehicle.Cabin.HVAC.Station.Row1.Right.FanSpeed"
+        self.leftTemp = "Vehicle.Cabin.HVAC.Station.Row1.Driver.Temperature"
+        self.leftFanSpeed = "Vehicle.Cabin.HVAC.Station.Row1.Driver.FanSpeed"
+        self.rightTemp = "Vehicle.Cabin.HVAC.Station.Row1.Passenger.Temperature"
+        self.rightFanSpeed = "Vehicle.Cabin.HVAC.Station.Row1.Passenger.FanSpeed"
 
         # temperatureList contains values from 32 to 16
         self.temperatureList = [str(i) + "°C" for i in range(32, 15, -1)]

diff --git a/Widgets/ICPage.py b/Widgets/ICPage.py
index 9106249..8681d61 100644 (file)
--- a/Widgets/ICPage.py
+++ b/Widgets/ICPage.py
@@ -46,7 +46,7 @@ class IC_Paths():
         self.leftIndicator = "Vehicle.Body.Lights.DirectionIndicator.Left.IsSignaling"
         self.rightIndicator = "Vehicle.Body.Lights.DirectionIndicator.Right.IsSignaling"
         self.hazard = "Vehicle.Body.Lights.Hazard.IsSignaling"
-        self.fuelLevel = "Vehicle.Powertrain.FuelSystem.Level"
+        self.fuelLevel = "Vehicle.Powertrain.FuelSystem.RelativeLevel"
         self.coolantTemp = "Vehicle.Powertrain.CombustionEngine.ECT"
         self.selectedGear = "Vehicle.Powertrain.Transmission.SelectedGear"
 

diff --git a/extras/UI_Handeler.py b/extras/UI_Handeler.py
index 9139c53..05a351d 100644 (file)
--- a/extras/UI_Handeler.py
+++ b/extras/UI_Handeler.py
@@ -53,13 +53,13 @@ class GrpcSubscriptionThread(QThread):
             SubscribeEntry('Vehicle.Body.Lights.DirectionIndicator.Left.IsSignaling', View.FIELDS, (Field.VALUE,)),
             SubscribeEntry('Vehicle.Body.Lights.DirectionIndicator.Right.IsSignaling', View.FIELDS, (Field.VALUE,)),
             SubscribeEntry('Vehicle.Body.Lights.Hazard.IsSignaling', View.FIELDS, (Field.VALUE,)),
-            SubscribeEntry('Vehicle.Powertrain.FuelSystem.Level', View.FIELDS, (Field.VALUE,)),
+            SubscribeEntry('Vehicle.Powertrain.FuelSystem.RelativeLevel', View.FIELDS, (Field.VALUE,)),
             SubscribeEntry('Vehicle.Powertrain.CombustionEngine.ECT', View.FIELDS, (Field.VALUE,)),
             SubscribeEntry('Vehicle.Powertrain.Transmission.SelectedGear', View.FIELDS, (Field.VALUE,)),
-            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Left.Temperature', View.FIELDS, (Field.VALUE,)),
-            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Left.FanSpeed', View.FIELDS, (Field.VALUE,)),
-            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Right.Temperature', View.FIELDS, (Field.VALUE,)),
-            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Right.FanSpeed', View.FIELDS, (Field.VALUE,)),
+            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Driver.Temperature', View.FIELDS, (Field.VALUE,)),
+            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Driver.FanSpeed', View.FIELDS, (Field.VALUE,)),
+            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Passenger.Temperature', View.FIELDS, (Field.VALUE,)),
+            SubscribeEntry('Vehicle.Cabin.HVAC.Station.Row1.Passenger.FanSpeed', View.FIELDS, (Field.VALUE,)),
         ]
 
         async def grpc_subscription(client):
@@ -179,13 +179,13 @@ class UI_Handeler(MainWindow):
                     "Vehicle.Body.Lights.DirectionIndicator.Left.IsSignaling",
                     "Vehicle.Body.Lights.DirectionIndicator.Right.IsSignaling",
                     "Vehicle.Body.Lights.Hazard.IsSignaling",
-                    "Vehicle.Powertrain.FuelSystem.Level",
+                    "Vehicle.Powertrain.FuelSystem.RelativeLevel",
                     "Vehicle.Powertrain.CombustionEngine.ECT",
                     "Vehicle.Powertrain.Transmission.SelectedGear",
-                    "Vehicle.Cabin.HVAC.Station.Row1.Left.Temperature",
-                    "Vehicle.Cabin.HVAC.Station.Row1.Left.FanSpeed",
-                    "Vehicle.Cabin.HVAC.Station.Row1.Right.Temperature",
-                    "Vehicle.Cabin.HVAC.Station.Row1.Right.FanSpeed"]
+                    "Vehicle.Cabin.HVAC.Station.Row1.Driver.Temperature",
+                    "Vehicle.Cabin.HVAC.Station.Row1.Driver.FanSpeed",
+                    "Vehicle.Cabin.HVAC.Station.Row1.Passenger.Temperature",
+                    "Vehicle.Cabin.HVAC.Station.Row1.Passenger.FanSpeed"]
 
                 if settings.Protocol == "ws":
                     for signal in signals:
@@ -247,7 +247,7 @@ class UI_Handeler(MainWindow):
             IC_Page.hazardBtn.setChecked(bool(value))
             IC_Page.hazardBtn.blockSignals(False)
 
-        if path == "Vehicle.Powertrain.FuelSystem.Level":
+        if path == "Vehicle.Powertrain.FuelSystem.RelativeLevel":
             IC_Page.fuelLevel_slider.blockSignals(True)
             IC_Page.fuelLevel_slider.setValue(int(float(value)))
             IC_Page.fuelLevel_slider.blockSignals(False)
@@ -275,7 +275,7 @@ class UI_Handeler(MainWindow):
                 IC_Page.neutralBtn.setChecked(True)
                 IC_Page.neutralBtn.blockSignals(False)
 
-        if path == "Vehicle.Cabin.HVAC.Station.Row1.Left.Temperature":
+        if path == "Vehicle.Cabin.HVAC.Station.Row1.Driver.Temperature":
             HVAC_Page.leftTempList.blockSignals(True)
             item = HVAC_Page.leftTempList.findItems(
                 str(int(float(value))) + "°C", QtCore.Qt.MatchExactly)[0]
@@ -283,12 +283,12 @@ class UI_Handeler(MainWindow):
             HVAC_Page.leftTempList.scrollToItem(item, 1)
             HVAC_Page.leftTempList.blockSignals(False)
 
-        if path == "Vehicle.Cabin.HVAC.Station.Row1.Left.FanSpeed":
+        if path == "Vehicle.Cabin.HVAC.Station.Row1.Driver.FanSpeed":
             HVAC_Page.leftFanSpeed_slider.blockSignals(True)
             HVAC_Page.leftFanSpeed_slider.setValue(int(float(value)))
             HVAC_Page.leftFanSpeed_slider.blockSignals(False)
 
-        if path == "Vehicle.Cabin.HVAC.Station.Row1.Right.Temperature":
+        if path == "Vehicle.Cabin.HVAC.Station.Row1.Passenger.Temperature":
             HVAC_Page.rightTempList.blockSignals(True)
             item = HVAC_Page.leftTempList.findItems(
                 str(int(float(value))) + "°C", QtCore.Qt.MatchExactly)[0]
@@ -296,7 +296,7 @@ class UI_Handeler(MainWindow):
             HVAC_Page.rightTempList.scrollToItem(item, 1)
             HVAC_Page.rightTempList.blockSignals(False)
 
-        if path == "Vehicle.Cabin.HVAC.Station.Row1.Right.FanSpeed":
+        if path == "Vehicle.Cabin.HVAC.Station.Row1.Passenger.FanSpeed":
             HVAC_Page.rightFanSpeed_slider.blockSignals(True)
             HVAC_Page.rightFanSpeed_slider.setValue(int(float(value)))
             HVAC_Page.rightFanSpeed_slider.blockSignals(False)