GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-18 07:45:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed regression where end gcode wasn't being applied in CLI path.

Browse Source
This commit is contained in:
Joseph Lenox 2018-09-02 11:49:08 -05:00
parent fbdb8da86b
commit 6303d0a59a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xs/src/libslic3r/PrintGCode.cpp
View File

@ -128,7 +128,7 @@ PrintGCode::output()
if (include_start_extruder_temp) this->_print_first_layer_temperature(0); if (include_start_extruder_temp) this->_print_first_layer_temperature(0);
// Apply gcode math to start and end gcode // Apply gcode math to start gcode
fh << apply_math(gcodegen.placeholder_parser->process(config.start_gcode.value)); fh << apply_math(gcodegen.placeholder_parser->process(config.start_gcode.value));
for(const auto& start_gcode : config.start_filament_gcode.values) { for(const auto& start_gcode : config.start_filament_gcode.values) {
@ -276,6 +276,11 @@ PrintGCode::output()
// Write end commands to file. // Write end commands to file.
fh << gcodegen.retract(); // TODO: process this retract through PressureRegulator in order to discharge fully fh << gcodegen.retract(); // TODO: process this retract through PressureRegulator in order to discharge fully
for(const auto& end_gcode : config.end_filament_gcode.values) {
fh << apply_math(gcodegen.placeholder_parser->process(end_gcode));
}
fh << apply_math(gcodegen.placeholder_parser->process(config.end_gcode));
// set bed temperature // set bed temperature
if (config.has_heatbed && temp > 0 && std::regex_search(config.end_gcode.getString(), bed_temp_regex)) { if (config.has_heatbed && temp > 0 && std::regex_search(config.end_gcode.getString(), bed_temp_regex)) {