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

cfclient/ui/tabs/ConsoleTab.py

@@ -7,7 +7,7 @@
 #  +------+    / /_/ / / /_/ /__/ /  / /_/ / / /_/  __/
 #   ||  ||    /_____/_/\__/\___/_/   \__,_/ /___/\___/
 #
-#  Copyright (C) 2011-2013 Bitcraze AB
+#  Copyright (C) 2011-2023 Bitcraze AB
 #
 #  Crazyflie Nano Quadcopter Client
 #
@@ -31,11 +31,12 @@ The console tab is used as a console for printouts from the Crazyflie.
 
 import logging
 
-from PyQt5 import uic
-from PyQt5.QtCore import pyqtSignal
+from PyQt6 import uic
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtGui import QTextCursor
 
 import cfclient
-from cfclient.ui.tab import Tab
+from cfclient.ui.tab_toolbox import TabToolbox
 
 __author__ = 'Bitcraze AB'
 __all__ = ['ConsoleTab']
@@ -46,30 +47,27 @@ console_tab_class = uic.loadUiType(cfclient.module_path +
                                    "/ui/tabs/consoleTab.ui")[0]
 
 
-class ConsoleTab(Tab, console_tab_class):
+class ConsoleTab(TabToolbox, console_tab_class):
     """Console tab for showing printouts from Crazyflie"""
+    _link_established_signal = pyqtSignal(str)
     _connected_signal = pyqtSignal(str)
     _disconnected_signal = pyqtSignal(str)
     _update = pyqtSignal(str)
 
-    def __init__(self, tabWidget, helper, *args):
-        super(ConsoleTab, self).__init__(*args)
+    def __init__(self, helper):
+        super(ConsoleTab, self).__init__(helper, 'Console')
         self.setupUi(self)
 
-        self.tabName = "Console"
-        self.menuName = "Console"
-
-        self.tabWidget = tabWidget
-        self._helper = helper
-
         # Always wrap callbacks from Crazyflie API though QT Signal/Slots
         # to avoid manipulating the UI when rendering it
+        self._link_established_signal.connect(self._link_established)
         self._connected_signal.connect(self._connected)
         self._disconnected_signal.connect(self._disconnected)
         self._update.connect(self.printText)
 
         self._helper.cf.console.receivedChar.add_callback(self._update.emit)
         self._helper.cf.connected.add_callback(self._connected_signal.emit)
+        self._helper.cf.link_established.add_callback(self._link_established_signal.emit)
         self._helper.cf.disconnected.add_callback(
             self._disconnected_signal.emit)
 
@@ -77,20 +75,57 @@ class ConsoleTab(Tab, console_tab_class):
         self._dumpSystemLoadButton.clicked.connect(
             lambda enabled:
             self._helper.cf.param.set_value("system.taskDump", '1'))
+        self._dumpAssertInformation.clicked.connect(
+            lambda enabled:
+            self._helper.cf.param.set_value_raw("system.assertInfo", 0x08, 1))
+        self._propellerTestButton.clicked.connect(
+            lambda enabled:
+            self._helper.cf.param.set_value("health.startPropTest", '1'))
+        self._batteryTestButton.clicked.connect(
+            lambda enabled:
+            self._helper.cf.param.set_value("health.startBatTest", '1'))
+        self._storageStatsButton.clicked.connect(
+            lambda enabled:
+            self._helper.cf.param.set_value("system.storageStats", '1'))
 
     def printText(self, text):
         # Make sure we get printouts from the Crazyflie into the log (such as
         # build version and test ok/fail)
         logger.debug("[%s]", text)
+        scrollbar = self.console.verticalScrollBar()
+        prev_scroll = scrollbar.value()
+        prev_cursor = self.console.textCursor()
+        was_maximum = prev_scroll == scrollbar.maximum()
+
+        self.console.moveCursor(QTextCursor.MoveOperation.End)
         self.console.insertPlainText(text)
 
