jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jogging: ignore feedoverride

Browse source 
Prior behavior: feedoverride affects:
   1) wheel jogging   (axis.N.jog-*)
   2) halui jogging   (halui.jog*)
   3) axis ui jogging

New behavior: feedoverride ignored for motion_state==EMCMOT_MOTION_FREE.

Notes:
  1) for wheel jogging, the jog rate can be managed
     with axis.N.jog-scale, axis.N.jog-counts
     (ref: man motion)
  2) for halui jogging, the rate can be managed with
     halui.jog-speed (for plus/minus jogging)
     (ref: man halui)
  3) the axis ui provides individual sliders for both
     linear and angular jog rates

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
This commit is contained in:
Dewey Garrett 2014-11-14 08:12:33 -07:00
parent 5735855f5e
commit 50b1fbe13f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/emc/motion/control.c
View file

@ -461,7 +461,8 @@ static void process_inputs(void)
} }
/* feed scaling first: feed_scale, adaptive_feed, and feed_hold */ /* feed scaling first: feed_scale, adaptive_feed, and feed_hold */
scale = 1.0; scale = 1.0;
if ( enables & FS_ENABLED ) { if ( (emcmotStatus->motion_state != EMCMOT_MOTION_FREE)
&& (enables & FS_ENABLED) ) {
if (emcmotStatus->motionType == EMC_MOTION_TYPE_TRAVERSE) { if (emcmotStatus->motionType == EMC_MOTION_TYPE_TRAVERSE) {
scale *= emcmotStatus->rapid_scale; scale *= emcmotStatus->rapid_scale;
} else { } else {