diff options
author | Scott Murray <scott.murray@konsulko.com> | 2023-08-24 15:21:40 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2023-08-24 15:58:58 -0400 |
commit | e6e998428529bb788e2412e84757ad9a0b71fb32 (patch) | |
tree | 732447f581be177a0b181cb1de00c481b82bbda6 /hvac/hvac.cpp | |
parent | 1234b2771bc45a885df54a779dfb8a125f315f93 (diff) |
Rework vehicle signals support to use KUKSA.val databroker
Rework the VehicleSignals class and its use in the Navigation and
Hvac classes to switch from using the original KUKSA.val server
via WebSockets to the KUKSA.val databroker's gRPC "VAL" API.
Notable changes:
- The VehicleSignals API has changed a bit with respect to setting
signals, callers now need to pass the new value as the type that
matches the signal as opposed to always passing a string, and
optionally indicate if an actuator's target or value is being set.
Subscribe operations now also allow subscribing for either
actuator targets or values.
- It is possible that the values returned by get and subscribe
operations will be changed to using QVariant instead of QStrings
in a future follow up, but that has not been done in these changes.
- The connected signal from VehicleSignals still has roughly the
same meaning, but the authorize function and authorized signals
are to some degree redundant now. They have been kept for
compatibility, but may be removed in a follow up set of changes.
- The section header in the .ini files expected by the
VehicleSignalsConfig class has been changed from "vis-client" to
"kuksa-client" since the databroker is not a VIS server, and to
some degree forcing an update on the part of clients is useful
since their authorization tokens also need to change.
- The client key and certificate support has been removed from the
VehicleSignalsConfig class, as they are no longer used in either
the server or databroker as of KUKSA.val 0.4.0. A new optional
parameter, "tls-server-name", has been added to work with the new
TLS support behavior. It can be used to override the expected
host name for connecting to a non-local databroker instance.
- The Navigation constructor now takes an additional parameter to
indicate whether the instance acts as a router or a client.
The underlying need for this stems from an application acting as
a router needing to subscribe to the destination setting actuator
targets.
Bug-AGL: SPEC-4762
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I253480ae2abf068dc6e41a495454960ed5c0feaf
Diffstat (limited to 'hvac/hvac.cpp')
-rw-r--r-- | hvac/hvac.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/hvac/hvac.cpp b/hvac/hvac.cpp index 246fa63..63ba5cf 100644 --- a/hvac/hvac.cpp +++ b/hvac/hvac.cpp @@ -29,8 +29,6 @@ HVAC::HVAC(VehicleSignals *vs, QObject * parent) : m_temp_right_zone(21) { QObject::connect(m_vs, &VehicleSignals::connected, this, &HVAC::onConnected); - QObject::connect(m_vs, &VehicleSignals::authorized, this, &HVAC::onAuthorized); - QObject::connect(m_vs, &VehicleSignals::disconnected, this, &HVAC::onDisconnected); if (m_vs) m_vs->connect(); @@ -48,7 +46,7 @@ void HVAC::set_fanspeed(int speed) // Scale incoming 0-255 speed to 0-100 to match VSS signal double value = (speed % 256) * 100.0 / 255.0; - m_vs->set("Vehicle.Cabin.HVAC.Station.Row1.Left.FanSpeed", QString::number((int) (value + 0.5))); + m_vs->set("Vehicle.Cabin.HVAC.Station.Row1.Left.FanSpeed", (unsigned int) (value + 0.5), true); emit fanSpeedChanged(speed); } @@ -63,7 +61,7 @@ void HVAC::set_temp_left_zone(int temp) value = 50; else if (value < -50) value = -50; - m_vs->set("Vehicle.Cabin.HVAC.Station.Row1.Left.Temperature", QString::number(value)); + m_vs->set("Vehicle.Cabin.HVAC.Station.Row1.Left.Temperature", value, true); emit leftTemperatureChanged(temp); } @@ -78,7 +76,7 @@ void HVAC::set_temp_right_zone(int temp) value = 50; else if (value < -50) value = -50; - m_vs->set("Vehicle.Cabin.HVAC.Station.Row1.Right.Temperature", QString::number(value)); + m_vs->set("Vehicle.Cabin.HVAC.Station.Row1.Right.Temperature", value, true); emit rightTemperatureChanged(temp); } @@ -87,21 +85,8 @@ void HVAC::onConnected() if (!m_vs) return; - m_vs->authorize(); -} - -void HVAC::onAuthorized() -{ - if (!m_vs) - return; - // Could subscribe and connect notification signal here to monitor // external updates... m_connected = true; } - -void HVAC::onDisconnected() -{ - m_connected = false; -} |