From 6e943f21295b8b0fa4b371a0992a0d46516d8676 Mon Sep 17 00:00:00 2001 From: Hans Unzner Date: Wed, 6 Nov 2024 22:42:06 +0100 Subject: [PATCH] gmoccapy: read angular values from INI-file only if needed --- configs/sim/gmoccapy/gmoccapy.ini | 5 ----- src/emc/usr_intf/gmoccapy/gmoccapy.py | 9 +++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configs/sim/gmoccapy/gmoccapy.ini b/configs/sim/gmoccapy/gmoccapy.ini index ec7ecef3764..9aa8a90074e 100644 --- a/configs/sim/gmoccapy/gmoccapy.ini +++ b/configs/sim/gmoccapy/gmoccapy.ini @@ -25,11 +25,6 @@ MAX_FEED_OVERRIDE = 1.5 MAX_SPINDLE_OVERRIDE = 1.2 MIN_SPINDLE_OVERRIDE = 0.5 -# The following are not relevant for this machine, added here to suppress warinings. -DEFAULT_ANGULAR_VELOCITY = 360 -MIN_ANGULAR_VELOCITY = 0.1 -MAX_ANGULAR_VELOCITY = 3600 - # Initial value for spindle speed DEFAULT_SPINDLE_SPEED = 450 diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index bf4419ace6c..b32e1d65f6e 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -552,9 +552,6 @@ def _get_ini_data(self): self.rabbit_jog = self.get_ini_info.get_jog_vel() self.jog_rate_max = self.get_ini_info.get_max_jog_vel() - self.min_ang_vel = self.get_ini_info.get_min_ang_jog_vel() - self.default_ang_vel = self.get_ini_info.get_default_ang_jog_vel() - self.max_ang_vel = self.get_ini_info.get_max_ang_jog_vel() self.spindle_override_max = self.get_ini_info.get_max_spindle_override() self.spindle_override_min = self.get_ini_info.get_min_spindle_override() self.feed_override_max = self.get_ini_info.get_max_feed_override() @@ -1775,9 +1772,9 @@ def _init_preferences(self): if not "a" in self.axis_list and not "b" in self.axis_list and not "c" in self.axis_list: self.widgets.spc_ang_jog_vel.hide() else: - self.widgets.spc_ang_jog_vel.set_property("min", self.min_ang_vel) - self.widgets.spc_ang_jog_vel.set_property("max", self.max_ang_vel) - self.widgets.spc_ang_jog_vel.set_value(self.default_ang_vel) + self.widgets.spc_ang_jog_vel.set_property("min", self.get_ini_info.get_min_ang_jog_vel()) + self.widgets.spc_ang_jog_vel.set_property("max", self.get_ini_info.get_max_ang_jog_vel()) + self.widgets.spc_ang_jog_vel.set_value(self.get_ini_info.get_default_ang_jog_vel()) # ============================================================= # Dynamic tabs handling Start