feat(dbus): Add support for configuring 'revpi-con-can' feature

Introduce the `configure_con_can` function to manage enabling,
disabling, status checking, and availability of the 'revpi-con-can'
feature. Update the `AVAILABLE_FEATURES` dictionary to integrate
'revpi-con-can' as a configurable feature.

src/revpi_middleware/cli_commands/cli_base.py

@@ -29,11 +29,6 @@ def setup_command_line_arguments():
         help="RevPi PiControl object",
     )
     cli_picontrol.add_subparsers(obj_picontrol)
-    obj_config = rpictl_obj.add_parser(
-        "config",
-        help="RevPi configuration object (revpi-config)",
-    )
-    cli_config.add_subparsers(obj_config)
 
 
 def main() -> int:
@@ -44,9 +39,6 @@ def main() -> int:
     if obj == "picontrol":
         rc = cli_picontrol.main()
 
-    elif obj == "config":
-        rc = cli_config.main()
-
     else:
         log.error(f"Unknown object: {obj}")
         rc = 1

src/revpi_middleware/cli_commands/cli_config.py

@@ -1,93 +0,0 @@
-# SPDX-FileCopyrightText: 2025 KUNBUS GmbH
-# SPDX-License-Identifier: GPL-2.0-or-later
-"""Command-Line for the picontrol object of CLI."""
-from argparse import ArgumentParser
-from logging import getLogger
-
-from .dbus_helper import BusType, get_properties, simple_call
-from .. import proginit as pi
-from ..dbus_middleware1 import extend_interface
-
-log = getLogger(__name__)
-
-
-def add_subparsers(parent_parser: ArgumentParser):
-    parent_parser.add_argument(
-        "action",
-        choices=["enable", "disable", "status", "available", "list-features"],
-        help="Action to be executed: enable, disable, status or available. "
-             "To get all available features, use 'list-features'.",
-    )
-    parent_parser.add_argument(
-        "feature",
-        nargs="?",
-        default="",
-        help="Name of the feature to configer. To list all features use 'list-features' as action.",
-    )
-
-
-def main() -> int:
-    action = pi.pargs.action
-    dbus_value = False
-    try:
-
-        if action == "list-features":
-            dbus_value = get_properties(
-                "available_features",
-                interface=extend_interface("RevpiConfig"),
-                bus_type=BusType.SESSION if pi.pargs.use_session_bus else BusType.SYSTEM,
-            )
-            for feature in dbus_value:
-                print(feature)
-
-            return 0
-
-        # For the following actions, a feature name is required
-        if pi.pargs.feature == "":
-            raise Exception("Feature name is required")
-
-        if action == "enable":
-            simple_call(
-                "Enable",
-                pi.pargs.feature,
-                interface=extend_interface("RevpiConfig"),
-                bus_type=BusType.SESSION if pi.pargs.use_session_bus else BusType.SYSTEM,
-            )
-
-        elif action == "disable":
-            simple_call(
-                "Disable",
-                pi.pargs.feature,
-                interface=extend_interface("RevpiConfig"),
-                bus_type=BusType.SESSION if pi.pargs.use_session_bus else BusType.SYSTEM,
-            )
-
-        elif action == "status":
-            dbus_value = simple_call(
-                "GetStatus",
-                pi.pargs.feature,
-                interface=extend_interface("RevpiConfig"),
-                bus_type=BusType.SESSION if pi.pargs.use_session_bus else BusType.SYSTEM,
-            )
-
-        elif action == "available":
-            dbus_value = simple_call(
-                "GetAvailability",
-                pi.pargs.feature,
-                interface=extend_interface("RevpiConfig"),
-                bus_type=BusType.SESSION if pi.pargs.use_session_bus else BusType.SYSTEM,
-            )
-
-        else:
-            raise Exception(f"Unknown action: {action}")
-
-    except Exception as e:
-        log.error(f"Error: {e}")
-        return 1
-
-    log.debug(
-        f"D-Bus call of method {action} for feature {pi.pargs.feature} returned: {dbus_value}"
-    )
-    print(int(dbus_value))
-
-    return 0

src/revpi_middleware/cli_commands/dbus_helper.py

@@ -17,18 +17,6 @@ class BusType(Enum):
     SYSTEM = "system"
 
 
