kuksa-dbc-feeder: Upgrade to kuksa-can-provider 0.4.3

Upgrade kuksa-dbc-feeder to 0.4.3 release, which includes a rename
to kuksa-can-provider and a new location on github.  All references
to kuksa-dbc-feeder have been renamed throughout the tree to
hopefully maintain consistency, though note that the actual script
name upstream remains "dbcfeeder.py" at present.

Bug-AGL: SPEC-5179

Change-Id: I88cf1c29187ad6cb882ee538a98e6e138aa76bfa
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30002
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account

12 files changed, 0 insertions, 632 deletions

diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0001-dbc2val-add-installation-mechanism.patch b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0001-dbc2val-add-installation-mechanism.patch
deleted file mode 100644
index 58ad32593..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0001-dbc2val-add-installation-mechanism.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From d23ce9baabaabff17a4bf6050462edd11feb7cef Mon Sep 17 00:00:00 2001
-From: Scott Murray <scott.murray@konsulko.com>
-Date: Wed, 19 Apr 2023 15:55:01 -0400
-Subject: [PATCH] dbc2val: add installation mechanism
-
-Add setup.py and setup.cfg to allow installing the dbcfeederlib
-module and dbcfeeder.py in a way suitable for packaging.
-
-Upstream-Status: pending
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
-
----
- dbc2val/setup.cfg | 30 ++++++++++++++++++++++++++++++
- dbc2val/setup.py  | 14 ++++++++++++++
- 2 files changed, 44 insertions(+)
- create mode 100644 dbc2val/setup.cfg
- create mode 100644 dbc2val/setup.py
-
-diff --git a/dbc2val/setup.cfg b/dbc2val/setup.cfg
-new file mode 100644
-index 0000000..03dc6d6
---- /dev/null
-+++ b/dbc2val/setup.cfg
-@@ -0,0 +1,30 @@
-+[metadata]
-+name = dbcfeeder
-+author = Sebastian Schildt, Naresh Nayak, Wenwen Chen
-+author_email = sebastian.schildt@de.bosch.com, naresh.nayak@de.bosch.com, wenwen.chen@de.bosch.com
-+description = kuksa.val DBC feeder
-+long_description = file:README.md
-+long_description_content_type = text/markdown
-+url=https://github.com/eclipse/kuksa.val.feeders
-+project_urls=
-+  Source=https://github.com/eclipse/kuksa.val.feeders/tree/master/dbc2val
-+  Bug Tracker=https://github.com/eclipse/kuksa.val.feeders/issues
-+classifiers =
-+    Intended Audience :: Developers
-+    Development Status :: 3 - Alpha
-+    Environment :: Console
-+    Programming Language :: Python :: 3
-+    License :: OSI Approved :: Apache Software License
-+    Operating System :: OS Independent
-+    Topic :: Software Development
-+
-+license_file = ../LICENSE.txt
-+
-+[options]
-+python_requires = >=3.6
-+install_requires=
-+    pyserial
-+    pyyaml
-+    kuksa-client
-+packages=dbcfeederlib
-+scripts=dbcfeeder.py
-diff --git a/dbc2val/setup.py b/dbc2val/setup.py
-new file mode 100644
-index 0000000..65f9157
---- /dev/null
-+++ b/dbc2val/setup.py
-@@ -0,0 +1,14 @@
-+from setuptools import setup
-+
-+setup(
-+    version_config={
-+        "template": "{tag}",
-+        "dev_template": "{tag}-{ccount}",
-+        "dirty_template": "{tag}+{ccount}-dirty",
-+        "starting_version": "0.1.0",
-+        "version_callback": None,
-+        "version_file": None,
-+        "count_commits_from_version_file": False
-+    },
-+    setup_requires=['setuptools-git-versioning'],
-+)
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0002-dbc2val-usability-improvements.patch b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0002-dbc2val-usability-improvements.patch
deleted file mode 100644
index 31051b18c..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0002-dbc2val-usability-improvements.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From b217a746ef7b92291320e4c1a66b52df0318495f Mon Sep 17 00:00:00 2001
-From: Scott Murray <scott.murray@konsulko.com>
-Date: Sat, 5 Aug 2023 13:58:16 -0400
-Subject: [PATCH 2/3] dbc2val: usability improvements
-
-Changes:
-- Tweaked default configuration file search path to better match
-  Linux FHS and kuksa-val-server.  First look for a config.ini in
-  /etc/kuksa-dbc-feeder, then /etc/dbc_feeder.ini.
-- Add catching of exceptions around CAN device opening so that the
-  script can exit cleanly with an error message if the device is
-  not available.
-- Fixed shutdown behavior with some tweaks to actually stop the
-  reader and KUKSA.val client library threads.  This makes the
-  script actually exit on SIGTERM as opposed to hanging.
-
-Upstream-Status: pending
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
----
- dbc2val/dbcfeeder.py | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/dbc2val/dbcfeeder.py b/dbc2val/dbcfeeder.py
-index 966dba7..e7fd319 100755
---- a/dbc2val/dbcfeeder.py
-+++ b/dbc2val/dbcfeeder.py
-@@ -188,7 +188,11 @@ class Feeder:
- 
-                 # use socketCAN
-                 log.info("Using socket CAN device '%s'", canport)
-+            try:
-                 self._reader.start_listening(bustype="socketcan", channel=canport)
-+            except:
-+                log.error("Could not open {}, exiting".format(canport))
-+                sys.exit(-1)
- 
-             receiver = threading.Thread(target=self._run_receiver)
-             receiver.start()
-@@ -212,6 +216,11 @@ class Feeder:
-                 threads.append(transmitter)
-         else:
-             log.info("No val2dbc mappings found or val2dbc disabled!!")
-+
-+        # Spin so signal handlers will work
-+        while not self._shutdown:
-+            time.sleep(0.1)
-+
-         # Wait for all of them to finish
-         for thread in threads:
-             thread.join()
-@@ -363,8 +372,10 @@ def parse_config(filename):
-         configfile = filename
-     else:
-         config_candidates = [
--            "/config/dbc_feeder.ini",
-+            "/etc/kuksa-dbc-feeder/config.ini",
-+            "/etc/kuksa-dbc-feeder/dbc_feeder.ini",
-             "/etc/dbc_feeder.ini",
-+            "/config/dbc_feeder.ini",
-             "config/dbc_feeder.ini",
-         ]
-         for candidate in config_candidates:
-@@ -577,7 +588,7 @@ def main(argv):
-     elif "can" in config and "dbc_default_file" in config["can"]:
-         dbc_default = config["can"]["dbc_default_file"]
-     else:
--        dbc_default = "dbc_default_values.json"
-+        dbc_default = ""
- 
-     if args.dbc2val:
-         use_dbc2val = True
--- 
-2.41.0
-
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch
deleted file mode 100644
index aae8b3dc0..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dc20da27a73141b04cc6b0ce5d74e547d6fc7256 Mon Sep 17 00:00:00 2001
-From: Scott Murray <scott.murray@konsulko.com>
-Date: Mon, 8 May 2023 14:58:06 -0400
-Subject: [PATCH] dbc2val: fix token file configuration option
-
-The client library changed the token option name to
-'token_or_tokenfile', update things to match so that token
-location can be configured again for dbcfeeder.py.
-
-Upstream-Status: pending
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
----
- dbc2val/dbcfeederlib/serverclientwrapper.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dbc2val/dbcfeederlib/serverclientwrapper.py b/dbc2val/dbcfeederlib/serverclientwrapper.py
-index 1219a76..63bc12e 100644
---- a/dbc2val/dbcfeederlib/serverclientwrapper.py
-+++ b/dbc2val/dbcfeederlib/serverclientwrapper.py
-@@ -59,7 +59,7 @@ class ServerClientWrapper(clientwrapper.ClientWrapper):
-         self._client_config["insecure"] = not self._tls
-         # Do not set token if it is empty to allow default client lib info to be used
-         if self._token_path != "":
--            self._client_config["token"] = self._token_path
-+            self._client_config["token_or_tokenfile"] = self._token_path
- 
-         if self._root_ca_path:
-             self._client_config['cacertificate'] = self._root_ca_path
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0004-Enable-val2dbc-for-sensor-values.patch b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0004-Enable-val2dbc-for-sensor-values.patch
deleted file mode 100644
index 7f22a90ad..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0004-Enable-val2dbc-for-sensor-values.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From d6f1aaa7f26aa52f4b219f60e704d5ab2954f082 Mon Sep 17 00:00:00 2001
-From: Scott Murray <scott.murray@konsulko.com>
-Date: Wed, 3 Apr 2024 02:09:11 +0900
-Subject: [PATCH] Enable val2dbc for sensor values
-
-Rework to allow val2dbc mode to write out sensor values in
-addition to actuator target values.
-
-Upstream-Status: pending
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
----
- dbc2val/dbcfeeder.py                           |  8 ++++++--
- .../dbcfeederlib/databrokerclientwrapper.py    | 18 ++++++++++++------
- dbc2val/dbcfeederlib/dbc2vssmapper.py          | 14 +++++++++-----
- dbc2val/dbcfeederlib/serverclientwrapper.py    |  2 +-
- 4 files changed, 28 insertions(+), 14 deletions(-)
-
-diff --git a/dbc2val/dbcfeeder.py b/dbc2val/dbcfeeder.py
-index e7fd319..5e0df2f 100755
---- a/dbc2val/dbcfeeder.py
-+++ b/dbc2val/dbcfeeder.py
-@@ -322,15 +322,19 @@ class Feeder:
-         log.debug("vss-Update callback!")
-         dbc_ids = set()
-         for update in updates:
-+            value = None
-             if update.entry.value is not None:
--                # This shall currently never happen as we do not subscribe to this
-                 log.warning(f"Current value for {update.entry.path} is now: "
-                             f"{update.entry.value.value} of type {type(update.entry.value.value)}")
-+                value = update.entry.value.value
- 
-             if update.entry.actuator_target is not None:
-                 log.debug(f"Target value for {update.entry.path} is now: {update.entry.actuator_target} "
-                           f"of type {type(update.entry.actuator_target.value)}")
--                new_dbc_ids = self._mapper.handle_update(update.entry.path, update.entry.actuator_target.value)
-+                value = update.entry.actuator_target.value
-+
-+            if value != None:
-+                new_dbc_ids = self._mapper.handle_update(update.entry.path, value)
-                 dbc_ids.update(new_dbc_ids)
- 
-         can_ids = set()
-diff --git a/dbc2val/dbcfeederlib/databrokerclientwrapper.py b/dbc2val/dbcfeederlib/databrokerclientwrapper.py
-index 35836e9..46ae330 100644
---- a/dbc2val/dbcfeederlib/databrokerclientwrapper.py
-+++ b/dbc2val/dbcfeederlib/databrokerclientwrapper.py
-@@ -200,14 +200,20 @@ class DatabrokerClientWrapper(clientwrapper.ClientWrapper):
-     def supports_subscription(self) -> bool:
-         return True
- 
--    async def subscribe(self, vss_names: List[str], callback):
-+    async def subscribe(self, vss_entries: dict[str, str], callback):
-         """Creates a subscription and calls the callback when data received"""
-         entries = []
--        for name in vss_names:
--            # Always subscribe to target
--            subscribe_entry = SubscribeEntry(name, View.FIELDS, [Field.ACTUATOR_TARGET])
--            log.info(f"Subscribe entry: {subscribe_entry}")
--            entries.append(subscribe_entry)
-+        for name, signal_type in vss_entries.items():
-+            if signal_type == "actuator":
-+                subscribe_entry = SubscribeEntry(name, View.FIELDS, [Field.ACTUATOR_TARGET])
-+                log.info(f"Subscribe entry: {subscribe_entry}")
-+                entries.append(subscribe_entry)
-+            if signal_type == "sensor":
-+                subscribe_entry = SubscribeEntry(name, View.FIELDS, [Field.VALUE])
-+                log.info(f"Subscribe entry: {subscribe_entry}")
-+                entries.append(subscribe_entry)
-+        if not entries:
-+            return
- 
-         # If there is a path VSSClient will request a secure connection
-         if self._tls and self._root_ca_path:
-diff --git a/dbc2val/dbcfeederlib/dbc2vssmapper.py b/dbc2val/dbcfeederlib/dbc2vssmapper.py
-index 5142a5e..8f04cdd 100644
---- a/dbc2val/dbcfeederlib/dbc2vssmapper.py
-+++ b/dbc2val/dbcfeederlib/dbc2vssmapper.py
-@@ -61,12 +61,13 @@ class VSSMapping:
-     parser: Parser = Parser()
- 
-     def __init__(self, vss_name: str, dbc_name: str, transform: dict, interval_ms: int,
--                 on_change: bool, datatype: str, description: str):
-+                 on_change: bool, signal_type: str, datatype: str, description: str):
-         self.vss_name = vss_name
-         self.dbc_name = dbc_name
-         self.transform = transform
-         self.interval_ms = interval_ms
-         self.on_change = on_change
-+        self.signal_type = signal_type
-         self.datatype = datatype
-         self.description = description
-         # For time comparison (interval_ms) we store last value used for comparison. Unit seconds.
-@@ -282,7 +283,7 @@ class Mapper:
-                 log.info(f"Using default interval 1000 ms for {expanded_name}")
-                 interval = 1000
-         mapping_entry = VSSMapping(expanded_name, dbc_name, transform, interval, on_change,
--                                   node["datatype"], node["description"])
-+                                   node["type"], node["datatype"], node["description"])
-         if dbc_name not in self.dbc2val_mapping:
-             self.dbc2val_mapping[dbc_name] = []
-         self.dbc2val_mapping[dbc_name].append(mapping_entry)
-@@ -306,7 +307,7 @@ class Mapper:
-             log.warning(f"interval_ms attribute ignored for {expanded_name}")
- 
-         mapping_entry = VSSMapping(expanded_name, dbc_name, transform, interval, on_change,
--                                   node["datatype"], node["description"])
-+                                   node["type"], node["datatype"], node["description"])
-         if dbc_name not in self.val2dbc_mapping:
-             self.val2dbc_mapping[expanded_name] = []
-         self.val2dbc_mapping[expanded_name].append(mapping_entry)
-@@ -380,9 +381,12 @@ class Mapper:
-         """Return a set of all dbc names used for reception"""
-         return self.dbc2val_mapping.keys()
- 
--    def get_val2dbc_entries(self) -> KeysView:
-+    def get_val2dbc_entries(self) -> Dict[str, str]:
-         """Return a set of all vss names used for reception"""
--        return self.val2dbc_mapping.keys()
-+        entries: Dict[str, str] = {}
-+        for name, mappings in self.val2dbc_mapping.items():
-+            entries[name] = mappings[0].signal_type
-+        return entries
- 
-     def get_vss_names(self) -> Set[str]:
-         """Get all VSS names used in mappings, both vss2dbc and dbc2vss"""
-diff --git a/dbc2val/dbcfeederlib/serverclientwrapper.py b/dbc2val/dbcfeederlib/serverclientwrapper.py
-index 63bc12e..ca11daf 100644
---- a/dbc2val/dbcfeederlib/serverclientwrapper.py
-+++ b/dbc2val/dbcfeederlib/serverclientwrapper.py
-@@ -125,6 +125,6 @@ class ServerClientWrapper(clientwrapper.ClientWrapper):
-         log.info("Feature not implemented")
-         return False
- 
--    async def subscribe(self, vss_names: List[str], callback):
-+    async def subscribe(self, vss_entries: dict[str, str], callback):
-         log.error("Feature not implemented")
-         return
--- 
-2.34.1
-
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/agl-vcar.dbc b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/agl-vcar.dbc
deleted file mode 100644
index e638d1287..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/agl-vcar.dbc
+++ /dev/null
@@ -1,69 +0,0 @@
-VERSION "AGL Virtual Car 1.0"
-
-BS_:
-
-BO_ 1001 Vehicle_Status_1: 8 Vector_XXX
-  SG_ PT_VehicleAvgSpeed : 7|15@0+ (0.015625,0) [0|0] "" Vector_XXX
-
-BO_ 985 Vehicle_Status_2: 8 Vector_XXX
-  SG_ PT_FuelLevelPct : 8|8@1+ (0.392157,0) [0|0] "" Vector_XXX
-  SG_ PT_EngineSpeed : 23|16@0+ (0.25,0) [0|0] "" Vector_XXX
-  SG_ PT_FuelLevelLow : 55|1@1+ (1,0) [0|1] "" Vector_XXX
-
-BO_ 986 Vehicle_Status_3: 8 Vector_XXX
-  SG_ PT_HazardOn : 0|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ PT_LeftTurnOn : 1|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ PT_RightTurnOn : 2|1@1+ (1,0) [0|1] "" Vector_XXX
-
-BO_ 48 HVAC_Control_1: 8 Vector_XXX
-  SG_ PT_TempLeft : 7|8@0+ (0.4166666667,0) [0|100] "C" Vector_XXX
-  SG_ PT_TempRight : 15|8@0+ (0.4166666667,0) [0|100] "C" Vector_XXX
-  SG_ PT_FanSpeed : 39|8@0+ (0.392157,0) [0|100] "%" Vector_XXX
-
-BO_ 401 Engine: 8 Vector__XXX
- SG_ ThrottlePosition : 63|8@0+ (0.392157,0) [0|100.000035] "%" Vector__XXX
- 
-BO_ 381 ABS: 8 Vector__XXX
- SG_ VehicleSpeed : 7|12@0+ (0.0625,0) [0|255.9375] "km / h"  ECM_HS,BCM_HS
- SG_ SteeringPosition : 23|12@0+ (0.0439453125,-90) [-90|89.9560546875] "deg"  ECM_HS,BCM_HS
- SG_ BrakePressure : 39|8@0+ (75,0) [0|19125] "kPa"  ECM_HS,BCM_HS
- 
-BO_ 532 Transmission: 8 Vector__XXX
- SG_ Gear : 7|8@0+ (1,-1) [-1|127] ""  ECM_HS,BCM_HS
- 
-BO_ 533 Airbag: 8 Vector__XXX
- SG_ CollisionIntensity : 7|12@0+ (24.4140625,0) [0|100000] "N"  ECM_HS,BCM_HS
- 
-BO_ 534 IMU1: 8 Vector__XXX
- SG_ AccelerationX : 7|12@0+ (0.48828125,-1000) [-1000|1000] "m/s^2"  ECM_HS,BCM_HS
- SG_ AccelerationY : 23|12@0+ (0.48828125,-1000) [-1000|1000] "m/s^2"  ECM_HS,BCM_HS
- SG_ AccelerationZ : 39|12@0+ (0.48828125,-1000) [-1000|1000] "m/s^2"  ECM_HS,BCM_HS
- 
-BO_ 535 IMU2: 8 Vector__XXX
- SG_ GyroscopeX : 7|12@0+ (0.48828125,-1000) [-1000|1000] "rad/s"  ECM_HS,BCM_HS
- SG_ GyroscopeY : 23|12@0+ (0.48828125,-1000) [-1000|1000] "rad/s"  ECM_HS,BCM_HS
- SG_ GyroscopeZ : 39|12@0+ (0.48828125,-1000) [-1000|1000] "rad/s"  ECM_HS,BCM_HS
- 
-BO_ 536 GNSS: 8 Vector__XXX
- SG_ Latitude : 7|32@0+ (0.0000000419095158577,-90) [-90|90] "deg"  ECM_HS,BCM_HS
- SG_ Longitude : 39|32@0+ (0.00000008381903171539,-180) [-180|180] "deg"  ECM_HS,BCM_HS
-
-BO_ 33 Steering_Wheel: 8 Vector_XXX
-  SG_ SW_Previous : 39|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_VolumeUp : 38|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_Mode : 37|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_VolumeDown : 36|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_Next : 35|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_Info : 33|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_VolumeMute : 32|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_Voice : 42|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_PhoneHangup : 41|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_PhoneCall : 40|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_CruiseEnable : 55|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_CruiseResume : 54|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_CruiseSet : 52|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_CruiseCancel : 51|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_CruiseLimit : 49|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_CruiseDistance : 48|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_Horn : 63|1@1+ (1,0) [0|1] "" Vector_XXX
-  SG_ SW_LaneDepartureWarning : 56|1@1+ (1,0) [0|1] "" Vector_XXX
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini
deleted file mode 100644
index 378a3437e..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/config.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[general]
-# server type:
-# switch between kuksa_databroker and kuksa_val_server
-server_type = kuksa_databroker
-# VSS mapping file
-mapping = /usr/share/vss/vss.json
-
-# IP address for server (KUKSA.val Server or Databroker)
-ip = localhost
-
-# Port for server (KUKSA.val Server or Databroker)
-port = 55555
-
-# Shall TLS be used (default False for Databroker, True for KUKSA.val Server)
-tls = True
-
-# TLS-related settings
-# Path to root CA, needed if using TLS
-root_ca_path=/etc/kuksa-val/CA.pem
-
-# Token file for authorization.
-token = /etc/kuksa-dbc-feeder/dbc_feeder.token
-
-[can]
-# CAN port
-port = can0
-# Enable SAE-J1939 Mode. False: ignore
-j1939 = False
-# DBC file used to parse CAN messages
-dbcfile = /etc/kuksa-dbc-feeder/agl-vcar.dbc
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_default_values.json b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_default_values.json
deleted file mode 100644
index 0562569db..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_default_values.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "PT_VehicleAvgSpeed" : 0,
-    "PT_FuelLevelPct" : 0,
-    "PT_EngineSpeed" : 0,
-    "PT_FuelLevelLow" : 0,
-    "PT_TempLeft" : 0,
-    "PT_TempRight" : 0,
-    "PT_FanSpeed" : 0,
-    "ThrottlePosition" : 0,
-    "VehicleSpeed" : 0,
-    "SteeringPosition" : 0,
-    "BrakePressure" : 0,
-    "Gear" : 0,
-    "AccelerationX" : 0,
-    "AccelerationY" : 0,
-    "AccelerationZ" : 0,
-    "GyroscopeX" : 0,
-    "GyroscopeY" : 0,
-    "GyroscopeZ" : 0,
-    "Latitude" : 0,
-    "Longitude" : 0,
-    "SW_Previous" : 0,
-    "SW_VolumeUp" : 0,
-    "SW_Mode" : 0,
-    "SW_VolumeDown" : 0,
-    "SW_Next" : 0,
-    "SW_Info" : 0,
-    "SW_VolumeMute" : 0,
-    "SW_Voice" : 0,
-    "SW_PhoneHangup" : 0,
-    "SW_PhoneCall" : 0,
-    "SW_CruiseEnable" : 0,
-    "SW_CruiseResume" : 0,
-    "SW_CruiseSet" : 0,
-    "SW_CruiseCancel" : 0,
-    "SW_CruiseLimit" : 0,
-    "SW_CruiseDistance" : 0,
-    "SW_Horn" : 0,
-    "SW_LaneDepartureWarning" : 0
-}
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.json.token b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.json.token
deleted file mode 100644
index b8df66663..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.json.token
+++ /dev/null
@@ -1 +0,0 @@
-eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJrdWtzYS52YWwiLCJpc3MiOiJFY2xpcHNlIEtVS1NBIERldiIsImFkbWluIjp0cnVlLCJtb2RpZnlUcmVlIjp0cnVlLCJpYXQiOjE1MTYyMzkwMjIsImV4cCI6MTc2NzIyNTU5OSwia3Vrc2EtdnNzIjp7IioiOiJydyJ9fQ.p2cnFGH16QoQ14l6ljPVKggFXZKmD-vrw8G6Vs6DvAokjsUG8FHh-F53cMsE-GDjyZH_1_CrlDCnbGlqjsFbgAylqA7IAJWp9_N6dL5p8DHZTwlZ4IV8L1CtCALs7XVqvcQKHCCzB63Y8PgVDCAqpQSRb79JPVD4pZwkBKpOknfEY5y9wfbswZiRKdgz7o61_oFnd-yywpse-23HD6v0htThVF1SuGL1PuvGJ8p334nt9bpkZO3gaTh1xVD_uJMwHzbuBCF33_f-I5QMZO6bVooXqGfe1zvl3nDrPEjq1aPulvtP8RgREYEqE6b2hB8jouTiC_WpE3qrdMw9sfWGFbm04qC-2Zjoa1yYSXoxmYd0SnliSYHAad9aXoEmFENezQV-of7sc-NX1-2nAXRAEhaqh0IRuJwB4_sG7SvQmnanwkz-sBYxKqkoFpOsZ6hblgPDOPYY2NAsZlYkjvAL2mpiInrsmY_GzGsfwPeAx31iozImX75rao8rm-XucAmCIkRlpBz6MYKCjQgyRz3UtZCJ2DYF4lKqTjphEAgclbYZ7KiCuTn9HualwtEmVzHHFneHMKl7KnRQk-9wjgiyQ5nlsVpCCblg6JKr9of4utuPO3cBvbjhB4_ueQ40cpWVOICcOLS7_w0i3pCq1ZKDEMrYDJfz87r2sU9kw1zeFQk
\ No newline at end of file
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.token b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.token
deleted file mode 100644
index 8ce854f34..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/dbc_feeder.token
+++ /dev/null
@@ -1 +0,0 @@
-eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicHJvdmlkZSJ9.OJWzTvDjcmeWyg3vmBR5TEtqYaHq8HrpFLlTKZAfDBAQBUHpyUEboJ97jfWuWgBnTpnfboyfAbwvLqo6bEVZ6tXzF8n9LtW6HmPbIWoDqXuobM2grUCVaGKuOcnCpMCQYChziqHbYwRJYP9nkYgbQU1kE4dN7880Io4xzq0GEbWksB2CVpOoExQUmCZpCohPs-XEkdmXhcUKnWnOeiSsRGKusx987vpY_WOXh6WE7DfJgzAgpPDo33qI7zQuTzUILORQsiHmsrQO0-zcvokNjaQUzlt5ETZ7MQLCtiUQaN0NMbDMCWkmSfNvZ5hKCNbfr2FaiMzrGBOQdvQiFo-DqZKGNweaGpufYXuaKfn3SXKoDr8u1xDE5oKgWMjxDR9pQYGzIF5bDXITSywCm4kN5DIn7e2_Ga28h3rBl0t0ZT0cwlszftQRueDTFcMns1u9PEDOqf7fRrhjq3zqpxuMAoRANVd2z237eBsS0AvdSIxL52N4xO8P_h93NN8Vaum28fTPxzm8p9WlQh4mgUelggtT415hLcxizx15ARIRG0RiW91Pglzt4WRtXHnsg93Ixd3yXXzZ2i4Y0hqhj_L12SsXunK2VxKup2sFCQz6wM-t_7ADmNYcs80idzsadY8rYKDV8N1WqOOd4ANG_nzWa86Tyu6wAwhDVag5nbFmLZQ
\ No newline at end of file
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.default b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.default
deleted file mode 100644
index 5d787158d..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.default
+++ /dev/null
@@ -1,3 +0,0 @@
-# For output only mode:
-#EXTRA_ARGS="--val2dbc --no-dbc2val --dbc-default /etc/kuksa-dbc-feeder/dbc_default_values.json"
-#LOG_LEVEL=debug
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service
deleted file mode 100644
index 857f5c7d2..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/kuksa-dbc-feeder.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Eclipse KUKSA.val DBC feeder
-Requires=kuksa-databroker.service can-dev-helper.service
-After=kuksa-databroker.service can-dev-helper.service
-
-[Service]
-EnvironmentFile=-/etc/default/kuksa-dbc-feeder
-ExecStart=/usr/bin/dbcfeeder.py $EXTRA_ARGS
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/mapping.yml b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/mapping.yml
deleted file mode 100644
index b1c1fece7..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/mapping.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-# Mapping Speed
-PT_VehicleAvgSpeed:
-  minupdatedelay: 100
-  targets: 
-    Vehicle.Speed: {}
-
-PT_EngineSpeed:
-  minupdatedelay: 100
-  targets: 
-    Vehicle.Powertrain.CombustionEngine.Speed:
-      transform:
-        math: "floor(x+0.5)"
-
-#
-# NOTE:
-#
-# The following mappings depend on the AGL-specific VSS overlay
-# that adds the extra Vehicle.Cabin.SteeringWheel.Switches sensors.
-# Since the CAN events are coming from LIN polling, applications
-# need to filter/debounce themselves.  The minupdatedelay of 0 is
-# intentional to avoid missing events.
-#
-
-SW_Next:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.Next:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_Previous:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.Previous:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_Mode:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.Mode:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_Info:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.Info:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_CruiseEnable:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.CruiseEnable:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_CruiseSet:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.CruiseSet:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_CruiseResume:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.CruiseResume:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_CruiseCancel:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.CruiseCancel:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_VolumeUp:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.VolumeUp:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_VolumeDown:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.VolumeDown:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_VolumeMute:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.VolumeMute:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_Horn:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.Horn:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"
-
-SW_LaneDepartureWarning:
-  minupdatedelay: 0
-  targets:
-    Vehicle.Cabin.SteeringWheel.Switches.LaneDepartureWarning:
-      filter-duplicates: "true"
-      transform:
-        fullmapping:
-          0: "false"
-          1: "true"