diff --git a/resources/profiles/QIDITechnology.ini b/resources/profiles/QIDITechnology.ini index 411a61e..b6db4d3 100644 --- a/resources/profiles/QIDITechnology.ini +++ b/resources/profiles/QIDITechnology.ini @@ -343,7 +343,7 @@ bed_temperature = 90 enable_auxiliary_fan = 0 enable_volume_fan = 40 extrusion_multiplier = 0.95 -filament_colour = #FFC800 +filament_colour = #FFFACD filament_density = 1.02 filament_max_volumetric_speed = 22 filament_type = ABS @@ -399,7 +399,7 @@ bed_temperature = 90 enable_auxiliary_fan = 0 enable_volume_fan = 40 extrusion_multiplier = 0.95 -filament_colour = #FFC800 +filament_colour = #F0E68C filament_density = 1.02 filament_max_volumetric_speed = 22 filament_type = ABS diff --git a/resources/web/guide/img/MakerWorld.png b/resources/web/guide/img/MakerWorld.png new file mode 100644 index 0000000..e615c1d Binary files /dev/null and b/resources/web/guide/img/MakerWorld.png differ diff --git a/resources/web/guide/index.html b/resources/web/guide/index.html index 867e5ec..d20a5c5 100644 --- a/resources/web/guide/index.html +++ b/resources/web/guide/index.html @@ -212,6 +212,8 @@
+
https://makerworld.com
+
https://www.thingiverse.com
https://www.printables.com/model
diff --git a/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp index d7dd59f..83135e4 100644 --- a/src/libslic3r/GCode/CoolingBuffer.cpp +++ b/src/libslic3r/GCode/CoolingBuffer.cpp @@ -39,6 +39,9 @@ void CoolingBuffer::reset(const Vec3d &position) m_current_pos[2] = float(position.z()); m_current_pos[4] = float(m_config.travel_speed.value); m_fan_speed = -1; +//Y12 + m_fan_speed = -1; + m_fan_speed = -1; } struct CoolingLine @@ -807,15 +810,23 @@ std::string CoolingBuffer::apply_layer_cooldown( } //B15 //B39 if (int(layer_id) == disable_rapid_cooling_fan_first_layers) { - std::ostringstream fan_gcode; - fan_gcode << "M106 P2 S" << 255.0 * enable_auxiliary_fan / 100.0 << "\n"; - new_gcode += fan_gcode.str(); + int auxiliary_fan_speed_new = 255 * enable_auxiliary_fan / 100; + if (auxiliary_fan_speed_new != m_auxiliary_fan_speed) { + std::ostringstream fan_gcode; + m_auxiliary_fan_speed = auxiliary_fan_speed_new; + fan_gcode << "M106 P2 S" << auxiliary_fan_speed_new << "\n"; + new_gcode += fan_gcode.str(); + } } //B25 if (int(layer_id) == disable_fan_first_layers) { - std::ostringstream fan_gcode; - fan_gcode << "M106 P3 S" << 255.0 * enable_volume_fan / 100.0 << "\n"; - new_gcode += fan_gcode.str(); + int volume_fan_speed_new = 255 * enable_volume_fan / 100; + if (volume_fan_speed_new != m_volume_fan_speed) { + std::ostringstream fan_gcode; + m_volume_fan_speed = volume_fan_speed_new; + fan_gcode << "M106 P3 S" << volume_fan_speed_new << "\n"; + new_gcode += fan_gcode.str(); + } } if (fan_speed_new != m_fan_speed) { diff --git a/src/libslic3r/GCode/CoolingBuffer.hpp b/src/libslic3r/GCode/CoolingBuffer.hpp index 91a81c7..85b3ed3 100644 --- a/src/libslic3r/GCode/CoolingBuffer.hpp +++ b/src/libslic3r/GCode/CoolingBuffer.hpp @@ -45,6 +45,9 @@ private: std::vector m_current_pos; // Current known fan speed or -1 if not known yet. int m_fan_speed; +//Y12 + int m_auxiliary_fan_speed; + int m_volume_fan_speed; // Cached from GCodeWriter. // Printing extruder IDs, zero based. std::vector m_extruder_ids;