amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

timelapse gcode

Browse source
This commit is contained in:
SoftFever 2023-10-26 13:16:47 +08:00
parent a6003cb20a
commit 9e93b51777
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/libslic3r/GCode.cpp
View file

@ -3408,16 +3408,28 @@ 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;
if (printer_structure == PrinterStructure::psI3 && !need_insert_timelapse_gcode_for_traditional && !m_spiral_vase && print.config().print_sequence == PrintSequence::ByLayer) { if(is_BBL_Printer()){
std::string timepals_gcode = insert_timelapse_gcode(); if (printer_structure == PrinterStructure::psI3 && !need_insert_timelapse_gcode_for_traditional && !m_spiral_vase && print.config().print_sequence == PrintSequence::ByLayer) {
gcode += timepals_gcode; std::string timepals_gcode = insert_timelapse_gcode();
m_writer.set_current_position_clear(false); gcode += timepals_gcode;
//BBS: check whether custom gcode changes the z position. Update if changed m_writer.set_current_position_clear(false);
double temp_z_after_timepals_gcode; //BBS: check whether custom gcode changes the z position. Update if changed
if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) { double temp_z_after_timepals_gcode;
Vec3d pos = m_writer.get_position(); if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_timepals_gcode)) {
pos(2) = temp_z_after_timepals_gcode; Vec3d pos = m_writer.get_position();
m_writer.set_position(pos); pos(2) = temp_z_after_timepals_gcode;
m_writer.set_position(pos);
}
}
} else {
if (!print.config().time_lapse_gcode.value.empty()) {
DynamicConfig config;
config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
config.set_key_value("layer_z", new ConfigOptionFloat(print_z));
config.set_key_value("max_layer_z", new ConfigOptionFloat(m_max_layer_z));
gcode += this->placeholder_parser_process("timelapse_gcode", print.config().time_lapse_gcode.value, m_writer.extruder()->id(),
&config) +
"\n";
} }
} }
if (! print.config().layer_change_gcode.value.empty()) { if (! print.config().layer_change_gcode.value.empty()) {

1
src/slic3r/GUI/ConfigManipulation.cpp
View file

@ -734,6 +734,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
bool allow_overhang_reverse = has_detect_overhang_wall && !has_spiral_vase; bool allow_overhang_reverse = has_detect_overhang_wall && !has_spiral_vase;
toggle_field("overhang_reverse", allow_overhang_reverse); toggle_field("overhang_reverse", allow_overhang_reverse);
toggle_line("overhang_reverse_threshold", allow_overhang_reverse && has_overhang_reverse); toggle_line("overhang_reverse_threshold", allow_overhang_reverse && has_overhang_reverse);
toggle_line("timelapse_type", is_BBL_Printer);
} }
void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/) void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/)