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

Implement option from old Slic3r mainline to permit printer firmware to define their fan speeds from 0-100 instead of 0-255.

Browse Source
This commit is contained in:
Joseph Lenox 2021-03-20 22:34:13 -05:00
parent 68ea889207
commit b0492858f5
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/GCodeWriter.cpp
View File

@ -227,6 +227,7 @@ std::string GCodeWriter::set_fan(const unsigned int speed, bool dont_save, uint1
if (tool != nullptr) if (tool != nullptr)
fan_speed += int8_t(tool->fan_offset()); fan_speed += int8_t(tool->fan_offset());
fan_speed = std::max(int16_t(0), std::min(int16_t(100), fan_speed)); fan_speed = std::max(int16_t(0), std::min(int16_t(100), fan_speed));
const auto fan_baseline = (this->config.fan_percentage.value ? 100.0 : 255.0);
// fan_speed has an effective minimum value of 0, so this cast is safe. // fan_speed has an effective minimum value of 0, so this cast is safe.
//test if it's useful to write it //test if it's useful to write it
@ -258,7 +259,7 @@ std::string GCodeWriter::set_fan(const unsigned int speed, bool dont_save, uint1
} else { } else {
gcode << "S"; gcode << "S";
} }
gcode << (255.0 * fan_speed / 100.0); gcode << (fan_baseline * (fan_speed / 100.0));
} }
if (this->config.gcode_comments) gcode << " ; enable fan"; if (this->config.gcode_comments) gcode << " ; enable fan";
gcode << "\n"; gcode << "\n";

8
src/libslic3r/PrintConfig.cpp
View File

@ -2528,6 +2528,14 @@ void PrintConfigDef::init_fff_params()
def->mode = comSimple; def->mode = comSimple;
def->set_default_value(new ConfigOptionInts{ 35 }); def->set_default_value(new ConfigOptionInts{ 35 });
def = this->add("fan_percentage", coBool);
def->label = _("Fan PWM from 0-100");
def->category = OptionCategory::output;
def->tooltip = _("Set this if your printer uses control values from 0-100 instead of 0-255.");
def->cli = "fan-percentage";
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
def = this->add("min_layer_height", coFloats); def = this->add("min_layer_height", coFloats);
def->label = L("Min"); def->label = L("Min");
def->full_label = ("Min layer height"); def->full_label = ("Min layer height");

2
src/libslic3r/PrintConfig.hpp
View File

@ -1011,6 +1011,7 @@ public:
ConfigOptionFloats extruder_temperature_offset; ConfigOptionFloats extruder_temperature_offset;
ConfigOptionString extrusion_axis; ConfigOptionString extrusion_axis;
ConfigOptionFloats extrusion_multiplier; ConfigOptionFloats extrusion_multiplier;
ConfigOptionBool fan_percentage;
ConfigOptionFloat fan_kickstart; ConfigOptionFloat fan_kickstart;
ConfigOptionBool fan_speedup_overhangs; ConfigOptionBool fan_speedup_overhangs;
ConfigOptionFloat fan_speedup_time; ConfigOptionFloat fan_speedup_time;
@ -1121,6 +1122,7 @@ protected:
OPT_PTR(extruder_temperature_offset); OPT_PTR(extruder_temperature_offset);
OPT_PTR(extrusion_axis); OPT_PTR(extrusion_axis);
OPT_PTR(extrusion_multiplier); OPT_PTR(extrusion_multiplier);
OPT_PTR(fan_percentage);
OPT_PTR(fan_kickstart); OPT_PTR(fan_kickstart);
OPT_PTR(fan_speedup_overhangs); OPT_PTR(fan_speedup_overhangs);
OPT_PTR(fan_speedup_time); OPT_PTR(fan_speedup_time);