mirror of
https://github.com/grblHAL/core.git
synced 2026-09-27 19:13:58 +08:00
Fix for laser enable not restored after feedhold. Ref. issue #798.
Fix for incorrect direction of motion via second stepper driver used for step injection (plasma THC) and stepper spindle.
This commit is contained in:
@@ -313,10 +313,11 @@ float plan_compute_profile_nominal_speed (plan_block_t *block)
|
||||
if(block->condition.rapid_motion)
|
||||
nominal_speed *= (0.01f * (float)sys.override.rapid_rate);
|
||||
else {
|
||||
if(nominal_speed > block->rapid_rate)
|
||||
nominal_speed = block->rapid_rate;
|
||||
if(!block->condition.no_feed_override)
|
||||
if(sys.override.feed_rate != 100 && !block->condition.no_feed_override) {
|
||||
if(nominal_speed > block->rapid_rate)
|
||||
nominal_speed = block->rapid_rate;
|
||||
nominal_speed *= (0.01f * (float)sys.override.feed_rate);
|
||||
}
|
||||
if(nominal_speed > block->rapid_rate)
|
||||
nominal_speed = block->rapid_rate;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user