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

control.c joint jogs inhibition if feedhold

Browse source 
inhibit joint-mode jogs if feedhold

Ref: commit 50b1fbe13f "jogging: ignore feedoverride" Nov 2014
     addressed teleop jogs only
This commit is contained in:
Dewey Garrett 2020-10-15 08:36:01 -07:00
parent dd06d37c07
commit 4a6877449d
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

@ -1226,7 +1226,8 @@ static void get_pos_cmds(long period)
if(joint->acc_limit > emcmotStatus->acc)
joint->acc_limit = emcmotStatus->acc;
/* compute joint velocity limit */
if ( joint->home_state == HOME_IDLE ) {
if ( (emcmotStatus->motion_state != EMCMOT_MOTION_FREE)
&& joint->home_state == HOME_IDLE ) {
/* velocity limit = joint limit * global scale factor */
/* the global factor is used for feedrate override */
vel_lim = joint->vel_limit * emcmotStatus->net_feed_scale;