Introduce Color LED deck tab and consolidate LED ring deck functionality in LED ring tab

src/cfclient/ui/tabs/FlightTab.py

@@ -7,7 +7,7 @@
 #  +------+    / /_/ / / /_/ /__/ /  / /_/ / / /_/  __/
 #   ||  ||    /_____/_/\__/\___/_/   \__,_/ /___/\___/
 #
-#  Copyright (C) 2011-2023 Bitcraze AB
+#  Copyright (C) 2011-2025 Bitcraze AB
 #
 #  Crazyflie Nano Quadcopter Client
 #
@@ -195,17 +195,6 @@ def __init__(self, helper):
 
         self.uiSetupReady()
 
-        self._led_ring_headlight.clicked.connect(
-            lambda enabled: self._helper.cf.param.set_value("ring.headlightEnable", int(enabled)))
-
-        self._helper.cf.param.add_update_callback(
-            group="ring", name="headlightEnable",
-            cb=(lambda name, checked: self._led_ring_headlight.setChecked(bool(int(checked)))))
-
-        self._ledring_nbr_effects = 0
-
-        self._helper.cf.param.add_update_callback(group="ring", name="effect", cb=self._ring_effect_updated)
-
         self._helper.cf.param.add_update_callback(group="imu_sensors", cb=self._set_available_sensors)
 
         self._helper.cf.param.all_updated.add_callback(self._all_params_updated)
@@ -219,10 +208,7 @@ def __init__(self, helper):
         self.targetCalPitch.setValue(Config().get("trim_pitch"))
         self.targetCalRoll.setValue(Config().get("trim_roll"))
 
-        self._helper.inputDeviceReader.alt1_updated.add_callback(self.alt1_updated)
-        self._helper.inputDeviceReader.alt2_updated.add_callback(self.alt2_updated)
         self._tf_state = 0
-        self._ring_effect = 0
 
         # Connect callbacks for input device limiting of roll/pitch/yaw/thrust
         self._helper.inputDeviceReader.limiting_updated.add_callback(self._limiting_updated.emit)
@@ -516,16 +502,6 @@ def disconnected(self, linkURI):
         self._enable_estimators(False)
 
         self.logAltHold = None
