From 37adf4eabe629130ece9d7960d12c8dfbb405ef4 Mon Sep 17 00:00:00 2001 From: Chris Morley Date: Mon, 18 Aug 2014 14:44:42 -0700 Subject: [PATCH] axis -add ability to set default spindle speed most spindle drives will not start the spindle at the default 1 rpm. now one can specify the starting rpmin the ini file. Note this is not the minimum rpm. --- configs/sim/axis/axis.ini | 1 + src/emc/usr_intf/axis/scripts/axis.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/sim/axis/axis.ini b/configs/sim/axis/axis.ini index 4341e84..fbb193f 100644 --- a/configs/sim/axis/axis.ini +++ b/configs/sim/axis/axis.ini @@ -40,6 +40,7 @@ MAX_SPINDLE_OVERRIDE = 1.0 MAX_LINEAR_VELOCITY = 5 DEFAULT_LINEAR_VELOCITY = .25 +DEFAULT_SPINDLE_SPEED = 200 # Prefix to be used PROGRAM_PREFIX = ../../nc_files/ diff --git a/src/emc/usr_intf/axis/scripts/axis.py b/src/emc/usr_intf/axis/scripts/axis.py index 61ed15f..eff23c7 100755 --- a/src/emc/usr_intf/axis/scripts/axis.py +++ b/src/emc/usr_intf/axis/scripts/axis.py @@ -2441,7 +2441,7 @@ class TclCommands(nf.TclCommands): def spindle(event=None): if not manual_ok(): return ensure_mode(linuxcnc.MODE_MANUAL) - c.spindle(vars.spindledir.get()) + c.spindle(vars.spindledir.get(),default_spindle_speed) def spindle_increase(event=None): c.spindle(linuxcnc.SPINDLE_INCREASE) def spindle_decrease(event=None): @@ -2465,7 +2465,7 @@ class TclCommands(nf.TclCommands): if not manual_ok(): return s.poll() if s.spindle_direction == 0: - c.spindle(1) + c.spindle(1,default_spindle_speed) else: c.spindle(0) @@ -2473,7 +2473,7 @@ class TclCommands(nf.TclCommands): if not manual_ok(): return "break" s.poll() if s.spindle_direction == 0: - c.spindle(-1) + c.spindle(-1,default_spindle_speed) else: c.spindle(0) return "break" # bound to F10, don't activate menu @@ -2879,7 +2879,7 @@ max_feed_override = float(inifile.find("DISPLAY", "MAX_FEED_OVERRIDE")) max_spindle_override = float(inifile.find("DISPLAY", "MAX_SPINDLE_OVERRIDE") or max_feed_override) max_feed_override = int(max_feed_override * 100 + 0.5) max_spindle_override = int(max_spindle_override * 100 + 0.5) - +default_spindle_speed = int(inifile.find("DISPLAY", "DEFAULT_SPINDLE_SPEED") or 1) geometry = inifile.find("DISPLAY", "GEOMETRY") or "XYZBCUVW" geometry = re.split(" *(-?[XYZABCUVW])", geometry.upper()) geometry = "".join(reversed(geometry)) -- 1.7.0.4