Add ability to disable HVAC and steering wheel pages

Add configuration file options to disable the HVAC and steering
wheel pages.  Also includes a bit of refactoring around the
KUKSA.val databroker client mostly focused on cleaning up naming
for now.  If significant development continues on this application
the KuksaClient class should be used as the place where more
refactoring occurs.

Bug-AGL: SPEC-5142

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

1 files changed, 27 insertions, 40 deletions

diff --git a/Widgets/SteeringCtrlPage.py b/Widgets/SteeringCtrlPage.py
index a610f9b..7e0a131 100644
--- a/Widgets/SteeringCtrlPage.py
+++ b/Widgets/SteeringCtrlPage.py
@@ -1,22 +1,11 @@
-"""
-    Copyright 2023 Suchinton Chakravarty
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at 
-
-        http://www.apache.org/licenses/LICENSE-2.0  
-        
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-"""
+# Copyright (C) 2023 Suchinton Chakravarty
+# Copyright (C) 2024 Konsulko Group
+#
+# SPDX-License-Identifier: Apache-2.0
 
 from . import settings
 import extras.FeedCAN as feed_can
-from extras.FeedKuksa import FeedKuksa
+from extras.KuksaClient import KuksaClient
 import os
 import sys
 from PyQt5 import uic
@@ -39,58 +28,58 @@ class Steering_Paths():
     def __init__(self):
         self.switches = {
             "VolumeUp": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.VolumeUp",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.VolumeUp",
                 "CAN": "021#FFFFFFFF40000000"},
             "VolumeDown": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.VolumeDown",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.VolumeDown",
                 "CAN": "021#FFFFFFFF10000000"},
             "VolumeMute": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.VolumeMute",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.VolumeMute",
                 "CAN": "021#FFFFFFFF01000000"},
             "Mode": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.Mode",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.Mode",
                 "CAN": "021#FFFFFFFF20000000"},
             "NextTrack": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.Next",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.Next",
                 "CAN": "021#FFFFFFFF08000000"},
             "PreviousTrack": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.Previous",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.Previous",
                 "CAN": "021#FFFFFFFF80000000"},
             "Info": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.Info",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.Info",
                 "CAN": "021#FFFFFFFF02000000"},
             "PhoneCall": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.PhoneCall",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.PhoneCall",
                 "CAN": "021#FFFFFFFF00010000"},
             "PhoneHangup": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.PhoneHangup",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.PhoneHangup",
                 "CAN": "021#FFFFFFFF00020000"},
             "Voice": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.Voice",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.Voice",
                 "CAN": "021#FFFFFFFF00040000"},
             "LaneDeparture": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.LaneDepartureWarning",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.LaneDepartureWarning",
                 "CAN": "021#FFFFFFFF00000001"},
             "Horn": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.Horn",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.Horn",
                 "CAN": "021#FFFFFFFF00000080"},
             "CruiseEnable": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.CruiseEnable",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.CruiseEnable",
                 "CAN": "021#FFFFFFFF00008000"},
             "CruiseSet": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.CruiseSet",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.CruiseSet",
                 "CAN": "021#FFFFFFFF00001000"},
             "CruiseResume": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.CruiseResume",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.CruiseResume",
                 "CAN": "021#FFFFFFFF00004000"},
             "CruiseCancel": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.CruiseCancel",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.CruiseCancel",
                 "CAN": "021#FFFFFFFF00000800"},
             "CruiseLimit": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.CruiseLimit",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.CruiseLimit",
                 "CAN": "021#FFFFFFFF00000200"},
             "CruiseDistance": {
-                "Kuksa": "Vehicle.Cabin.SteeringWheel.Switches.CruiseDistance",
+                "VSS": "Vehicle.Cabin.SteeringWheel.Switches.CruiseDistance",
                 "CAN": "021#FFFFFFFF00000100"}
         }
 
@@ -101,7 +90,7 @@ class SteeringCtrlWidget(Base, Form):
         self.setupUi(self)
 
         self.Steering = Steering_Paths()
-        self.feed_kuksa = FeedKuksa()
+        self.kuksa_client = KuksaClient()
         self.settings = settings
 
         self.add_buttons()
@@ -138,11 +127,9 @@ class SteeringCtrlWidget(Base, Form):
     def controls_clicked(self, button):
         button_clicked = button.objectName()
         signal_type = settings.Steering_Signal_Type
-        if signal_type == "Kuksa":
-            self.feed_kuksa.send_values(
-                self.Steering.switches[button_clicked]["Kuksa"], "1")
-            self.feed_kuksa.send_values(
-                self.Steering.switches[button_clicked]["Kuksa"], "0")
+        if signal_type == "VSS":
+            self.kuksa_client.set(self.Steering.switches[button_clicked]["VSS"], "1")
+            self.kuksa_client.set(self.Steering.switches[button_clicked]["VSS"], "0")
         elif signal_type == "CAN":
             feed_can.send_can_signal(
                 self.Steering.switches[button_clicked]["CAN"])