+        self.console.setTextCursor(prev_cursor)
+
+        if was_maximum and not prev_cursor.hasSelection():
+            scrollbar.setValue(scrollbar.maximum())
+        else:
+            scrollbar.setValue(prev_scroll)
+
     def clear(self):
         self.console.clear()
 
     def _connected(self, link_uri):
         """Callback when the Crazyflie has been connected"""
         self._dumpSystemLoadButton.setEnabled(True)
+        self._propellerTestButton.setEnabled(True)
+        self._batteryTestButton.setEnabled(True)
+        self._storageStatsButton.setEnabled(True)
 
     def _disconnected(self, link_uri):
         """Callback for when the Crazyflie has been disconnected"""
         self._dumpSystemLoadButton.setEnabled(False)
+        self._dumpAssertInformation.setEnabled(False)
+        self._propellerTestButton.setEnabled(False)
+        self._batteryTestButton.setEnabled(False)
+        self._storageStatsButton.setEnabled(False)
+
+    def _link_established(self, link_uri):
+        """Callback when the first packet on a new link is received"""
+        # Enable the assert dump button as early as possible. After an assert we will never get the connected() cb.
+        self._dumpAssertInformation.setEnabled(True)

cfclient/ui/{toolboxes → tabs}/CrtpSharkToolbox.py

@@ -7,7 +7,7 @@
 #  +------+    / /_/ / / /_/ /__/ /  / /_/ / / /_/  __/
 #   ||  ||    /_____/_/\__/\___/_/   \__,_/ /___/\___/
 #
-#  Copyright (C) 2011-2013 Bitcraze AB
+#  Copyright (C) 2011-2023 Bitcraze AB
 #
 #  Crazyflie Nano Quadcopter Client
 #
@@ -31,33 +31,31 @@ import os
 from time import time
 from binascii import hexlify
 
-from PyQt5 import QtWidgets
-from PyQt5 import uic
-from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtCore import Qt
+from PyQt6 import QtWidgets
+from PyQt6 import uic
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtCore import Qt
 
 import cfclient
+from cfclient.ui.tab_toolbox import TabToolbox
 
 __author__ = 'Bitcraze AB'
 __all__ = ['CrtpSharkToolbox']
 
-param_tab_class = uic.loadUiType(
-    cfclient.module_path + "/ui/toolboxes/crtpSharkToolbox.ui")[0]
+param_tab_class = uic.loadUiType(cfclient.module_path + "/ui/tabs/crtpSharkToolbox.ui")[0]
 
 
-class CrtpSharkToolbox(QtWidgets.QWidget, param_tab_class):
+class CrtpSharkToolbox(TabToolbox, param_tab_class):
     """Show packets that is sent vie the communication link"""
     nameModified = pyqtSignal()
     _incoming_packet_signal = pyqtSignal(object)
     _outgoing_packet_signal = pyqtSignal(object)
 
-    def __init__(self, helper, *args):
-        super(CrtpSharkToolbox, self).__init__(*args)
+    def __init__(self, helper):
+        super(CrtpSharkToolbox, self).__init__(helper, 'Crtp sniffer')
         self.setupUi(self)
 
-        self.helper = helper
-
         # Init the tree widget
         self.logTree.setHeaderLabels(['ms', 'Direction', 'Port/Chan', 'Data'])
 
@@ -77,11 +75,11 @@ class CrtpSharkToolbox(QtWidgets.QWidget, param_tab_class):
             line = QtWidgets.QTreeWidgetItem()
 
             ms_diff = int(round(time() * 1000)) - self._ms_offset
-            line.setData(0, Qt.DisplayRole, "%d" % ms_diff)
-            line.setData(1, Qt.DisplayRole, "%s" % dir)
-            line.setData(2, Qt.DisplayRole, "%d/%d" % (pk.port, pk.channel))
+            line.setData(0, Qt.ItemDataRole.DisplayRole, "%d" % ms_diff)
+            line.setData(1, Qt.ItemDataRole.DisplayRole, "%s" % dir)
+            line.setData(2, Qt.ItemDataRole.DisplayRole, "%d/%d" % (pk.port, pk.channel))
 
-            line.setData(3, Qt.DisplayRole, hexlify(pk.data).decode('utf8'))
+            line.setData(3, Qt.ItemDataRole.DisplayRole, hexlify(pk.data).decode('utf8'))
 
             s = "%d, %s, %d/%d, %s" % (ms_diff, dir, pk.port, pk.channel,
                                        hexlify(pk.data).decode('utf8'))
@@ -95,12 +93,6 @@ class CrtpSharkToolbox(QtWidgets.QWidget, param_tab_class):
         self.logTree.clear()
         self._data = []
 
-    def getName(self):
-        return 'Crtp sniffer'
-
-    def getTabName(self):
-        return 'Crtp sniffer'
-
     def _incoming_packet(self, pk):
         self._incoming_packet_signal.emit(pk)
 
@@ -108,19 +100,12 @@ class CrtpSharkToolbox(QtWidgets.QWidget, param_tab_class):
         self._outgoing_packet_signal.emit(pk)
 
     def enable(self):
-        self.helper.cf.packet_received.add_callback(
-            self._incoming_packet)
-        self.helper.cf.packet_sent.add_callback(
-            self._outgoing_packet)
+        self._helper.cf.packet_received.add_callback(self._incoming_packet)
+        self._helper.cf.packet_sent.add_callback(self._outgoing_packet)
 
     def disable(self):
-        self.helper.cf.packet_received.remove_callback(
-            self._incoming_packet)
-        self.helper.cf.packet_sent.remove_callback(
-            self._outgoing_packet)
-
-    def preferedDockArea(self):
-        return Qt.RightDockWidgetArea
+        self._helper.cf.packet_received.remove_callback(self._incoming_packet)
+        self._helper.cf.packet_sent.remove_callback(self._outgoing_packet)
 
     def _save_data(self):
         dir = os.path.join(cfclient.config_path, "logdata")

cfclient/ui/tabs/ExampleTab.py

@@ -7,7 +7,7 @@
 #  +------+    / /_/ / / /_/ /__/ /  / /_/ / / /_/  __/
 #   ||  ||    /_____/_/\__/\___/_/   \__,_/ /___/\___/
 #
-#  Copyright (C) 2011-2013 Bitcraze AB
+#  Copyright (C) 2011-2023 Bitcraze AB
 #
 #  Crazyflie Nano Quadcopter Client
 #
@@ -34,23 +34,22 @@ connects the connected/disconnected callbacks.
 
 import logging
 
-from PyQt5 import uic
-from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtWidgets import QMessageBox
+from PyQt6 import uic
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtWidgets import QMessageBox
 
 import cfclient
-from cfclient.ui.tab import Tab
+from cfclient.ui.tab_toolbox import TabToolbox
 
 __author__ = 'Bitcraze AB'
 __all__ = ['ExampleTab']
 
 logger = logging.getLogger(__name__)
 
-example_tab_class = uic.loadUiType(cfclient.module_path +
-                                   "/ui/tabs/exampleTab.ui")[0]
+example_tab_class = uic.loadUiType(cfclient.module_path + "/ui/tabs/exampleTab.ui")[0]
 
 
-class ExampleTab(Tab, example_tab_class):
+class ExampleTab(TabToolbox, example_tab_class):
     """Tab for plotting logging data"""
 
     _connected_signal = pyqtSignal(str)
@@ -59,16 +58,10 @@ class ExampleTab(Tab, example_tab_class):
     _log_error_signal = pyqtSignal(object, str)
     _param_updated_signal = pyqtSignal(str, str)
 
-    def __init__(self, tabWidget, helper, *args):
-        super(ExampleTab, self).__init__(*args)
+    def __init__(self, helper):
+        super(ExampleTab, self).__init__(helper, 'Example')
         self.setupUi(self)
 
-        self.tabName = "Example"
-        self.menuName = "Example Tab"
-        self.tabWidget = tabWidget
-
-        self._helper = helper
-
         # Always wrap callbacks from Crazyflie API though QT Signal/Slots
         # to avoid manipulating the UI when rendering it
         self._connected_signal.connect(self._connected)