juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-16 21:42:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc updates and clean up

Browse Source 
- WipeTower: use filament_ramming_volumetric_speed(_nc) for ramming, falling back to
  max_vol_speed only when nil; gate precool temps on enable_pre_heating
- ToolOrderUtils: disable the inter-layer forecast in the per-nozzle base reorder so
  H2D/H2C ordering is unchanged
- PrintConfig: stop stripping filament_prime_volume in handle_legacy; document that
  prime_volume drives the Type2 wipe tower and filament_prime_volume the Type1 one
- GCodeProcessor: exclude post-print end-gcode M400 dwells from the M73 estimate and
  drop the dead air-filtration state
- Trim verbose BambuStudio source-location comments across the port
This commit is contained in:
SoftFever
2026-07-20 17:34:13 +08:00
parent 65ab9b61a8
commit 9b5eb76478
8 changed files with 53 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/GCode/GCodeProcessor.cpp
+6 -30
View File
@@ -1529,15 +1529,7 @@ void GCodeProcessor::run_post_process()
tag.remove_suffix(1);
tag.remove_prefix(1); // strip leading ';'
if (tag == Machine_Start_GCode_End_Tag) { m_machine_start_gcode_end_line_id = line_id; return; }
if (tag == Machine_End_GCode_Start_Tag) {
m_machine_end_gcode_start_line_id = line_id;
// End gcode M400 delays (air purification, timelapse, sound) are post-print
// by definition. Skip them so M73 reports print completion time.
// Reference to BBS: BambuStudio/src/libslic3r/GCode/GCodeProcessor.cpp —
// BBS drops leftover in calculate_time(is_final=true), achieving the same.
m_skip_end_gcode_delays = true;
return;
}
if (tag == Machine_End_GCode_Start_Tag) { m_machine_end_gcode_start_line_id = line_id; return; }
}
// filament-change commands: T<fid>, ;VT<fid>, M1020 S<fid>, each optionally " H<nozzle_id>"
@@ -2932,8 +2924,6 @@ void GCodeProcessor::apply_config(const PrintConfig& config)
m_preheat_steps = 1;
m_result.backtrace_enabled = config.ooze_prevention && m_preheat_time > 0 && (m_is_XL_printer || (!m_single_extruder_multi_material && filament_count > 1));
m_support_air_filtration = config.support_air_filtration.value;
assert(config.nozzle_volume.size() == config.nozzle_diameter.size());
m_nozzle_volume.resize(config.nozzle_volume.size());
for (size_t idx = 0; idx < config.nozzle_volume.size(); ++idx)
@@ -3087,10 +3077,6 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
const ConfigOptionInt *nozzle_HRC = config.option<ConfigOptionInt>("nozzle_hrc");
if (nozzle_HRC != nullptr) m_result.nozzle_hrc = nozzle_HRC->value;
const ConfigOptionBool *support_air_filt = config.option<ConfigOptionBool>("support_air_filtration");
if (support_air_filt != nullptr)
m_support_air_filtration = support_air_filt->value;
const ConfigOptionInts* physical_extruder_map = config.option<ConfigOptionInts>("physical_extruder_map");
if (physical_extruder_map != nullptr) {
m_physical_extruder_map = physical_extruder_map->values;
@@ -3508,7 +3494,6 @@ void GCodeProcessor::reset()
m_extruder_blocks.clear();
m_machine_start_gcode_end_line_id = (unsigned int) (-1);
m_machine_end_gcode_start_line_id = (unsigned int) (-1);
m_support_air_filtration = false;
m_skip_end_gcode_delays = false;
m_remaining_volume = std::vector<float>(MAXIMUM_EXTRUDER_NUMBER, 0.f);
@@ -4237,10 +4222,9 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
return;
}
// End gcode marker: skip M400 S/P delays after this point so M73 reports
// print completion time, not post-print filtration/cooldown time.
// Reference to BBS: BambuStudio/src/libslic3r/GCode/GCodeProcessor.cpp —
// BBS drops leftover in calculate_time(is_final=true), achieving the same.
// End gcode marker: skip post-print M400 S/P dwells after this point so the M73 estimate reports
// print-completion time, not post-print filtration/cooldown. BBS drops the same remainder in
// calculate_time(is_final).
if (comment == Machine_End_GCode_Start_Tag) {
m_skip_end_gcode_delays = true;
return;
@@ -6428,18 +6412,10 @@ void GCodeProcessor::process_M400(const GCodeReader::GCodeLine& line)
float value_p = 0.0;
if (line.has_value('S', value_s) || line.has_value('P', value_p)) {
value_s += value_p * 0.001;
// End gcode M400 delays (air purification M400 S180, timelapse M400 S5,
// sound M400 S1) are post-print by definition. Skip them so M73 reports
// print completion time, not post-print filtration/cooldown time.
// Reference to BBS: BambuStudio/src/libslic3r/GCode/GCodeProcessor.cpp —
// BBS drops leftover in calculate_time(is_final=true), achieving the same
// effect of excluding end gcode delays from M73 total. We skip at the
// source instead, leaving calculate_time unchanged for all printers.
// Skip post-print end-gcode dwells so they don't inflate the M73 estimate (see
// m_skip_end_gcode_delays). Only omits dwell time — no state is updated here.
if (m_skip_end_gcode_delays)
return;
simulate_st_synchronize(value_s);
}
}