3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-20 05:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix aux fan issue for third party printers

Browse source
This commit is contained in:
SoftFever 2022-10-25 21:42:36 +08:00
parent ec28acf476
commit bd672054cc
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/profiles/Prusa.json
View file

@ -1,6 +1,6 @@
{ {
"name": "Prusa", "name": "Prusa",
"version": "01.02.00.02", "version": "01.02.00.03",
"force_update": "0", "force_update": "0",
"description": "Prusa configurations", "description": "Prusa configurations",
"machine_model_list": [ "machine_model_list": [

2
resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json
View file

@ -23,7 +23,7 @@
"0x210" "0x210"
], ],
"printable_height": "210", "printable_height": "210",
"machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow",
"machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < 210}G1 Z{min(max_layer_z+2, 210)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < 210}G1 Z{min(max_layer_z+30, 210)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors", "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < 210}G1 Z{min(max_layer_z+2, 210)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < 210}G1 Z{min(max_layer_z+30, 210)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors",
"layer_change_gcode": "", "layer_change_gcode": "",
"scan_first_layer": "0", "scan_first_layer": "0",

5
src/libslic3r/GCode.cpp
View file

@ -1499,7 +1499,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
} }
// Disable fan. // Disable fan.
if (print.config().close_fan_the_first_x_layers.get_at(initial_extruder_id)) { if (m_config.auxiliary_fan.value && print.config().close_fan_the_first_x_layers.get_at(initial_extruder_id)) {
file.write(m_writer.set_fan(0)); file.write(m_writer.set_fan(0));
//BBS: disable additional fan //BBS: disable additional fan
file.write(m_writer.set_additional_fan(0)); file.write(m_writer.set_additional_fan(0));
@ -1806,7 +1806,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
file.write(this->retract(false, true)); file.write(this->retract(false, true));
file.write(m_writer.set_fan(0)); file.write(m_writer.set_fan(0));
//BBS: make sure the additional fan is closed when end //BBS: make sure the additional fan is closed when end
file.write(m_writer.set_additional_fan(0)); if(m_config.auxiliary_fan.value)
file.write(m_writer.set_additional_fan(0));
if (is_bbl_printers) { if (is_bbl_printers) {
//BBS: close spaghetti detector //BBS: close spaghetti detector
//Note: M981 is also used to tell xcam the last layer is finished, so we need always send it even if spaghetti option is disabled. //Note: M981 is also used to tell xcam the last layer is finished, so we need always send it even if spaghetti option is disabled.

4
src/libslic3r/GCode/CoolingBuffer.cpp
View file

@ -774,7 +774,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
new_gcode += GCodeWriter::set_fan(m_config.gcode_flavor, m_fan_speed); new_gcode += GCodeWriter::set_fan(m_config.gcode_flavor, m_fan_speed);
} }
//BBS //BBS
if (additional_fan_speed_new != m_additional_fan_speed) { if (additional_fan_speed_new != m_additional_fan_speed && m_config.auxiliary_fan.value) {
m_additional_fan_speed = additional_fan_speed_new; m_additional_fan_speed = additional_fan_speed_new;
new_gcode += GCodeWriter::set_additional_fan(m_additional_fan_speed); new_gcode += GCodeWriter::set_additional_fan(m_additional_fan_speed);
} }
@ -811,7 +811,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
//BBS: force to write a fan speed command again //BBS: force to write a fan speed command again
if (m_current_fan_speed != -1) if (m_current_fan_speed != -1)
new_gcode += GCodeWriter::set_fan(m_config.gcode_flavor, m_current_fan_speed); new_gcode += GCodeWriter::set_fan(m_config.gcode_flavor, m_current_fan_speed);
if (m_additional_fan_speed != -1) if (m_additional_fan_speed != -1 && m_config.auxiliary_fan.value)
new_gcode += GCodeWriter::set_additional_fan(m_additional_fan_speed); new_gcode += GCodeWriter::set_additional_fan(m_additional_fan_speed);
} }
else if (line->type & CoolingLine::TYPE_EXTRUDE_END) { else if (line->type & CoolingLine::TYPE_EXTRUDE_END) {

2
version.inc
View file

@ -11,4 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1") set(BBL_INTERNAL_TESTING "1")
endif() endif()
set(SLIC3R_VERSION "01.03.00.12") set(SLIC3R_VERSION "01.03.00.12")
set(SoftFever_VERSION "1.3.2 beta2") set(SoftFever_VERSION "1.3.2 beta3")