-        self._led_ring_effect.setEnabled(False)
-        self._led_ring_effect.clear()
-        try:
-            self._led_ring_effect.currentIndexChanged.disconnect(
-                self._ring_effect_changed)
-        except TypeError:
-            # Signal was not connected
-            pass
-        self._led_ring_effect.setCurrentIndex(-1)
-        self._led_ring_headlight.setEnabled(False)
 
         try:
             self._assist_mode_combo.currentIndexChanged.disconnect(
@@ -714,81 +690,11 @@ def _assisted_control_updated(self, enabled):
         else:
             self._helper.cf.param.set_value("flightmode.althold", int(enabled))
 
-    def alt1_updated(self, state):
-        if state:
-            new_index = (self._ring_effect+1) % (self._ledring_nbr_effects+1)
-            self._helper.cf.param.set_value("ring.effect", str(new_index))
-
-    def alt2_updated(self, state):
-        self._helper.cf.param.set_value("ring.headlightEnable", str(state))
-
     def _all_params_updated(self):
-        self._ring_populate_dropdown()
         self._populate_assisted_mode_dropdown()
         self._update_flight_commander(True)
         self._update_supervisor_and_arming(True)
 
-    def _ring_populate_dropdown(self):
-        try:
-            nbr = int(self._helper.cf.param.values["ring"]["neffect"])
-            current = int(self._helper.cf.param.values["ring"]["effect"])
-        except KeyError:
-            return
-
-        # Used only in alt1_updated function
-        self._ring_effect = current
-        self._ledring_nbr_effects = nbr
-
-        hardcoded_names = {
-            0: "Off",
-            1: "White spinner",
-            2: "Color spinner",
-            3: "Tilt effect",
-            4: "Brightness effect",
-            5: "Color spinner 2",
-            6: "Double spinner",
-            7: "Solid color effect",
-            8: "Factory test",
-            9: "Battery status",
-            10: "Boat lights",
-            11: "Alert",
-            12: "Gravity",
-            13: "LED tab",
-            14: "Color fader",
-            15: "Link quality",
-            16: "Location server status",
-            17: "Sequencer",
-            18: "Lighthouse quality",
-        }
-
-        for i in range(nbr + 1):
-            name = "{}: ".format(i)
-            if i in hardcoded_names:
-                name += hardcoded_names[i]
-            else:
-                name += "N/A"
-            self._led_ring_effect.addItem(name, i)
-
-        self._led_ring_effect.currentIndexChanged.connect(
-            self._ring_effect_changed)
-
-        self._led_ring_effect.setCurrentIndex(current)
-        if int(self._helper.cf.param.values["deck"]["bcLedRing"]) == 1:
-            self._led_ring_effect.setEnabled(True)
-            self._led_ring_headlight.setEnabled(True)
-
-    def _ring_effect_changed(self, index):
-        self._ring_effect = index
-        if index > -1:
-            i = self._led_ring_effect.itemData(index)
-            logger.debug("Changed effect to {}".format(i))
-            if i != int(self._helper.cf.param.values["ring"]["effect"]):
-                self._helper.cf.param.set_value("ring.effect", str(i))
-
-    def _ring_effect_updated(self, name, value):
-        if self._helper.cf.param.is_updated:
-            self._led_ring_effect.setCurrentIndex(int(value))
-
     def _populate_assisted_mode_dropdown(self):
         self._assist_mode_combo.addItem("Altitude hold", 0)
         self._assist_mode_combo.addItem("Position hold", 1)

src/cfclient/ui/tabs/LEDTab.py → src/cfclient/ui/tabs/LEDRingTab.py

@@ -7,7 +7,7 @@
 #  +------+    / /_/ / / /_/ /__/ /  / /_/ / / /_/  __/
 #   ||  ||    /_____/_/\__/\___/_/   \__,_/ /___/\___/
 #
-#  Copyright (C) 2011-2023 Bitcraze AB
+#  Copyright (C) 2011-2025 Bitcraze AB
 #
 #  Crazyflie Nano Quadcopter Client
 #
@@ -43,23 +43,44 @@
 from cflib.crazyflie.mem import MemoryElement
 
 __author__ = 'Bitcraze AB'
-__all__ = ['LEDTab']
+__all__ = ['LEDRingTab']
 
 logger = logging.getLogger(__name__)
 
-led_tab_class = uic.loadUiType(cfclient.module_path + "/ui/tabs/ledTab.ui")[0]
+led_ring_tab_class = uic.loadUiType(cfclient.module_path + "/ui/tabs/ledRingTab.ui")[0]
 
 
-class LEDTab(TabToolbox, led_tab_class):
+class LEDRingTab(TabToolbox, led_ring_tab_class):
     """Tab for plotting logging data"""
 
     _connected_signal = pyqtSignal(str)
     _disconnected_signal = pyqtSignal(str)
 
     def __init__(self, helper):
-        super(LEDTab, self).__init__(helper, 'LED')
+        super(LEDRingTab, self).__init__(helper, 'LED Ring')
         self.setupUi(self)
 
+        # LED-ring effect dropdown and headlight checkbox
+        self._ledring_nbr_effects = 0
+
+        # Connect the headlight checkbox
+        self._led_ring_headlight.clicked.connect(
+            lambda enabled: self._helper.cf.param.set_value("ring.headlightEnable", int(enabled)))
+
+        # Update headlight when param changes
+        self._helper.cf.param.add_update_callback(
+            group="ring", name="headlightEnable",
+            cb=lambda name, checked: self._led_ring_headlight.setChecked(bool(int(checked))))
+
+        # Update LED-ring effect when param changes
+        self._helper.cf.param.add_update_callback(
+            group="ring", name="effect",
+            cb=self._ring_effect_updated)
+
+        # Populate dropdown when all params are updated
+        self._helper.cf.param.all_updated.add_callback(self._ring_populate_dropdown)
+
+
         # Always wrap callbacks from Crazyflie API though QT Signal/Slots
         # to avoid manipulating the UI when rendering it
         self._connected_signal.connect(self._connected)
@@ -107,6 +128,12 @@ def __init__(self, helper):
             self._intensity_spin.setValue)
         self._intensity_spin.valueChanged.connect(
             self._intensity_slider.setValue)
+
+        self._helper.inputDeviceReader.alt1_updated.add_callback(self.alt1_updated)
+        self._helper.inputDeviceReader.alt2_updated.add_callback(self.alt2_updated)
+
+        self._led_ring_effect.setEnabled(False)
+        self._led_ring_headlight.setEnabled(False)
 
     def _select(self, nbr):
         col = QtGui.QColor()  # default to invalid
