Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
82c612c
Implement KUKSAReader class in header file
melaniereis Dec 11, 2025
54fa763
Add gRPC includes and namespace for KUKSAReader class
melaniereis Dec 11, 2025
483bc2f
Implement constructor and destructor for KUKSAReader class
melaniereis Dec 11, 2025
5b7b11b
Refactor KUKSAReader class to add start slot and speedReceived signal
melaniereis Dec 11, 2025
c94baef
Implement KUKSAReader class with constructor, destructor, and start m…
melaniereis Dec 11, 2025
8fc88dc
Refactor KUKSAReader constructor and destructor for clarity; enhance …
melaniereis Dec 11, 2025
e78abf8
Implement loop for reading incoming speed data in KUKSAReader::start …
melaniereis Dec 11, 2025
e7fe99e
Add Kuksa Middleware dependencies to CMakeLists.txt
melaniereis Dec 11, 2025
758fc38
Add Protocol Buffers code generation paths in CMakeLists.txt
melaniereis Dec 11, 2025
50d4c85
Add initial Protocol Buffers definitions for VSS entries and RPC serv…
melaniereis Dec 11, 2025
6d3901f
Add gRPC generated files to CMake build process
melaniereis Dec 11, 2025
9058fe8
Add generated gRPC and Protocol Buffers source files to myqtapp target
melaniereis Dec 11, 2025
df14794
Add gRPC and Abseil dependencies to target_link_libraries for myqtapp
melaniereis Dec 11, 2025
b5c976a
Set application name for DrivaPi Dashboard in main.cpp
melaniereis Dec 11, 2025
196446f
Add argument parsing for Kuksa mode in main.cpp
melaniereis Dec 11, 2025
12d5a06
Refactor main.cpp to improve QML engine initialization and maintain c…
melaniereis Dec 11, 2025
31a8dc1
Implement KUKSAReader setup in main.cpp for Kuksa mode support
melaniereis Dec 11, 2025
27b1207
Refactor CAN and KUKSA reader setup in main.cpp for improved thread m…
melaniereis Dec 11, 2025
59fa00d
Add thread-safe handler for KUKSA speed updates in VehicleData
melaniereis Dec 11, 2025
8baf2b9
Update gRPC import path and change CANReader interface to use vcan0 f…
melaniereis Dec 11, 2025
409a6bd
Fix constructor definition in KUKSAReader class and include QDebug he…
melaniereis Dec 11, 2025
c7a2575
Implement KUKSAReader and CANReader setup in main.cpp for improved th…
melaniereis Dec 11, 2025
e86b2e8
Change CANReader interface to use 'can1' instead of 'vcan0'
melaniereis Dec 11, 2025
1e67b8c
add code for latency testing of KUKSAreader
melaniereis Dec 12, 2025
3adc95b
Add QDateTime for latency testing in KUKSAReader and update CANReader…
melaniereis Dec 12, 2025
9bbf777
add latency testing code to canreader.cpp
melaniereis Dec 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kuksa-can-provider
Submodule kuksa-can-provider added at 34b71c
41 changes: 40 additions & 1 deletion qt_app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,33 @@ set(CMAKE_AUTOUIC ON)
# Use Qt6
find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Qml QuickControls2 SerialBus)

# --- Find Kuksa Middleware Dependencies ---
find_package(Protobuf REQUIRED)
find_package(gRPC REQUIRED)
find_program(gRPC_PLUGIN_EXECUTABLE grpc_cpp_plugin) # Tool to generate network code
find_package(absl REQUIRED) # Google common libraries (Critical dependency)

