Skip to content

chore: backport of PR #4160#4161

Open
wucke13 wants to merge 1 commit into
LinuxCNC:2.9from
wucke13:dev/backport-#4160-to-2.9.8
Open

chore: backport of PR #4160#4161
wucke13 wants to merge 1 commit into
LinuxCNC:2.9from
wucke13:dev/backport-#4160-to-2.9.8

Conversation

@wucke13

@wucke13 wucke13 commented Jun 13, 2026

Copy link
Copy Markdown
Contributor

This is basically a clipped down version of
203abbf and 344395e.

@grandixximo please verify carefully, I just blindly removed things from the aforementioned commit until when compilation ran through without errors.

@grandixximo

Copy link
Copy Markdown
Contributor

@wucke13 the tests/interp/compile test (use-rs274.cc) still has the old 1-arg STOP_SPINDLE_TURNING stub, so it fails to link against the 2-arg signature. That test is disabled on master but enabled on 2.9, which is why only your backport hit it.

Fix in tests/interp/compile/use-rs274.cc:

void STOP_SPINDLE_TURNING(int spindle, int wait_for_atspeed) {}

@wucke13 wucke13 force-pushed the dev/backport-#4160-to-2.9.8 branch from 35cd262 to 65f09e9 Compare June 14, 2026 12:14
This is basically a clipped down version of
203abbf and
344395e.

Signed-off-by: wucke13 <wucke13+github@gmail.com>
@wucke13 wucke13 force-pushed the dev/backport-#4160-to-2.9.8 branch from 65f09e9 to 16c0e4c Compare June 14, 2026 19:50
@wucke13 wucke13 marked this pull request as ready for review June 14, 2026 19:50
Comment thread src/emc/motion/command.c
M3, or stop after M5) before the probe starts. */
if (emcmotStatus->atspeed_next_feed) {
issue_atspeed = 1;
emcmotStatus->atspeed_next_feed = 0;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you have one tab too many on these, code-base rules tab=8spaces

@andypugh

Copy link
Copy Markdown
Collaborator

I think this is too close to changing existing machine behaviour (admittedly for the better) for me to be comfortable merging it this close to the next release.
But I will probably merge it after the release so that we get a bit more experience with it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants