cfclient 2024.7.1__py3-none-any.whl → 2025.12.1__py3-none-any.whl

cfclient/ui/dialogs/about.py

@@ -217,7 +217,9 @@ class AboutDialog(QtWidgets.QWidget, about_widget_class):
 
     def _request_deck_data_update(self):
         self._decks_text = ""
+        # Query both 1-Wire and DeckCtrl memories for deck information
         mems = self._helper.cf.mem.get_mems(MemoryElement.TYPE_1W)
+        mems += self._helper.cf.mem.get_mems(MemoryElement.TYPE_DECKCTRL)
         for mem in mems:
             mem.update(self._cb_deck_data_updated_signal.emit)
 
@@ -230,6 +232,8 @@ class AboutDialog(QtWidgets.QWidget, about_widget_class):
         if "Board revision" in deck_data.elements:
             rev = deck_data.elements["Board revision"]
 
-        self._decks_text += DECK_FORMAT.format(name, rev, deck_data.addr)
+        # OWElement has addr attribute, DeckCtrlElement does not
+        addr = getattr(deck_data, 'addr', 'N/A')
+        self._decks_text += DECK_FORMAT.format(name, rev, addr)
 
         self._update_debug_info_view()

cfclient/ui/dialogs/basestation_mode_dialog.py

@@ -114,7 +114,18 @@ class LighthouseBsModeDialog(QtWidgets.QWidget, basestation_mode_widget_class):
     def _set_basestation_pressed(self):
         self._set_basestation_button.setEnabled(False)
         dev = self._device
-        ser = serial.Serial(dev, timeout=0.4)
+        try:
+            ser = serial.Serial(dev, timeout=0.4)
+        except serial.SerialException:
+            self._basestation_mode_status.setText(
+                'Permission denied: cannot access serial port.\n'
+                'Try running: \"sudo usermod -aG dialout [username]\" '
+                'and then restart your computer.'
+            )
+
+            self._set_basestation_button.setEnabled(True)
+            return
+
         sio = io.TextIOWrapper(io.BufferedRWPair(ser, ser))
         sio.write("\r\nmode " + str(self._channel) + "\r\n")
         sio.flush()

cfclient/ui/dialogs/bootloader.py

@@ -45,7 +45,8 @@ from urllib.error import URLError
 import zipfile
 
 from PyQt6 import QtWidgets, uic
-from PyQt6.QtCore import pyqtSlot, pyqtSignal, QThread
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, QThread, Qt
+from PyQt6.QtGui import QPixmap
 
 import cfclient
 import cflib.crazyflie
