GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-12 06:21:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modified the pressure equalizer to silently ignores most of the invalid GCode lines.

Browse Source
This commit is contained in:
Lukáš Hejl 2022-06-21 13:56:28 +02:00
parent c3bf861b17
commit c1af26e3fd
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/libslic3r/GCode/PressureEqualizer.cpp
View File

@ -149,7 +149,7 @@ static inline int parse_int(const char *&line)
char *endptr = nullptr; char *endptr = nullptr;
long result = strtol(line, &endptr, 10); long result = strtol(line, &endptr, 10);
if (endptr == nullptr || !is_ws_or_eol(*endptr)) if (endptr == nullptr || !is_ws_or_eol(*endptr))
throw Slic3r::RuntimeError("PressureEqualizer: Error parsing an int"); throw Slic3r::InvalidArgument("PressureEqualizer: Error parsing an int");
line = endptr; line = endptr;
return int(result); return int(result);
}; };
@ -212,7 +212,16 @@ bool PressureEqualizer::process_line(const char *line, const char *line_end, GCo
// Parse the G-code line, store the result into the buf. // Parse the G-code line, store the result into the buf.
switch (toupper(*line ++)) { switch (toupper(*line ++)) {
case 'G': { case 'G': {
int gcode = parse_int(line); int gcode = -1;
try {
gcode = parse_int(line);
} catch (Slic3r::InvalidArgument &ex) {
// Ignore invalid GCodes.
eatws(line);
break;
}
assert(gcode != -1);
eatws(line); eatws(line);
switch (gcode) { switch (gcode) {
case 0: case 0:
@ -223,7 +232,7 @@ bool PressureEqualizer::process_line(const char *line, const char *line_end, GCo
memcpy(new_pos, m_current_pos, sizeof(float)*5); memcpy(new_pos, m_current_pos, sizeof(float)*5);
bool changed[5] = { false, false, false, false, false }; bool changed[5] = { false, false, false, false, false };
while (!is_eol(*line)) { while (!is_eol(*line)) {
char axis = toupper(*line++); const char axis = toupper(*line++);
int i = -1; int i = -1;
switch (axis) { switch (axis) {
case 'X': case 'X':
@ -238,16 +247,16 @@ bool PressureEqualizer::process_line(const char *line, const char *line_end, GCo
i = 4; i = 4;
break; break;
default: default:
assert(false); break;
}
if (i != -1) {
buf.pos_provided[i] = true;
new_pos[i] = parse_float(line, line_end - line);
if (i == 3 && m_use_relative_e_distances)
new_pos[i] += m_current_pos[i];
changed[i] = new_pos[i] != m_current_pos[i];
eatws(line);
} }
if (i == -1)
throw Slic3r::RuntimeError(std::string("GCode::PressureEqualizer: Invalid axis for G0/G1: ") + axis);
buf.pos_provided[i] = true;
new_pos[i] = parse_float(line, line_end - line);
if (i == 3 && m_use_relative_e_distances)
new_pos[i] += m_current_pos[i];
changed[i] = new_pos[i] != m_current_pos[i];
eatws(line);
} }
if (changed[3]) { if (changed[3]) {
// Extrusion, retract or unretract. // Extrusion, retract or unretract.
@ -297,26 +306,22 @@ bool PressureEqualizer::process_line(const char *line, const char *line_end, GCo
// G92 : Set Position // G92 : Set Position
// Set a logical coordinate position to a new value without actually moving the machine motors. // Set a logical coordinate position to a new value without actually moving the machine motors.
// Which axes to set? // Which axes to set?
[[maybe_unused]]bool set = false;
while (!is_eol(*line)) { while (!is_eol(*line)) {
char axis = toupper(*line++); const char axis = toupper(*line++);
switch (axis) { switch (axis) {
case 'X': case 'X':
case 'Y': case 'Y':
case 'Z': case 'Z':
m_current_pos[axis - 'X'] = (!is_ws_or_eol(*line)) ? parse_float(line, line_end - line) : 0.f; m_current_pos[axis - 'X'] = (!is_ws_or_eol(*line)) ? parse_float(line, line_end - line) : 0.f;
set = true;
break; break;
case 'E': case 'E':
m_current_pos[3] = (!is_ws_or_eol(*line)) ? parse_float(line, line_end - line) : 0.f; m_current_pos[3] = (!is_ws_or_eol(*line)) ? parse_float(line, line_end - line) : 0.f;
set = true;
break; break;
default: default:
throw Slic3r::RuntimeError(std::string("GCode::PressureEqualizer: Incorrect axis in a G92 G-code: ") + axis); break;
} }
eatws(line); eatws(line);
} }
assert(set);
break; break;
} }
case 10: case 10:
@ -338,7 +343,6 @@ bool PressureEqualizer::process_line(const char *line, const char *line_end, GCo
break; break;
} }
case 'M': { case 'M': {
/*int mcode = */parse_int(line);
eatws(line); eatws(line);
// Ignore the rest of the M-codes. // Ignore the rest of the M-codes.
break; break;