mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: support spiral lift with timelapse gcode 

The existing implementation did only read the new Z position from the injected timelapse_gcode and flagged the position as unsafe because of this.

This change reads X, Y and Z pos from the timelapgse_gcode and will keep the position state correct to enable safety checks required for using spiral Z hop.

Because of this, spiral Z hop can be used everyhwere now. The same pattern is also applied for layer_change/toolhead gcode injection.

The set_current_position_clear method is unused but will be kept in implementation for future scenarios.
This commit is contained in:
ziehmon 2024-08-15 11:22:47 +02:00 committed by Lane.Wei
parent 22885b057f
commit ce669e421d
3 changed files with 227 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

269
src/libslic3r/GCode.cpp
View File

@ -529,16 +529,36 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
toolchange_gcode_str = toolchange_retract_str + toolchange_gcode_str; toolchange_gcode_str = toolchange_retract_str + toolchange_gcode_str;
//BBS //BBS
{ {
//BBS: current position and fan_speed is unclear after interting change_filament_gcode
check_add_eol(toolchange_gcode_str); check_add_eol(toolchange_gcode_str);
//BBS: gcode writer doesn't know fan speed after inserting tool change gcode
toolchange_gcode_str += ";_FORCE_RESUME_FAN_SPEED\n"; toolchange_gcode_str += ";_FORCE_RESUME_FAN_SPEED\n";
gcodegen.writer().set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed //BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_z_after_tool_change; bool position_changed = false;
if (GCodeProcessor::get_last_z_from_gcode(toolchange_gcode_str, temp_z_after_tool_change)) { Vec3d new_pos = gcodegen.writer().get_position();
Vec3d pos = gcodegen.writer().get_position();
pos(2) = temp_z_after_tool_change; double temp_x_after_toolchange_gcode;
gcodegen.writer().set_position(pos); if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_str, 0, temp_x_after_toolchange_gcode)) {
new_pos(0) = temp_x_after_toolchange_gcode;
position_changed = true;
}
double temp_y_after_toolchange_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_str, 1, temp_y_after_toolchange_gcode)) {
new_pos(1) = temp_y_after_toolchange_gcode;
position_changed = true;
}
double temp_z_after_toolchange_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_str, 2, temp_z_after_toolchange_gcode)) {
new_pos(2) = temp_z_after_toolchange_gcode;
position_changed = true;
}
if (position_changed) {
gcodegen.writer().set_position(new_pos);
} }
} }
@ -3075,16 +3095,37 @@ GCode::LayerResult GCode::process_layer(
gcode += this->change_layer(print_z); // this will increase m_layer_index gcode += this->change_layer(print_z); // this will increase m_layer_index
m_layer = &layer; m_layer = &layer;
m_object_layer_over_raft = false; m_object_layer_over_raft = false;
// insert timelapse_gcode when traditional mode is not used (smooth mode)
if (printer_structure == PrinterStructure::psI3 && !need_insert_timelapse_gcode_for_traditional && !m_spiral_vase && print.config().print_sequence == PrintSequence::ByLayer) { if (printer_structure == PrinterStructure::psI3 && !need_insert_timelapse_gcode_for_traditional && !m_spiral_vase && print.config().print_sequence == PrintSequence::ByLayer) {
std::string timepals_gcode = insert_timelapse_gcode();
gcode += timepals_gcode; std::string timelapse_gcode = insert_timelapse_gcode();
m_writer.set_current_position_clear(false); gcode += timelapse_gcode;
//BBS: check whether custom gcode changes the z position. Update if changed
double temp_z_after_timepals_gcode; //BBS: check whether custom gcode changes the axis positions. Update if changed.
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) { bool position_changed = false;
Vec3d pos = m_writer.get_position(); Vec3d new_pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode;
m_writer.set_position(pos); double temp_x_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode)) {
new_pos(0) = temp_x_after_timelapse_gcode;
position_changed = true;
}
double temp_y_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode)) {
new_pos(1) = temp_y_after_timelapse_gcode;
position_changed = true;
}
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
new_pos(2) = temp_z_after_timelapse_gcode;
position_changed = true;
}
if (position_changed) {
m_writer.set_position(new_pos);
} }
} }
if (! print.config().layer_change_gcode.value.empty()) { if (! print.config().layer_change_gcode.value.empty()) {
@ -3423,21 +3464,40 @@ GCode::LayerResult GCode::process_layer(
// Extrude the skirt, brim, support, perimeters, infill ordered by the extruders. // Extrude the skirt, brim, support, perimeters, infill ordered by the extruders.
for (unsigned int extruder_id : layer_tools.extruders) for (unsigned int extruder_id : layer_tools.extruders)
{ {
// insert timelapse_gcode when wipe tower is enabled and traditional mode is used
if (has_wipe_tower) { if (has_wipe_tower) {
if (!m_wipe_tower->is_empty_wipe_tower_gcode(*this, extruder_id, extruder_id == layer_tools.extruders.back())) { if (!m_wipe_tower->is_empty_wipe_tower_gcode(*this, extruder_id, extruder_id == layer_tools.extruders.back())) {
if (need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode) { if (need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode) {
gcode += this->retract(false, false, LiftType::NormalLift); gcode += this->retract(false, false, LiftType::SpiralLift);
m_writer.add_object_change_labels(gcode); m_writer.add_object_change_labels(gcode);
std::string timepals_gcode = insert_timelapse_gcode(); std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timepals_gcode; gcode += timelapse_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed //BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_z_after_timepals_gcode; bool position_changed = false;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) { Vec3d new_pos = m_writer.get_position();
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode; double temp_x_after_timelapse_gcode;
m_writer.set_position(pos); if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode)) {
new_pos(0) = temp_x_after_timelapse_gcode;
position_changed = true;
}
double temp_y_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode)) {
new_pos(1) = temp_y_after_timelapse_gcode;
position_changed = true;
}
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
new_pos(2) = temp_z_after_timelapse_gcode;
position_changed = true;
}
if (position_changed) {
m_writer.set_position(new_pos);
} }
has_insert_timelapse_gcode = true; has_insert_timelapse_gcode = true;
} }
@ -3646,10 +3706,11 @@ GCode::LayerResult GCode::process_layer(
}; };
//BBS: for first layer, we always print wall firstly to get better bed adhesive force //BBS: for first layer, we always print wall firstly to get better bed adhesive force
//This behaviour is same with cura
// insert timelapse_gcode when no wipe tower, has infill and not first layer
if (is_infill_first && !first_layer) { if (is_infill_first && !first_layer) {
if (!has_wipe_tower && need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode && has_infill(by_region_specific)) { if (!has_wipe_tower && need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode && has_infill(by_region_specific)) {
gcode += this->retract(false, false, LiftType::NormalLift); gcode += this->retract(false, false, LiftType::SpiralLift);
if (!temp_start_str.empty() && m_writer.empty_object_start_str()) { if (!temp_start_str.empty() && m_writer.empty_object_start_str()) {
std::string end_str = std::string("; stop printing object, unique label id: ") + std::to_string(instance_to_print.label_object_id) + "\n"; std::string end_str = std::string("; stop printing object, unique label id: ") + std::to_string(instance_to_print.label_object_id) + "\n";
if (print.is_BBL_Printer()) if (print.is_BBL_Printer())
@ -3657,15 +3718,33 @@ GCode::LayerResult GCode::process_layer(
gcode += end_str; gcode += end_str;
} }
std::string timepals_gcode = insert_timelapse_gcode(); std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timepals_gcode; gcode += timelapse_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed //BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_z_after_timepals_gcode; bool position_changed = false;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) { Vec3d new_pos = m_writer.get_position();
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode; double temp_x_after_timelapse_gcode;
m_writer.set_position(pos); if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode)) {
new_pos(0) = temp_x_after_timelapse_gcode;
position_changed = true;
}
double temp_y_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode)) {
new_pos(1) = temp_y_after_timelapse_gcode;
position_changed = true;
}
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
new_pos(2) = temp_z_after_timelapse_gcode;
position_changed = true;
}
if (position_changed) {
m_writer.set_position(new_pos);
} }
if (!temp_start_str.empty() && m_writer.empty_object_start_str()) if (!temp_start_str.empty() && m_writer.empty_object_start_str())
@ -3677,8 +3756,10 @@ GCode::LayerResult GCode::process_layer(
gcode += this->extrude_perimeters(print, by_region_specific); gcode += this->extrude_perimeters(print, by_region_specific);
} else { } else {
gcode += this->extrude_perimeters(print, by_region_specific); gcode += this->extrude_perimeters(print, by_region_specific);
// insert timelapse_gcode when no wipe tower, no infill and is first layer
if (!has_wipe_tower && need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode && has_infill(by_region_specific)) { if (!has_wipe_tower && need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode && has_infill(by_region_specific)) {
gcode += this->retract(false, false, LiftType::NormalLift); gcode += this->retract(false, false, LiftType::SpiralLift);
if (!temp_start_str.empty() && m_writer.empty_object_start_str()) { if (!temp_start_str.empty() && m_writer.empty_object_start_str()) {
std::string end_str = std::string("; stop printing object, unique label id: ") + std::to_string(instance_to_print.label_object_id) + "\n"; std::string end_str = std::string("; stop printing object, unique label id: ") + std::to_string(instance_to_print.label_object_id) + "\n";
if (print.is_BBL_Printer()) if (print.is_BBL_Printer())
@ -3686,15 +3767,33 @@ GCode::LayerResult GCode::process_layer(
gcode += end_str; gcode += end_str;
} }
std::string timepals_gcode = insert_timelapse_gcode(); std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timepals_gcode; gcode += timelapse_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed //BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_z_after_timepals_gcode; bool position_changed = false;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) { Vec3d new_pos = m_writer.get_position();
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode; double temp_x_after_timelapse_gcode;
m_writer.set_position(pos); if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode)) {
new_pos(0) = temp_x_after_timelapse_gcode;
position_changed = true;
}
double temp_y_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode)) {
new_pos(1) = temp_y_after_timelapse_gcode;
position_changed = true;
}
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
new_pos(2) = temp_z_after_timelapse_gcode;
position_changed = true;
}
if (position_changed) {
m_writer.set_position(new_pos);
} }
if (!temp_start_str.empty() && m_writer.empty_object_start_str()) if (!temp_start_str.empty() && m_writer.empty_object_start_str())
@ -3763,22 +3862,41 @@ GCode::LayerResult GCode::process_layer(
BOOST_LOG_TRIVIAL(trace) << "Exported layer " << layer.id() << " print_z " << print_z << BOOST_LOG_TRIVIAL(trace) << "Exported layer " << layer.id() << " print_z " << print_z <<
log_memory_info(); log_memory_info();
// insert timelapse_gcode when no wipe tower and no infill
if (!has_wipe_tower && need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode) { if (!has_wipe_tower && need_insert_timelapse_gcode_for_traditional && !has_insert_timelapse_gcode) {
if (m_support_traditional_timelapse) if (m_support_traditional_timelapse)
m_support_traditional_timelapse = false; m_support_traditional_timelapse = false;
gcode += this->retract(false, false, LiftType::NormalLift); gcode += this->retract(false, false, LiftType::SpiralLift);
m_writer.add_object_change_labels(gcode); m_writer.add_object_change_labels(gcode);
std::string timepals_gcode = insert_timelapse_gcode(); std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timepals_gcode; gcode += timelapse_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed //BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_z_after_timepals_gcode; bool position_changed = false;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) { Vec3d new_pos = m_writer.get_position();
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode; double temp_x_after_timelapse_gcode;
m_writer.set_position(pos); if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode)) {
new_pos(0) = temp_x_after_timelapse_gcode;
position_changed = true;
}
double temp_y_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode)) {
new_pos(1) = temp_y_after_timelapse_gcode;
position_changed = true;
}
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
new_pos(2) = temp_z_after_timelapse_gcode;
position_changed = true;
}
if (position_changed) {
m_writer.set_position(new_pos);
} }
} }
@ -5480,16 +5598,33 @@ std::string GCode::set_extruder(unsigned int extruder_id, double print_z, bool b
//BBS //BBS
{ {
//BBS: gcode writer doesn't know where the extruder is and whether fan speed is changed after inserting tool change gcode //BBS: gcode writer doesn't know fan speed after inserting tool change gcode
//Set this flag so that normal lift will be used the first time after tool change.
gcode += ";_FORCE_RESUME_FAN_SPEED\n"; gcode += ";_FORCE_RESUME_FAN_SPEED\n";
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed //BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_z_after_tool_change; bool position_changed = false;
if (GCodeProcessor::get_last_z_from_gcode(toolchange_gcode_parsed, temp_z_after_tool_change)) { Vec3d new_pos = m_writer.get_position();
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_tool_change; double temp_x_after_toolchange_gcode;
m_writer.set_position(pos); if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_parsed, 0, temp_x_after_toolchange_gcode)) {
new_pos(0) = temp_x_after_toolchange_gcode;
position_changed = true;
}
double temp_y_after_toolchange_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_parsed, 1, temp_y_after_toolchange_gcode)) {
new_pos(1) = temp_y_after_toolchange_gcode;
position_changed = true;
}
double temp_z_after_toolchange_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_parsed, 2, temp_z_after_toolchange_gcode)) {
new_pos(2) = temp_z_after_toolchange_gcode;
position_changed = true;
}
if (position_changed) {
m_writer.set_position(new_pos);
} }
} }
} }