@@ -62,6 +63,8 @@ service_dialog_class = uic.loadUiType(cfclient.module_path +
 RELEASE_URL = 'https://api.github.com/repos/bitcraze/'\
               'crazyflie-release/releases'
 
+ICON_PATH = os.path.join(cfclient.module_path, 'ui', 'icons')
+
 
 class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
     """Tab for update the Crazyflie firmware and for reading/writing the config
@@ -97,6 +100,7 @@ class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
         self.programButton.clicked.connect(self.programAction)
         self.coldBootButton.clicked.connect(self.initiateColdboot)
         self.resetButton.clicked.connect(self.resetCopter)
+        self.sourceTab.currentChanged.connect(self._update_program_button_state)
 
         self._helper.connectivity_manager.register_ui_elements(
             ConnectivityManager.UiElementsContainer(
@@ -132,10 +136,33 @@ class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
 
         self._platform_filter_checkboxes = []
 
+        self._set_image(self.image_1, os.path.join(ICON_PATH, "bolt.webp"))
+        self._set_image(self.image_2, os.path.join(ICON_PATH, "cf21.webp"))
+        self._set_image(self.image_3, os.path.join(ICON_PATH, "bl.webp"))
+        self._set_image(self.image_4, os.path.join(ICON_PATH, "flapper.webp"))
+        self._set_image(self.image_5, os.path.join(ICON_PATH, "tag.webp"))
+
     def _ui_connection_fail(self, message):
         self._cold_boot_error_message = message
         self.setUiState(self.UIState.DISCONNECTED)
 
+    def _set_image(self, image_label, image_path):
+        IMAGE_WIDTH = 100
+        IMAGE_HEIGHT = 100
+
+        pixmap = QPixmap(image_path)
+
+        if pixmap.isNull():
+            logger.warning(f"Failed to load image: {image_path}")
+            image_label.setText("Missing image")
+        else:
+            scaled_pixmap = pixmap.scaled(
+                IMAGE_WIDTH, IMAGE_HEIGHT,
+                Qt.AspectRatioMode.KeepAspectRatio,
+                Qt.TransformationMode.SmoothTransformation
+            )
+            image_label.setPixmap(scaled_pixmap)
+
     def setUiState(self, state):
         self._state = state
 
@@ -163,7 +190,10 @@ class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
         elif (state == self.UIState.COLD_CONNECTED):
             self._cold_boot_error_message = None
             self.resetButton.setEnabled(True)
-            self.programButton.setEnabled(True)
+            if any(button.isChecked() for button in self._platform_filter_checkboxes):
+                self.programButton.setEnabled(True)
+            else:
+                self.programButton.setToolTip("Select a platform before programming.")
             self.setStatusLabel("Connected to bootloader")
             self.coldBootButton.setEnabled(False)
             self.imagePathBrowseButton.setEnabled(True)
@@ -189,7 +219,10 @@ class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
                 self.setStatusLabel("Connected using USB")
                 self.setSourceSelectionUiEnabled(False)
             else:
-                self.programButton.setEnabled(True)
+                if any(button.isChecked() for button in self._platform_filter_checkboxes):
+                    self.programButton.setEnabled(True)
+                else:
+                    self.programButton.setToolTip("Select a platform before programming.")
                 self.setStatusLabel("Connected in firmware mode")
                 self.setSourceSelectionUiEnabled(True)
         elif (state == self.UIState.FW_SCANNING):
@@ -216,6 +249,7 @@ class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
             self.coldBootButton.setEnabled(False)
             self.setSourceSelectionUiEnabled(True)
             self._helper.connectivity_manager.set_enable(False)
+        self._update_program_button_state()
 
     def setSourceSelectionUiEnabled(self, enabled):
         self.imagePathBrowseButton.setEnabled(enabled)
@@ -265,19 +299,54 @@ class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
                     platforms.add(platform)
 
         for platform in sorted(platforms, reverse=True):
+            RADIO_BUTTON_WIDTH = 100
+
             radio_button = QtWidgets.QRadioButton(platform)
 
-            # Use cf2 as default platform
-            if platform == 'cf2':
-                radio_button.setChecked(True)
+            radio_button.setFixedWidth(RADIO_BUTTON_WIDTH)
 
             radio_button.toggled.connect(self._update_firmware_dropdown)
+            radio_button.toggled.connect(self._update_program_button_state)
 
             self._platform_filter_checkboxes.append(radio_button)
             self.filterLayout.insertWidget(0, radio_button)
 
+        self.firmwareDropdown.setSizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents)
         self._update_firmware_dropdown(True)
 
+    def _has_selected_file(self) -> bool:
+        return bool(self.imagePathLine.text())
+
+    def _update_program_button_state(self):
+        is_connected = self._state in (
+            self.UIState.COLD_CONNECTED,
+            self.UIState.FW_CONNECTED
+        )
+
+        if not is_connected:
+            self.programButton.setEnabled(False)
+            self.programButton.setToolTip("Connect your device before programming.")
+            return
+
+        current_tab = self.sourceTab.currentWidget()
+
+        if current_tab == self.tabFromFile:
+            has_file = bool(self.imagePathLine.text())
+            self.programButton.setEnabled(has_file)
+
+            self.programButton.setToolTip(
+                "" if has_file else "Choose a firmware file to program."
+            )
+        else:
+            any_platform_checked = any(
+                button.isChecked() for button in self._platform_filter_checkboxes
+            )
+
+            self.programButton.setEnabled(any_platform_checked)
+            self.programButton.setToolTip(
+                "" if any_platform_checked else "Select a platform before programming."
+            )
+
     def _update_firmware_dropdown(self, active: bool):
         if active:
             platform = None
@@ -341,6 +410,7 @@ class BootloaderDialog(QtWidgets.QWidget, service_dialog_class):
 
         if filename.endswith('.zip'):
             self.imagePathLine.setText(filename)
+            self._update_program_button_state()
         else:
             msgBox = QtWidgets.QMessageBox()
             msgBox.setText("Wrong file extention. Must be .zip.")

cfclient/ui/dialogs/bootloader.ui

@@ -3,7 +3,7 @@
  <class>Form</class>
  <widget class="QWidget" name="Form">
   <property name="windowModality">
-   <enum>Qt::ApplicationModal</enum>
+   <enum>Qt::WindowModality::ApplicationModal</enum>
   </property>
   <property name="enabled">
    <bool>true</bool>
@@ -94,7 +94,7 @@
               <item>
                <spacer name="horizontalSpacer">
                 <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
+                 <enum>Qt::Orientation::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -133,7 +133,7 @@
             <item>
              <spacer name="horizontalSpacer_5">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -177,36 +177,122 @@
          <string>From release</string>
         </attribute>
         <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
+         <item row="1" column="0">
           <widget class="QGroupBox" name="platform_filter_gb">
            <property name="title">
-            <string>Platform filter</string>
+            <string>Select a platform:</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
-             <layout class="QHBoxLayout" name="filterLayout">
+             <layout class="QVBoxLayout" name="verticalLayout_5">
               <item>
-               <spacer name="horizontalSpacer_6">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
+               <layout class="QGridLayout" name="gridLayout_6">
+                <item row="0" column="2">
+                 <widget class="QLabel" name="image_3">
+                  <property name="maximumSize">
+                   <size>
+                    <width>100</width>
+                    <height>100</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>Image 3</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QLabel" name="image_2">
+                  <property name="maximumSize">
+                   <size>
+                    <width>100</width>
+                    <height>100</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>Image 2</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="5">
+                 <spacer name="horizontalSpacer_7">
+                  <property name="orientation">
+                   <enum>Qt::Orientation::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item row="0" column="3">
+                 <widget class="QLabel" name="image_4">
+                  <property name="maximumSize">
+                   <size>
+                    <width>100</width>
+                    <height>100</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>Image 4</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="image_1">
+                  <property name="maximumSize">
+                   <size>
+                    <width>100</width>
+                    <height>100</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>Image 1</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="4">
+                 <widget class="QLabel" name="image_5">
+                  <property name="maximumSize">
+                   <size>
+                    <width>100</width>
+                    <height>100</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>Image 5</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="filterLayout">
+                <item>
+                 <spacer name="horizontalSpacer_6">
+                  <property name="orientation">
+                   <enum>Qt::Orientation::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
               </item>
              </layout>
             </item>
            </layout>
           </widget>
          </item>
-         <item row="4" column="0">
+         <item row="5" column="0">
           <spacer name="verticalSpacer">
            <property name="orientation">
-            <enum>Qt::Vertical</enum>
+            <enum>Qt::Orientation::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -216,7 +302,7 @@
            </property>
           </spacer>
          </item>
-         <item row="1" column="0">
+         <item row="2" column="0">
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="QLabel" name="label_2">
@@ -231,7 +317,7 @@
            <item>
             <spacer name="horizontalSpacer_4">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -286,7 +372,7 @@
            <item>
             <spacer name="horizontalSpacer_3">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -305,7 +391,7 @@
      <item>
       <spacer name="verticalSpacer_3">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Orientation::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -320,7 +406,7 @@
        <item>
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>

cfclient/ui/dialogs/cf2config.ui

@@ -17,7 +17,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Crazyflie 2.X config</string>
+   <string>Crazyflie 2.x config</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">

cfclient/ui/dialogs/lighthouse_bs_geometry_dialog.py

@@ -31,7 +31,6 @@ import cfclient
 from PyQt6 import QtWidgets
 from PyQt6 import uic
 from PyQt6.QtCore import QVariant, Qt, QAbstractTableModel, pyqtSignal
-from cflib.localization import LighthouseBsGeoEstimator
 from cflib.localization import LighthouseSweepAngleAverageReader
 from cflib.crazyflie.mem import LighthouseBsGeometry
 from cfclient.ui.wizards.lighthouse_geo_bs_estimation_wizard import LighthouseBasestationGeometryWizard
@@ -138,13 +137,6 @@ class LighthouseBsGeometryDialog(QtWidgets.QWidget, basestation_geometry_widget_
         self._lighthouse_tab = lighthouse_tab
 
         self._estimate_geometry_button.clicked.connect(self._estimate_geometry_button_clicked)
-        self._simple_estimator = LighthouseBsGeoEstimator()
-        self._estimate_geometry_simple_button.clicked.connect(self._estimate_geometry_simple_button_clicked)
-        try:
-            if not self._simple_estimator.is_available():
-                self._estimate_geometry_simple_button.setEnabled(False)
-        except Exception as e:
-            print(e)
 
         self._write_to_cf_button.clicked.connect(self._write_to_cf_button_clicked)
 
@@ -205,10 +197,6 @@ class LighthouseBsGeometryDialog(QtWidgets.QWidget, basestation_geometry_widget_
         self._base_station_geometry_wizard.show()
         self.hide()
 
-    def _estimate_geometry_simple_button_clicked(self):
-        self._sweep_angle_reader.start_angle_collection()
-        self._update_ui()
-
     def _write_to_cf_button_clicked(self):
         if len(self._newly_estimated_geometry) > 0:
             self._lighthouse_tab.write_and_store_geometry(self._newly_estimated_geometry)

cfclient/ui/dialogs/lighthouse_bs_geometry_dialog.ui

@@ -41,13 +41,6 @@
          </property>
         </spacer>
        </item>
-       <item>
-        <widget class="QPushButton" name="_estimate_geometry_simple_button">
-         <property name="text">
-          <string>Estimate Geometry Simple</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </item>
      <item>

cfclient/ui/main.py

@@ -227,7 +227,7 @@ class MainUI(QtWidgets.QMainWindow, main_window_class):
         self.linkQualityBar.setTextVisible(False)
 
         # Connect link quality feedback
-        self.cf.link_quality_updated.add_callback(self.linkQualitySignal.emit)
+        self.cf.link_statistics.link_quality_updated.add_callback(self.linkQualitySignal.emit)
         self.linkQualitySignal.connect(
             lambda percentage: self.linkQualityBar.setValue(int(percentage)))
 
@@ -683,8 +683,8 @@ class MainUI(QtWidgets.QMainWindow, main_window_class):
                 if e.errno == 13:  # Permission denied
                     link = "<a href='https://www.bitcraze.io/documentation/repository/crazyflie-lib-python/master/installation/usb_permissions/'>Install USB Permissions</a>" # noqa
                     msg = QMessageBox()
-                    msg.setIcon(QMessageBox.Information)
-                    msg.setTextFormat(Qt.RichText)
+                    msg.setIcon(QMessageBox.Icon.Information)
+                    msg.setTextFormat(Qt.TextFormat.RichText)
                     msg.setText("Could not access Crazyradio")
                     msg.setInformativeText(link)
                     msg.setWindowTitle("Crazyradio permissions")

cfclient/ui/main.ui

@@ -545,7 +545,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Configure 2.X</string>
+    <string>Configure 2.x</string>
    </property>
    <property name="menuRole">
     <enum>QAction::NoRole</enum>