Skip to content

Commit

Permalink
ENH: support spiral lift with timelapse gcode
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
Simon Peters committed Aug 14, 2024
1 parent 4697a98 commit 9fecd57
Show file tree
Hide file tree
Showing 3 changed files with 142 additions and 82 deletions.
183 changes: 117 additions & 66 deletions src/libslic3r/GCode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,16 +527,24 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
toolchange_gcode_str = toolchange_retract_str + toolchange_gcode_str;
//BBS
{
//BBS: current position and fan_speed is unclear after interting change_filament_gcode

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";
gcodegen.writer().set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed
double temp_z_after_tool_change;
if (GCodeProcessor::get_last_z_from_gcode(toolchange_gcode_str, temp_z_after_tool_change)) {
Vec3d pos = gcodegen.writer().get_position();
pos(2) = temp_z_after_tool_change;
gcodegen.writer().set_position(pos);

//BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_x_after_toolchange_gcode;
double temp_y_after_toolchange_gcode;
double temp_z_after_toolchange_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_str, 0, temp_x_after_toolchange_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_str, 1, temp_y_after_toolchange_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_str, 2, temp_z_after_toolchange_gcode)) {
Vec3d new_pos = gcodegen.writer().get_position();
new_pos(0) = temp_x_after_toolchange_gcode;
new_pos(1) = temp_y_after_toolchange_gcode;
new_pos(2) = temp_z_after_toolchange_gcode;
gcodegen.writer().set_position(new_pos);
}
}

Expand Down Expand Up @@ -3073,16 +3081,25 @@ GCode::LayerResult GCode::process_layer(
gcode += this->change_layer(print_z); // this will increase m_layer_index
m_layer = &layer;
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) {
std::string timepals_gcode = insert_timelapse_gcode();
gcode += timepals_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed
double temp_z_after_timepals_gcode;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) {
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode;
m_writer.set_position(pos);

std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timelapse_gcode;

//BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_x_after_timelapse_gcode;
double temp_y_after_timelapse_gcode;
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
Vec3d new_pos = m_writer.get_position();
new_pos(0) = temp_x_after_timelapse_gcode;
new_pos(1) = temp_y_after_timelapse_gcode;
new_pos(2) = temp_z_after_timelapse_gcode;
m_writer.set_position(new_pos);
}
}
if (! print.config().layer_change_gcode.value.empty()) {
Expand Down Expand Up @@ -3421,21 +3438,28 @@ GCode::LayerResult GCode::process_layer(
// Extrude the skirt, brim, support, perimeters, infill ordered by the 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 (!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) {
gcode += this->retract(false, false, LiftType::NormalLift);
gcode += this->retract(false, false, LiftType::SpiralLift);
m_writer.add_object_change_labels(gcode);

std::string timepals_gcode = insert_timelapse_gcode();
gcode += timepals_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed
double temp_z_after_timepals_gcode;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) {
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode;
m_writer.set_position(pos);
std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timelapse_gcode;

//BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_x_after_timelapse_gcode;
double temp_y_after_timelapse_gcode;
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
Vec3d new_pos = m_writer.get_position();
new_pos(0) = temp_x_after_timelapse_gcode;
new_pos(1) = temp_y_after_timelapse_gcode;
new_pos(2) = temp_z_after_timelapse_gcode;
m_writer.set_position(new_pos);
}
has_insert_timelapse_gcode = true;
}
Expand Down Expand Up @@ -3644,26 +3668,33 @@ GCode::LayerResult GCode::process_layer(
};

//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 (!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()) {
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())
end_str += "M625\n";
gcode += end_str;
}

std::string timepals_gcode = insert_timelapse_gcode();
gcode += timepals_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed
double temp_z_after_timepals_gcode;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) {
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode;
m_writer.set_position(pos);
std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timelapse_gcode;

//BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_x_after_timelapse_gcode;
double temp_y_after_timelapse_gcode;
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
Vec3d new_pos = m_writer.get_position();
new_pos(0) = temp_x_after_timelapse_gcode;
new_pos(1) = temp_y_after_timelapse_gcode;
new_pos(2) = temp_z_after_timelapse_gcode;
m_writer.set_position(new_pos);
}

if (!temp_start_str.empty() && m_writer.empty_object_start_str())
Expand All @@ -3675,24 +3706,32 @@ GCode::LayerResult GCode::process_layer(
gcode += this->extrude_perimeters(print, by_region_specific);
} else {
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)) {
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()) {
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())
end_str += "M625\n";
gcode += end_str;
}

std::string timepals_gcode = insert_timelapse_gcode();
gcode += timepals_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed
double temp_z_after_timepals_gcode;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) {
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode;
m_writer.set_position(pos);
std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timelapse_gcode;

//BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_x_after_timelapse_gcode;
double temp_y_after_timelapse_gcode;
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
Vec3d new_pos;
new_pos(0) = temp_x_after_timelapse_gcode;
new_pos(1) = temp_y_after_timelapse_gcode;
new_pos(2) = temp_z_after_timelapse_gcode;
m_writer.set_position(new_pos);
}

if (!temp_start_str.empty() && m_writer.empty_object_start_str())
Expand Down Expand Up @@ -3761,21 +3800,28 @@ GCode::LayerResult GCode::process_layer(
BOOST_LOG_TRIVIAL(trace) << "Exported layer " << layer.id() << " print_z " << print_z <<
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 (m_support_traditional_timelapse)
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);

std::string timepals_gcode = insert_timelapse_gcode();
gcode += timepals_gcode;
m_writer.set_current_position_clear(false);
//BBS: check whether custom gcode changes the z position. Update if changed
double temp_z_after_timepals_gcode;
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) {
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_timepals_gcode;
std::string timelapse_gcode = insert_timelapse_gcode();
gcode += timelapse_gcode;

//BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_x_after_timelapse_gcode;
double temp_y_after_timelapse_gcode;
double temp_z_after_timelapse_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 0, temp_x_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 1, temp_y_after_timelapse_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(timelapse_gcode, 2, temp_z_after_timelapse_gcode)) {
Vec3d new_pos = m_writer.get_position();
new_pos(0) = temp_x_after_timelapse_gcode;
new_pos(1) = temp_y_after_timelapse_gcode;
new_pos(2) = temp_z_after_timelapse_gcode;
m_writer.set_position(pos);
}
}
Expand Down Expand Up @@ -5215,16 +5261,21 @@ std::string GCode::set_extruder(unsigned int extruder_id, double print_z, bool b

//BBS
{
//BBS: gcode writer doesn't know where the extruder is and whether fan speed is changed after inserting tool change gcode
//Set this flag so that normal lift will be used the first time after tool change.
//BBS: gcode writer doesn't know fan speed after inserting tool change gcode
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
double temp_z_after_tool_change;
if (GCodeProcessor::get_last_z_from_gcode(toolchange_gcode_parsed, temp_z_after_tool_change)) {
Vec3d pos = m_writer.get_position();
pos(2) = temp_z_after_tool_change;
m_writer.set_position(pos);

//BBS: check whether custom gcode changes the axis positions. Update if changed.
double temp_x_after_toolchange_gcode;
double temp_y_after_toolchange_gcode;
double temp_z_after_toolchange_gcode;
if (GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_parsed, 0, temp_x_after_toolchange_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_parsed, 1, temp_y_after_toolchange_gcode) &&
GCodeProcessor::get_last_pos_from_gcode(toolchange_gcode_parsed, 2, temp_z_after_toolchange_gcode)) {
Vec3d new_pos = m_writer.get_position();
new_pos(0) = temp_x_after_toolchange_gcode;
new_pos(1) = temp_y_after_toolchange_gcode;
new_pos(2) = temp_z_after_toolchange_gcode;
m_writer.set_position(new_pos);
}
}
}
Expand Down
39 changes: 24 additions & 15 deletions src/libslic3r/GCode/GCodeProcessor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2068,13 +2068,14 @@ int GCodeProcessor::get_gcode_last_filament(const std::string& gcode_str)
return out_filament;
}

//BBS: get last z position from gcode
bool GCodeProcessor::get_last_z_from_gcode(const std::string& gcode_str, double& z)
//BBS: get last position from gcode for specified axis
//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 start_index = 0;
int end_index = 0;
bool is_z_changed = false;
bool is_axis_changed = false;
while (end_index < str_size) {
//find a full line
if (gcode_str[end_index] != '\n') {
Expand All @@ -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("G3 ") == 0))
{
auto z_pos = line_str.find(" Z");
double temp_z = 0;
if (z_pos != line_str.npos
&& z_pos + 2 < line_str.size()) {
std::string axis_str;
if (axis == 0) {
axis_str = "X";
} 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.
std::string z_sub = line_str.substr(z_pos + 2);
char* c = &z_sub[0];
char* end = c + sizeof(z_sub.c_str());
std::string axis_substr = line_str.substr(axis_pos + 2);
char* start_ptr = &axis_substr[0];
char* end_ptr = start_ptr + sizeof(axis_substr.c_str());

auto is_end_of_word = [](char c) {
return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 0 || c == ';';
};

auto [pend, ec] = fast_float::from_chars(c, end, temp_z);
if (pend != c && is_end_of_word(*pend)) {
auto [parsed_ptr, error_code] = fast_float::from_chars(start_ptr, end_ptr, temp_axis_pos);
if (parsed_ptr != start_ptr && is_end_of_word(*parsed_ptr)) {
// The axis value has been parsed correctly.
z = temp_z;
is_z_changed = true;
pos = temp_axis_pos;
is_axis_changed = true;
}
}
}
Expand All @@ -2120,7 +2129,7 @@ bool GCodeProcessor::get_last_z_from_gcode(const std::string& gcode_str, double&
start_index = end_index + 1;
end_index = start_index;
}
return is_z_changed;
return is_axis_changed;
}

void GCodeProcessor::process_tags(const std::string_view comment, bool producers_enabled)
Expand Down
Loading

0 comments on commit 9fecd57

Please sign in to comment.