-def get_properties(
-    property_name: str,
-    interface: str,
-    object_path=REVPI_DBUS_BASE_PATH,
-    bus_type=BusType.SYSTEM,
-):
-    bus = SessionBus() if bus_type is BusType.SESSION else SystemBus()
-    revpi = bus.get(REVPI_DBUS_NAME, object_path)
-    iface = revpi[interface]
-    return getattr(iface, property_name)
-
-
 def simple_call(
     method: str,
     *args,

src/revpi_middleware/dbus_middleware1/bus_provider.py

@@ -10,7 +10,6 @@ from pydbus import SessionBus, SystemBus
 
 from . import REVPI_DBUS_NAME
 from .process_image import InterfacePiControl
-from .system_config import InterfaceRevpiConfig
 
 log = getLogger(__name__)
 
@@ -42,7 +41,6 @@ class BusProvider(Thread):
         #   ("Subdir2/Whatever", Example())
         lst_interfaces = [
             InterfacePiControl(self.picontrol_device, self.config_rsc),
-            InterfaceRevpiConfig(),
         ]
 
         try:

src/revpi_middleware/dbus_middleware1/system_config/interface_config.py

@@ -8,12 +8,10 @@ from logging import getLogger
 from .revpi_config import (
     ConfigActions,
     configure_avahi_daemon,
-    configure_bluetooth,
     configure_con_can,
     configure_dphys_swapfile,
     configure_external_antenna,
     configure_gui,
-    configure_wlan,
     simple_systemd,
 )
 from ..dbus_helper import DbusInterface
@@ -93,8 +91,8 @@ AVAILABLE_FEATURES = {
         simple_systemd, ["noderedrevpinodes-server.service"]
     ),
     "revpipyload": FeatureFunction(simple_systemd, ["revpipyload.service"]),
-    "bluetooth": FeatureFunction(configure_bluetooth, []),
+    "bluetooth": False,
-    "wlan": FeatureFunction(configure_wlan, []),
+    "ieee80211": False,
     "avahi": FeatureFunction(configure_avahi_daemon, []),
     "external-antenna": FeatureFunction(configure_external_antenna, []),
 }

src/revpi_middleware/dbus_middleware1/system_config/revpi_config.py

@@ -6,11 +6,10 @@ import shutil
 import subprocess
 from collections import namedtuple
 from enum import Enum, IntEnum
-from glob import glob
 from logging import getLogger
 from os import X_OK, access
-from os.path import exists, join
+from os.path import exists
-from typing import List, Optional
+from typing import List
 
 from pydbus import SystemBus
 
@@ -20,8 +19,6 @@ log = getLogger(__name__)
 
 ConfigVariable = namedtuple("ConfigVariable", ["name", "value", "line_index"])
 
-LINUX_BT_CLASS_PATH = "/sys/class/bluetooth"
-LINUX_WLAN_CLASS_PATH = "/sys/class/ieee80211"
 CONFIG_TXT_LOCATIONS = ("/boot/firmware/config.txt", "/boot/config.txt")
 
 
@@ -45,9 +42,9 @@ class RevPiConfig:
 
     def __init__(self):
         self._cm_type = ComputeModuleTypes.UNKNOWN
+        self._cm_with_wifi = False
 
         self._revpi_with_con_bridge = False
-        self._wlan_class_path = ""
 
         self.serial = ""
         self.model = ""
@@ -81,19 +78,11 @@ class RevPiConfig:
             except ValueError:
                 pass
 
-        # Detect WLAN on CM module
+        # Detect WiFi on CM module
-        could_have_wlan = self._cm_type in (ComputeModuleTypes.CM4, ComputeModuleTypes.CM5)
+        could_have_wifi = self._cm_type in (ComputeModuleTypes.CM4, ComputeModuleTypes.CM5)
-        if could_have_wlan:
+        if could_have_wifi:
-            wlan_interface = join(LINUX_WLAN_CLASS_PATH, "phy0")
+            lst_grep = grep("DRIVER=brcmfmac", "/sys/class/ieee80211/phy0/device/uevent")
-            if grep("DRIVER=brcmfmac", join(wlan_interface, "device", "uevent")):
+            self._cm_with_wifi = len(lst_grep) > 0 and self._cm_type in (ComputeModuleTypes)
-                self._wlan_class_path = wlan_interface
-
-        # If no build in WLAN on the CM, detect third party WLAN on RevPi Flat
-        if not self._wlan_class_path and grep("revpi-flat", "/proc/device-tree/compatible"):
-            lst_wlan_interfaces = glob("/sys/class/ieee80211/*")
-            for wlan_interface in lst_wlan_interfaces:
-                if grep("DRIVER=mwifiex_sdio", join(wlan_interface, "device", "uevent")):
-                    self._wlan_class_path = wlan_interface
 
         # Detect ConBridge
         could_have_con_bridge = self._cm_type in (ComputeModuleTypes.CM3, ComputeModuleTypes.CM4S)
@@ -101,10 +90,6 @@ class RevPiConfig:
             lst_grep = grep("kunbus,revpi-connect", "/proc/device-tree/compatible")
             self._revpi_with_con_bridge = len(lst_grep) > 0
 
-    @property
-    def class_path_wlan(self) -> str:
-        return self._wlan_class_path
-
     @property
     def cm_type(self) -> ComputeModuleTypes:
         return self._cm_type
@@ -114,8 +99,8 @@ class RevPiConfig:
         return self._revpi_with_con_bridge
 
     @property
-    def with_wlan(self) -> bool:
+    def with_wifi(self) -> bool:
-        return bool(self._wlan_class_path)
+        return self._cm_with_wifi
 
 
 class ConfigTxt:
@@ -213,42 +198,6 @@ def configure_avahi_daemon(action: ConfigActions):
     return return_value
 
 
