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:
Terje Io
2025-08-29 12:43:48 +02:00
parent 1bd45dfb04
commit 0d4337b75e
7 changed files with 29 additions and 15 deletions
+4 -3
View File
@@ -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;
}