Skip to content

fix: rs274 nullptr will collapse the milltask when hal para is wrong #3465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andypugh merged 3 commits into from
Jun 17, 2025
Merged

fix: rs274 nullptr will collapse the milltask when hal para is wrong #3465

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c2246f
fix: rs274 nullptr will collapse the milltask when hal para is
fghnntp Jun 7, 2025
1dbe608
Modify for alter the code's operation, keep it as same as before.
fghnntp Jun 17, 2025
8af4885
Remove code duplication in maybe_new_line by using function delegation.
fghnntp Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/emc/rs274ngc/gcodemodule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ static InterpBase *pinterp;

#define callmethod(o, m, f, ...) PyObject_CallMethod((o), (char*)(m), (char*)(f), ## __VA_ARGS__)

static void maybe_new_line(int sequence_number=pinterp->sequence_number());
static void maybe_new_line(int sequence_number);
static void maybe_new_line();

static void maybe_new_line(int sequence_number) {
if(!pinterp) return;
if(interp_error) return;
Expand All @@ -213,6 +215,11 @@ static void maybe_new_line(int sequence_number) {
Py_XDECREF(result);
}

static void maybe_new_line() {
if(!pinterp) return;
maybe_new_line(pinterp->sequence_number());
}

//das ist für die Vorschau
/* G_5_2/G_5_3*/
void NURBS_G5_FEED(int line_number, const std::vector<NURBS_CONTROL_POINT>& nurbs_control_points, unsigned int nurbs_order, CANON_PLANE plane)
Expand Down
Loading