From 7d2ec178658aa89f966a3362dbd4e371831baae5 Mon Sep 17 00:00:00 2001 From: Genteki Date: Sun, 5 Mar 2023 20:52:54 -0500 Subject: [PATCH 1/2] Update to Pyqt6 to fit M1/M2 --- .../lewansoul_lx16a_terminal.py | 24 +++++++++---------- lewansoul-lx16a-terminal/setup.py | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lewansoul-lx16a-terminal/lewansoul_lx16a_terminal.py b/lewansoul-lx16a-terminal/lewansoul_lx16a_terminal.py index 20c3a0f..b6d870c 100644 --- a/lewansoul-lx16a-terminal/lewansoul_lx16a_terminal.py +++ b/lewansoul-lx16a-terminal/lewansoul_lx16a_terminal.py @@ -8,9 +8,9 @@ import sys -from PyQt5.QtCore import Qt, QTimer, QThread, pyqtSignal -from PyQt5.QtWidgets import (QWidget, QApplication, QDialog, QMessageBox, QListWidgetItem) -from PyQt5.uic import loadUi as _loadUi +from PyQt6.QtCore import Qt, QTimer, QThread, pyqtSignal +from PyQt6.QtWidgets import (QWidget, QApplication, QDialog, QMessageBox, QListWidgetItem) +from PyQt6.uic import loadUi as _loadUi from collections import namedtuple import pkg_resources @@ -407,7 +407,7 @@ def scanFinished(): def servoFound(servoId): item = QListWidgetItem('Servo ID=%s' % servoId) - item.setData(Qt.UserRole, servoId) + item.setData(Qt.ItemDataRole.UserRole, servoId) self.servoList.addItem(item) if not self._servoScanThread: @@ -425,7 +425,7 @@ def servoFound(servoId): def _on_servo_selected(self, item): servo_id = None if item is not None: - servo_id = item.data(Qt.UserRole) + servo_id = item.data(Qt.ItemDataRole.UserRole) if servo_id: self.servo = self.controller.servo(servo_id) @@ -490,7 +490,7 @@ def _configure_servo_id(self): dialog = ConfigureIdDialog() dialog.servoId = self.servo.get_servo_id() - if dialog.exec_(): + if dialog.exec(): self.logger.info('Setting servo ID to %d' % dialog.servoId) self.servo.set_servo_id(dialog.servoId) self.servo = self.controller.servo(dialog.servoId) @@ -498,7 +498,7 @@ def _configure_servo_id(self): item = self.servoList.currentItem() if item is not None: item.setText('Servo ID=%d' % dialog.servoId) - item.setData(Qt.UserRole, dialog.servoId) + item.setData(Qt.ItemDataRole.UserRole, dialog.servoId) def _configure_position_limits(self): if not self.servo: @@ -506,7 +506,7 @@ def _configure_position_limits(self): dialog = ConfigurePositionLimitsDialog() dialog.minPosition, dialog.maxPosition = self.servo.get_position_limits() - if dialog.exec_(): + if dialog.exec(): self.logger.info('Setting position limits to %d..%d' % (dialog.minPosition, dialog.maxPosition)) self.servo.set_position_limits(dialog.minPosition, dialog.maxPosition) self.positionLimits.setText('%d .. %d' % (dialog.minPosition, dialog.maxPosition)) @@ -517,7 +517,7 @@ def _configure_voltage_limits(self): dialog = ConfigureVoltageLimitsDialog() dialog.minVoltage, dialog.maxVoltage = self.servo.get_voltage_limits() - if dialog.exec_(): + if dialog.exec(): self.logger.info('Setting voltage limits to %d..%d' % (dialog.minVoltage, dialog.maxVoltage)) self.servo.set_voltage_limits(dialog.minVoltage, dialog.maxVoltage) self.voltageLimits.setText('%d .. %d' % (dialog.minVoltage, dialog.maxVoltage)) @@ -528,7 +528,7 @@ def _configure_max_temperature(self): dialog = ConfigureMaxTemperatureDialog() dialog.maxTemperature = self.servo.get_max_temperature_limit() - if dialog.exec_(): + if dialog.exec(): self.logger.info('Setting max temperature limit to %d' % (dialog.maxTemperature)) self.servo.set_max_temperature_limit(dialog.maxTemperature) self.maxTemperature.setText(str(dialog.maxTemperature)) @@ -540,7 +540,7 @@ def _configure_position_offset(self): dialog = ConfigurePositionOffsetDialog(self.servo) old_position_offset = self.servo.get_position_offset() dialog.positionOffset = old_position_offset - if dialog.exec_(): + if dialog.exec(): self.logger.info('Setting position offset limit to %d' % (dialog.positionOffset)) self.servo.set_position_offset(dialog.positionOffset) self.servo.save_position_offset() @@ -688,7 +688,7 @@ def main(): logging.basicConfig(level=logging.DEBUG) app = QApplication(sys.argv) terminal = Terminal() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == '__main__': diff --git a/lewansoul-lx16a-terminal/setup.py b/lewansoul-lx16a-terminal/setup.py index a12c1d8..a473816 100644 --- a/lewansoul-lx16a-terminal/setup.py +++ b/lewansoul-lx16a-terminal/setup.py @@ -44,5 +44,5 @@ def find_files(directory, pattern, recursive=True): 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', ], - install_requires=['lewansoul_lx16a', 'pyserial', 'PyQt5'], + install_requires=['lewansoul_lx16a', 'pyserial', 'PyQt6'], ) From e97f3049622314c1498f4ba4661c8d7b555fcff2 Mon Sep 17 00:00:00 2001 From: Genteki Date: Sun, 5 Mar 2023 21:08:10 -0500 Subject: [PATCH 2/2] specify 'pyserial==3.3' --- lewansoul-lx16a/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lewansoul-lx16a/setup.py b/lewansoul-lx16a/setup.py index 9719a90..db25b85 100644 --- a/lewansoul-lx16a/setup.py +++ b/lewansoul-lx16a/setup.py @@ -21,5 +21,5 @@ 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', ], - install_requires=['pyserial'], + install_requires=['pyserial==3.3'], )