# --- Protocol Buffers Code Generation ---
# Define paths for input (.proto) and output (generated C++)
set(PROTO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/proto")
set(PROTO_SRCS "${PROTO_DIR}/val.proto" "${PROTO_DIR}/types.proto")
set(GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
file(MAKE_DIRECTORY ${GEN_DIR})

# Command to auto-generate C++ sources from .proto files before compilation
add_custom_command(
OUTPUT "${GEN_DIR}/val.pb.cc" "${GEN_DIR}/val.pb.h"
"${GEN_DIR}/val.grpc.pb.cc" "${GEN_DIR}/val.grpc.pb.h"
"${GEN_DIR}/types.pb.cc" "${GEN_DIR}/types.pb.h"
# Step 1: Generate gRPC Network Stubs
COMMAND ${Protobuf_PROTOC_EXECUTABLE}
ARGS --grpc_out=${GEN_DIR} --plugin=protoc-gen-grpc=${gRPC_PLUGIN_EXECUTABLE} -I${PROTO_DIR} ${PROTO_SRCS}
# Step 2: Generate Data Serialization Classes
COMMAND ${Protobuf_PROTOC_EXECUTABLE}
ARGS --cpp_out=${GEN_DIR} -I${PROTO_DIR} ${PROTO_SRCS}
DEPENDS ${PROTO_SRCS}
)

file(GLOB_RECURSE APP_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp"
)
Expand All @@ -17,16 +44,28 @@ add_executable(myqtapp ${APP_SOURCES})

target_include_directories(myqtapp PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include
${GEN_DIR}
)

target_sources(myqtapp PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/resources/qml.qrc"
"${CMAKE_CURRENT_SOURCE_DIR}/resources/resources.qrc"
"${CMAKE_CURRENT_SOURCE_DIR}/include/vehicledata.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/include/canreader.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/include/kuksareader.hpp"
"${GEN_DIR}/val.pb.cc"
"${GEN_DIR}/val.grpc.pb.cc"
"${GEN_DIR}/types.pb.cc"
)

target_link_libraries(myqtapp PRIVATE Qt6::Core Qt6::Gui Qt6::Quick Qt6::Qml Qt6::QuickControls2 Qt6::SerialBus)
target_link_libraries(myqtapp PRIVATE
Qt6::Core Qt6::Gui Qt6::Quick Qt6::Qml Qt6::QuickControls2 Qt6::SerialBus
gRPC::grpc++ # The gRPC Transport Layer
protobuf::libprotobuf # The Serialization Library
absl::base # Abseil Base (Required by gRPC)
absl::strings # Abseil Strings
absl::log_internal_check_op # <--- Critical fix for "Undefined Symbol" linker errors
)


install(TARGETS myqtapp RUNTIME DESTINATION bin)
31 changes: 31 additions & 0 deletions qt_app/include/kuksareader.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#ifndef KUKSAREADER_HPP
#define KUKSAREADER_HPP

#include <QObject>
#include <QDebug>
#include <grpcpp/grpcpp.h>
#include "val.grpc.pb.h"

// KUKSA Val gRPC namespace to avoid long names
using namespace kuksa::val::v1;

class KUKSAReader : public QObject
{
Q_OBJECT
public:
explicit KUKSAReader(QObject *parent = nullptr);
~KUKSAReader() override;
public slots:
// Starts the data fetching process
void start();

signals:
// Emitted when new speed data is received
void speedReceived(float speed);

private:
// gRPC client stub -> used to communicate with KUKSA Val server
std::unique_ptr<VAL::Stub> m_stub_;
};

#endif // KUKSAREADER_HPP
3 changes: 3 additions & 0 deletions qt_app/include/vehicledata.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ class VehicleData : public QObject
Q_INVOKABLE void changeGearUp();
Q_INVOKABLE void changeGearDown();

// Thread-safe handlers for incoming data
void handleSpeedUpdate(float speed);

public slots:
// Called by CANReader (queued connection) with raw payload + canId
void handleCanMessage(const QByteArray &payload, uint32_t canId);
Expand Down
288 changes: 288 additions & 0 deletions qt_app/proto/types.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
/********************************************************************************
* Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License 2.0 which is available at
* http://www.apache.org/licenses/LICENSE-2.0
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

syntax = "proto3";

// I added V1 as in databroker. Is this good practice?
package kuksa.val.v1;
import "google/protobuf/timestamp.proto";

option go_package = "kuksa/val/v1";

// Describes a VSS entry
// When requesting an entry, the amount of information returned can
// be controlled by specifying either a `View` or a set of `Field`s.
message DataEntry {
// Defines the full VSS path of the entry.
string path = 1; // [field: FIELD_PATH]

// The value (datapoint)
Datapoint value = 2; // [field: FIELD_VALUE]

// Actuator target (only used if the entry is an actuator)
Datapoint actuator_target = 3; // [field: FIELD_ACTUATOR_TARGET]

// Metadata for this entry
Metadata metadata = 10; // [field: FIELD_METADATA]
}

message Datapoint {
google.protobuf.Timestamp timestamp = 1;

oneof value {
string string = 11;
bool bool = 12;
sint32 int32 = 13;
sint64 int64 = 14;
uint32 uint32 = 15;
uint64 uint64 = 16;
float float = 17;
double double = 18;
StringArray string_array = 21;
BoolArray bool_array = 22;
Int32Array int32_array = 23;
Int64Array int64_array = 24;
Uint32Array uint32_array = 25;
Uint64Array uint64_array = 26;
FloatArray float_array = 27;
DoubleArray double_array = 28;
}
}

message Metadata {
// Data type
// The VSS data type of the entry (i.e. the value, min, max etc).
//
// NOTE: protobuf doesn't have int8, int16, uint8 or uint16 which means
// that these values must be serialized as int32 and uint32 respectively.
DataType data_type = 11; // [field: FIELD_METADATA_DATA_TYPE]

// Entry type
EntryType entry_type = 12; // [field: FIELD_METADATA_ENTRY_TYPE]

// Description
// Describes the meaning and content of the entry.
optional string description = 13; // [field: FIELD_METADATA_DESCRIPTION]

// Comment [optional]
// A comment can be used to provide additional informal information
// on a entry.
optional string comment = 14; // [field: FIELD_METADATA_COMMENT]

// Deprecation [optional]
// Whether this entry is deprecated. Can contain recommendations of what
// to use instead.
optional string deprecation = 15; // [field: FIELD_METADATA_DEPRECATION]

// Unit [optional]
// The unit of measurement
optional string unit = 16; // [field: FIELD_METADATA_UNIT]

// Value restrictions [optional]
// Restrict which values are allowed.
// Only restrictions matching the DataType {datatype} above are valid.
ValueRestriction value_restriction = 17; // [field: FIELD_METADATA_VALUE_RESTRICTION]

// Entry type specific metadata
oneof entry_specific {
Actuator actuator = 20; // [field: FIELD_METADATA_ACTUATOR]
Sensor sensor = 30; // [field: FIELD_METADATA_SENSOR]
Attribute attribute = 40; // [field: FIELD_METADATA_ATTRIBUTE]
}
}

///////////////////////
// Actuator specific fields
message Actuator {
// Nothing for now
}

////////////////////////
// Sensor specific
message Sensor {
// Nothing for now
}

////////////////////////
// Attribute specific
message Attribute {
// Nothing for now.
}

// Value restriction
//
// One ValueRestriction{type} for each type, since
// they don't make sense unless the types match
//
message ValueRestriction {
oneof type {
ValueRestrictionString string = 21;
// For signed VSS integers
ValueRestrictionInt signed = 22;
// For unsigned VSS integers
ValueRestrictionUint unsigned = 23;
// For floating point VSS values (float and double)
ValueRestrictionFloat floating_point = 24;
}
}

message ValueRestrictionInt {
optional sint64 min = 1;
optional sint64 max = 2;
repeated sint64 allowed_values = 3;
}

message ValueRestrictionUint {
optional uint64 min = 1;
optional uint64 max = 2;
repeated uint64 allowed_values = 3;
}

message ValueRestrictionFloat {
optional double min = 1;
optional double max = 2;

// allowed for doubles/floats not recommended
repeated double allowed_values = 3;
}

// min, max doesn't make much sense for a string
message ValueRestrictionString {
repeated string allowed_values = 3;
}

// VSS Data type of a signal
//
// Protobuf doesn't support int8, int16, uint8 or uint16.
// These are mapped to int32 and uint32 respectively.
//
enum DataType {
DATA_TYPE_UNSPECIFIED = 0;
DATA_TYPE_STRING = 1;
DATA_TYPE_BOOLEAN = 2;
DATA_TYPE_INT8 = 3;
DATA_TYPE_INT16 = 4;
DATA_TYPE_INT32 = 5;
DATA_TYPE_INT64 = 6;
DATA_TYPE_UINT8 = 7;
DATA_TYPE_UINT16 = 8;
DATA_TYPE_UINT32 = 9;
DATA_TYPE_UINT64 = 10;
DATA_TYPE_FLOAT = 11;
DATA_TYPE_DOUBLE = 12;
DATA_TYPE_TIMESTAMP = 13;
DATA_TYPE_STRING_ARRAY = 20;
DATA_TYPE_BOOLEAN_ARRAY = 21;
DATA_TYPE_INT8_ARRAY = 22;
DATA_TYPE_INT16_ARRAY = 23;
DATA_TYPE_INT32_ARRAY = 24;
DATA_TYPE_INT64_ARRAY = 25;
DATA_TYPE_UINT8_ARRAY = 26;
DATA_TYPE_UINT16_ARRAY = 27;
DATA_TYPE_UINT32_ARRAY = 28;
DATA_TYPE_UINT64_ARRAY = 29;
DATA_TYPE_FLOAT_ARRAY = 30;
DATA_TYPE_DOUBLE_ARRAY = 31;
DATA_TYPE_TIMESTAMP_ARRAY = 32;
}

// Entry type
enum EntryType {
ENTRY_TYPE_UNSPECIFIED = 0;
ENTRY_TYPE_ATTRIBUTE = 1;
ENTRY_TYPE_SENSOR = 2;
ENTRY_TYPE_ACTUATOR = 3;
}

// A `View` specifies a set of fields which should
// be populated in a `DataEntry` (in a response message)
enum View {
VIEW_UNSPECIFIED = 0; // Unspecified. Equivalent to VIEW_CURRENT_VALUE unless `fields` are explicitly set.
VIEW_CURRENT_VALUE = 1; // Populate DataEntry with value.
VIEW_TARGET_VALUE = 2; // Populate DataEntry with actuator target.
VIEW_METADATA = 3; // Populate DataEntry with metadata.
VIEW_FIELDS = 10; // Populate DataEntry only with requested fields.
VIEW_ALL = 20; // Populate DataEntry with everything.
}

// A `Field` corresponds to a specific field of a `DataEntry`.
//
// It can be used to:
// * populate only specific fields of a `DataEntry` response.
// * specify which fields of a `DataEntry` should be set as
// part of a `Set` request.
// * subscribe to only specific fields of a data entry.
// * convey which fields of an updated `DataEntry` have changed.
enum Field {
FIELD_UNSPECIFIED = 0; // "*" i.e. everything
FIELD_PATH = 1; // path
FIELD_VALUE = 2; // value
FIELD_ACTUATOR_TARGET = 3; // actuator_target
FIELD_METADATA = 10; // metadata.*
FIELD_METADATA_DATA_TYPE = 11; // metadata.data_type
FIELD_METADATA_DESCRIPTION = 12; // metadata.description
FIELD_METADATA_ENTRY_TYPE = 13; // metadata.entry_type
FIELD_METADATA_COMMENT = 14; // metadata.comment
FIELD_METADATA_DEPRECATION = 15; // metadata.deprecation
FIELD_METADATA_UNIT = 16; // metadata.unit
FIELD_METADATA_VALUE_RESTRICTION = 17; // metadata.value_restriction.*
FIELD_METADATA_ACTUATOR = 20; // metadata.actuator.*
FIELD_METADATA_SENSOR = 30; // metadata.sensor.*
FIELD_METADATA_ATTRIBUTE = 40; // metadata.attribute.*
}

// Error response shall be an HTTP-like code.
// Should follow https://www.w3.org/TR/viss2-transport/#status-codes.
message Error {
uint32 code = 1;
string reason = 2;
string message = 3;
}

// Used in get/set requests to report errors for specific entries
message DataEntryError {
string path = 1; // vss path
Error error = 2;
}

message StringArray {
repeated string values = 1;
}

message BoolArray {
repeated bool values = 1;
}

message Int32Array {
repeated sint32 values = 1;
}

message Int64Array {
repeated sint64 values = 1;
}

message Uint32Array {
repeated uint32 values = 1;
}

message Uint64Array {
repeated uint64 values = 1;
}

message FloatArray {
repeated float values = 1;
}

message DoubleArray {
repeated double values = 1;
}
Loading
Loading