39
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -2068,13 +2068,14 @@ int GCodeProcessor::get_gcode_last_filament(const std::string& gcode_str)
return out_filament; return out_filament;
} }
//BBS: get last z position from gcode //BBS: get last position from gcode for specified axis
bool GCodeProcessor::get_last_z_from_gcode(const std::string& gcode_str, double& z) //axis index is the same as Vec3d (X=0, Y=1, Z=2)
bool GCodeProcessor::get_last_pos_from_gcode(const std::string& gcode_str, int axis, double& pos)
{ {
int str_size = gcode_str.size(); int str_size = gcode_str.size();
int start_index = 0; int start_index = 0;
int end_index = 0; int end_index = 0;
bool is_z_changed = false; bool is_axis_changed = false;
while (end_index < str_size) { while (end_index < str_size) {
//find a full line //find a full line
if (gcode_str[end_index] != '\n') { if (gcode_str[end_index] != '\n') {
@ -2094,24 +2095,32 @@ bool GCodeProcessor::get_last_z_from_gcode(const std::string& gcode_str, double&
|| line_str.find("G2 ") == 0 || line_str.find("G2 ") == 0
|| line_str.find("G3 ") == 0)) || line_str.find("G3 ") == 0))
{ {
auto z_pos = line_str.find(" Z"); std::string axis_str;
double temp_z = 0; if (axis == 0) {
if (z_pos != line_str.npos axis_str = "X";
&& z_pos + 2 < line_str.size()) { } else if (axis == 1) {
axis_str = "Y";
} else if (axis == 2) {
axis_str = "Z";
}
auto axis_pos = line_str.find(" " + axis_str);
double temp_axis_pos = 0;
if (axis_pos != line_str.npos
&& axis_pos + 2 < line_str.size()) {
// Try to parse the numeric value. // Try to parse the numeric value.
std::string z_sub = line_str.substr(z_pos + 2); std::string axis_substr = line_str.substr(axis_pos + 2);
char* c = &z_sub[0]; char* start_ptr = &axis_substr[0];
char* end = c + sizeof(z_sub.c_str()); char* end_ptr = start_ptr + sizeof(axis_substr.c_str());
auto is_end_of_word = [](char c) { auto is_end_of_word = [](char c) {
return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 0 || c == ';'; return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 0 || c == ';';
}; };
auto [pend, ec] = fast_float::from_chars(c, end, temp_z); auto [parsed_ptr, error_code] = fast_float::from_chars(start_ptr, end_ptr, temp_axis_pos);
if (pend != c && is_end_of_word(*pend)) { if (parsed_ptr != start_ptr && is_end_of_word(*parsed_ptr)) {
// The axis value has been parsed correctly. // The axis value has been parsed correctly.
z = temp_z; pos = temp_axis_pos;
is_z_changed = true; is_axis_changed = true;
} }
} }
} }
@ -2120,7 +2129,7 @@ bool GCodeProcessor::get_last_z_from_gcode(const std::string& gcode_str, double&
start_index = end_index + 1; start_index = end_index + 1;
end_index = start_index; end_index = start_index;
} }
return is_z_changed; return is_axis_changed;
} }
void GCodeProcessor::process_tags(const std::string_view comment, bool producers_enabled) void GCodeProcessor::process_tags(const std::string_view comment, bool producers_enabled)

2
src/libslic3r/GCode/GCodeProcessor.hpp
View File

@ -295,7 +295,7 @@ namespace Slic3r {
static bool contains_reserved_tags(const std::string& gcode, unsigned int max_count, std::vector<std::string>& found_tag); static bool contains_reserved_tags(const std::string& gcode, unsigned int max_count, std::vector<std::string>& found_tag);
static int get_gcode_last_filament(const std::string &gcode_str); static int get_gcode_last_filament(const std::string &gcode_str);
static bool get_last_z_from_gcode(const std::string& gcode_str, double& z); static bool get_last_pos_from_gcode(const std::string& gcode_str, int axis, double& pos);
static const float Wipe_Width; static const float Wipe_Width;
static const float Wipe_Height; static const float Wipe_Height;