@@ -152,6 +179,9 @@ def _connected(self, link_uri):
                 btn.setStyleSheet("background-color: black")
                 self._intensity_slider.setEnabled(True)
                 self._intensity_spin.setEnabled(True)
+
+        self._led_ring_effect.setEnabled(True)
+        self._led_ring_headlight.setEnabled(True)
 
     def _disconnected(self, link_uri):
         """Callback for when the Crazyflie has been disconnected"""
@@ -161,3 +191,77 @@ def _disconnected(self, link_uri):
             self._intensity_slider.setEnabled(False)
             self._intensity_spin.setEnabled(False)
             self._intensity_slider.setValue(100)
+
+        self._led_ring_effect.setEnabled(False)
+        self._led_ring_headlight.setEnabled(False)
+
+    def _ring_populate_dropdown(self):
+        try:
+            nbr = int(self._helper.cf.param.values["ring"]["neffect"])
+            current = int(self._helper.cf.param.values["ring"]["effect"])
+        except KeyError:
+            return
+
+        self._ring_effect = current
+        self._ledring_nbr_effects = nbr
+
+        hardcoded_names = {
+            0: "Off",
+            1: "White spinner",
+            2: "Color spinner",
+            3: "Tilt effect",
+            4: "Brightness effect",
+            5: "Color spinner 2",
+            6: "Double spinner",
+            7: "Solid color effect",
+            8: "Factory test",
+            9: "Battery status",
+            10: "Boat lights",
+            11: "Alert",
+            12: "Gravity",
+            13: "LED tab",
+            14: "Color fader",
+            15: "Link quality",
+            16: "Location server status",
+            17: "Sequencer",
+            18: "Lighthouse quality",
+        }
+
+        self._led_ring_effect.clear()
+        for i in range(nbr + 1):
+            name = "{}: ".format(i)
+            name += hardcoded_names.get(i, "N/A")
+            self._led_ring_effect.addItem(name, i)
+
+        self._led_ring_effect.currentIndexChanged.connect(self._ring_effect_changed)
+        self._led_ring_effect.setCurrentIndex(current)
+        self._led_ring_effect.setEnabled(int(self._helper.cf.param.values["deck"]["bcLedRing"]) == 1)
+        self._led_ring_headlight.setEnabled(int(self._helper.cf.param.values["deck"]["bcLedRing"]) == 1)
+
+        try:
+            self._helper.cf.param.set_value("ring.effect", "13")
+            self._led_ring_effect.setCurrentIndex(13)
+            self._ring_effect = 13
+            logger.info("Initialized LED ring to 'LED tab' mode (effect 13).")
+        except Exception as e:
+            logger.warning(f"Could not set LED tab effect on connect: {e}")
+
+    def _ring_effect_changed(self, index):
+        self._ring_effect = index
+        if index > -1:
+            i = self._led_ring_effect.itemData(index)
+            if i != int(self._helper.cf.param.values["ring"]["effect"]):
+                self._helper.cf.param.set_value("ring.effect", str(i))
+
+    def _ring_effect_updated(self, name, value):
+        if self._helper.cf.param.is_updated:
+            self._led_ring_effect.setCurrentIndex(int(value))
+
+    def alt1_updated(self, state):
+        if state:
+            new_index = (self._ring_effect+1) % (self._ledring_nbr_effects+1)
+            self._helper.cf.param.set_value("ring.effect", str(new_index))
+
+    def alt2_updated(self, state):
+        self._helper.cf.param.set_value("ring.headlightEnable", str(state))
+

src/cfclient/ui/tabs/__init__.py

@@ -34,7 +34,7 @@
 # from .ExampleTab import ExampleTab
 from .FlightTab import FlightTab
 # from .GpsTab import GpsTab
-from .LEDTab import LEDTab
+from .LEDRingTab import LEDRingTab
 from .LogBlockTab import LogBlockTab
 from .LogTab import LogTab
 from .ParamTab import ParamTab
@@ -43,6 +43,7 @@
 from .LogClientTab import LogClientTab
 from .lighthouse_tab import LighthouseTab
 from .TuningTab import TuningTab
+from .ColorLEDTab import ColorLEDTab
 
 __author__ = 'Bitcraze AB'
 __all__ = []
@@ -52,7 +53,8 @@
     # ExampleTab,
     FlightTab,
     # GpsTab,
-    LEDTab,
+    LEDRingTab,
+    ColorLEDTab,
     LogBlockTab,
     LogTab,
     ParamTab,