bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 03:31:50 +02:00
Code Activity

feat: speed and frequency can be updated from GUI

Browse Source
This commit is contained in:
wyzula-jan
2023-08-25 18:14:08 +02:00
parent ce9816480b
commit f391a2fd00
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bec_widgets/examples/motor_movement/motor_controller.ui
View File

@ -582,7 +582,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="pushButton_update_config">
<property name="text"> <property name="text">
<string>Update</string> <string>Update</string>
</property> </property>

53
bec_widgets/examples/motor_movement/motor_example.py
View File

@ -146,6 +146,7 @@ class MotorApp(QWidget):
def init_ui(self) -> None: def init_ui(self) -> None:
"""Setup all ui elements""" """Setup all ui elements"""
# TODO can be separated to multiple functions
########################## ##########################
# 2D Plot # 2D Plot
@ -216,6 +217,19 @@ class MotorApp(QWidget):
self.spinBox_y_min.valueChanged.connect(lambda: self.param_changed(self.spinBox_y_min)) self.spinBox_y_min.valueChanged.connect(lambda: self.param_changed(self.spinBox_y_min))
self.spinBox_y_max.valueChanged.connect(lambda: self.param_changed(self.spinBox_y_max)) self.spinBox_y_max.valueChanged.connect(lambda: self.param_changed(self.spinBox_y_max))
# SpinBoxes - Motor Speed
self.spinBox_speed_x.valueChanged.connect(lambda: self.param_changed(self.spinBox_speed_x))
self.spinBox_speed_y.valueChanged.connect(lambda: self.param_changed(self.spinBox_speed_y))
# SpinBoxes - Motor Update Frequency
self.spinBox_update_frequency_x.valueChanged.connect(
lambda: self.param_changed(self.spinBox_update_frequency_x)
)
self.spinBox_update_frequency_y.valueChanged.connect(
lambda: self.param_changed(self.spinBox_update_frequency_y)
)
# Confog updates
self.pushButton_updateLimits.clicked.connect( self.pushButton_updateLimits.clicked.connect(
lambda: self.update_all_motor_limits( lambda: self.update_all_motor_limits(
x_limit=[self.spinBox_x_min.value(), self.spinBox_x_max.value()], x_limit=[self.spinBox_x_min.value(), self.spinBox_x_max.value()],
@ -223,6 +237,16 @@ class MotorApp(QWidget):
) )
) )
self.pushButton_update_config.clicked.connect(
lambda: self.update_all_config(
speed=[self.spinBox_speed_x.value(), self.spinBox_speed_y.value()],
update_frequency=[
self.spinBox_update_frequency_x.value(),
self.spinBox_update_frequency_y.value(),
],
)
)
# TODO map with floats as well -> or decide system for higher precision # TODO map with floats as well -> or decide system for higher precision
self.motor_thread.coordinates_updated.connect( self.motor_thread.coordinates_updated.connect(
lambda x, y: self.update_image_map(round(x, self.precision), round(y, self.precision)) lambda x, y: self.update_image_map(round(x, self.precision), round(y, self.precision))
@ -247,8 +271,6 @@ class MotorApp(QWidget):
delete_shortcut.activated.connect(self.delete_selected_row) delete_shortcut.activated.connect(self.delete_selected_row)
backspace_shortcut.activated.connect(self.delete_selected_row) backspace_shortcut.activated.connect(self.delete_selected_row)
# Get speed and update frequency
def init_motor_map(self): def init_motor_map(self):
# Get motor limits # Get motor limits
limit_x_min, limit_x_max = self.motor_thread.get_motor_limits(self.motor_x) limit_x_min, limit_x_max = self.motor_thread.get_motor_limits(self.motor_x)
@ -305,6 +327,10 @@ class MotorApp(QWidget):
def update_all_motor_limits(self, x_limit: list = None, y_limit: list = None) -> None: def update_all_motor_limits(self, x_limit: list = None, y_limit: list = None) -> None:
self.motor_thread.update_all_motor_limits(x_limit=x_limit, y_limit=y_limit) self.motor_thread.update_all_motor_limits(x_limit=x_limit, y_limit=y_limit)
def update_all_config(self, speed: list = None, update_frequency: list = None) -> None:
# TODO now only speed and update frequency
self.motor_thread.update_all_config(speed=speed, update_frequency=update_frequency)
def update_arrow_key_shortcuts(self): def update_arrow_key_shortcuts(self):
if self.checkBox_enableArrows.isChecked(): if self.checkBox_enableArrows.isChecked():
# Set the arrow key shortcuts for motor movement # Set the arrow key shortcuts for motor movement
@ -461,21 +487,18 @@ class MotorControl(QThread):
"""Get the configuration of a motor""" # TODO at this moment just for speed and update_frequency """Get the configuration of a motor""" # TODO at this moment just for speed and update_frequency
return motor.get_device_config() return motor.get_device_config()
def get_motor_speed(self, motor) -> float: def update_all_config(self, speed: list = None, update_frequency: list = None) -> None:
"""Get the speed of a motor""" # TODO now only speed and update frequency
return motor.speed if speed is not None:
self.motor_x.set_device_config({"speed": speed[0]})
self.motor_y.set_device_config({"speed": speed[1]})
def set_motor_speed(self, motor, speed: float) -> None: if update_frequency is not None:
"""Set the speed of a motor""" self.motor_x.set_device_config({"update_frequency": update_frequency[0]})
motor.speed = speed self.motor_y.set_device_config({"update_frequency": update_frequency[1]})
def get_motor_update_frequency(self, motor) -> float: self.retrieve_motor_speed(self.motor_x, self.motor_y)
"""Get the update frequency of a motor""" self.retrieve_motor_update_frequency(self.motor_x, self.motor_y)
return motor.update_frequency
def set_motor_update_frequency(self, motor, update_frequency: float) -> None:
"""Set the update frequency of a motor"""
motor.update_frequency = update_frequency
def retrieve_motor_speed( def retrieve_motor_speed(
self, motor_x, motor_y self, motor_x, motor_y