-def configure_bluetooth(action: ConfigActions):
-    hci_device = join(LINUX_BT_CLASS_PATH, "hci0")
-    bt_rfkill_index = get_rfkill_index(hci_device)
-
-    # If the bluetooth device is not present, the device should have been
-    # brought up by revpi-bluetooth's udev rules or vendor magic (devices
-    # based on CM4 and newer). Nothing we can do here, so treat the interface
-    # as disabled.
-
-    if action is ConfigActions.ENABLE:
-        if bt_rfkill_index is not None:
-            with open(f"/sys/class/rfkill/rfkill{bt_rfkill_index}/soft", "w") as f:
-                f.write("0")
-
-    elif action is ConfigActions.DISABLE:
-        if bt_rfkill_index is not None:
-            with open(f"/sys/class/rfkill/rfkill{bt_rfkill_index}/soft", "w") as f:
-                f.write("1")
-
-    elif action is ConfigActions.STATUS:
-        if bt_rfkill_index is None:
-            return False
-
-        with open(f"/sys/class/rfkill/rfkill{bt_rfkill_index}/soft", "r") as f:
-            buffer = f.read().strip()
-            return buffer == "0"
-
-    elif action is ConfigActions.AVAILABLE:
-        return bt_rfkill_index is not None
-
-    else:
-        raise ValueError(f"action {action} not supported")
-
-    return None
-
-
 def configure_con_can(action: ConfigActions):
     revpi = RevPiConfig()
     if action is ConfigActions.AVAILABLE:
@@ -295,21 +244,21 @@ def configure_dphys_swapfile(action: ConfigActions):
 def configure_external_antenna(action: ConfigActions):
     revpi = RevPiConfig()
     if action is ConfigActions.AVAILABLE:
-        return revpi.with_wlan
+        return revpi.with_wifi
 
     config_txt = ConfigTxt()
 
-    if action is ConfigActions.ENABLE and revpi.with_wlan:
+    if action is ConfigActions.ENABLE and revpi.with_wifi:
         config_txt.clear_dtparams(["ant1", "ant2"])
         config_txt.add_name_value("dtparam", "ant2")
         config_txt.save_config()
 
-    elif action is ConfigActions.DISABLE and revpi.with_wlan:
+    elif action is ConfigActions.DISABLE and revpi.with_wifi:
         config_txt.clear_dtparams(["ant1", "ant2"])
         config_txt.save_config()
 
     elif action is ConfigActions.STATUS:
-        return revpi.with_wlan and "ant2" in config_txt.get_values("dtparam")
+        return revpi.with_wifi and "ant2" in config_txt.get_values("dtparam")
 
     else:
         raise ValueError(f"action {action} not supported")
@@ -339,49 +288,6 @@ def configure_gui(action: ConfigActions):
         raise ValueError(f"action {action} not supported")
 
 
-def configure_wlan(action: ConfigActions):
-    revpi = RevPiConfig()
-
-    if action is ConfigActions.ENABLE:
-        if revpi.with_wlan:
-            wlan_rfkill_index = get_rfkill_index(revpi.class_path_wlan)
-            with open(f"/sys/class/rfkill/rfkill{wlan_rfkill_index}/soft", "w") as f:
-                f.write("0")
-
-    elif action is ConfigActions.DISABLE:
-        if revpi.with_wlan:
-            wlan_rfkill_index = get_rfkill_index(revpi.class_path_wlan)
-            with open(f"/sys/class/rfkill/rfkill{wlan_rfkill_index}/soft", "w") as f:
-                f.write("1")
-
-    elif action is ConfigActions.AVAILABLE:
-        return revpi.with_wlan
-
-    elif action is ConfigActions.STATUS:
-        if not revpi.with_wlan:
-            return False
-
-        wlan_rfkill_index = get_rfkill_index(revpi.class_path_wlan)
-        with open(f"/sys/class/rfkill/rfkill{wlan_rfkill_index}/soft", "r") as f:
-            buffer = f.read().strip()
-            return buffer == "0"
-
-    else:
-        raise ValueError(f"action {action} not supported")
-
-    return None
-
-
-def get_rfkill_index(device_class_path: str) -> Optional[int]:
-    re_rfkill_index = re.compile(r"^/.+/rfkill(?P<index>\d+)$")
-    for rfkill_path in glob(join(device_class_path, "rfkill*")):
-        match_index = re_rfkill_index.match(rfkill_path)
-        if match_index:
-            return int(match_index.group("index"))
-
-    return None
-
-
 def simple_systemd(action: ConfigActions, unit: str):
     bus = SystemBus()
     systemd_manager = bus.get(".systemd1")
@@ -424,10 +330,7 @@ if __name__ == "__main__":
     print("Model:", rc.model)
     print("Serial:         ", rc.serial)
     print("CM Type:        ", rc.cm_type.name)
-    print("With WLAN:      ", rc.with_wlan)
+    print("With wifi:      ", rc.with_wifi)
-    if rc.with_wlan:
-        print("    class path: ", rc.class_path_wlan)
-        print("  rfkill index: ", get_rfkill_index(rc.class_path_wlan))
     print("With con-bridge:", rc.with_con_bridge)
 
     config_txt = ConfigTxt()