QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 23:48:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/QIDITECH/QIDISlicer

Browse Source
This commit is contained in:
sunsets
2023-09-26 13:39:53 +08:00
parent 07b20e3c40 535ce1e4d5
commit f4f63b9a54
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/profiles/QIDITechnology.ini
View File

@@ -343,7 +343,7 @@ bed_temperature = 90
enable_auxiliary_fan = 0 enable_auxiliary_fan = 0
enable_volume_fan = 40 enable_volume_fan = 40
extrusion_multiplier = 0.95 extrusion_multiplier = 0.95
filament_colour = #FFC800 filament_colour = #FFFACD
filament_density = 1.02 filament_density = 1.02
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 22
filament_type = ABS filament_type = ABS
@@ -399,7 +399,7 @@ bed_temperature = 90
enable_auxiliary_fan = 0 enable_auxiliary_fan = 0
enable_volume_fan = 40 enable_volume_fan = 40
extrusion_multiplier = 0.95 extrusion_multiplier = 0.95
filament_colour = #FFC800 filament_colour = #F0E68C
filament_density = 1.02 filament_density = 1.02
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 22
filament_type = ABS filament_type = ABS

BIN
resources/web/guide/img/MakerWorld.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1020 KiB

2
resources/web/guide/index.html
View File

@@ -212,6 +212,8 @@
<div class="IntroduceBoard" board="ModelDownload"> <div class="IntroduceBoard" board="ModelDownload">
<div class="IntroduceTitle trans" tid="t13"></div> <div class="IntroduceTitle trans" tid="t13"></div>
<div class="IntroduceTextBold trans" tid="l1"></div> <div class="IntroduceTextBold trans" tid="l1"></div>
<div class="IntroduceText">https://makerworld.com</div>
<div class="AutozoomImage"><img src="img/MakerWorld.png"/></div>
<div class="IntroduceText">https://www.thingiverse.com</div> <div class="IntroduceText">https://www.thingiverse.com</div>
<div class="AutozoomImage"><img src="img/thingiverse.png"/></div> <div class="AutozoomImage"><img src="img/thingiverse.png"/></div>
<div class="IntroduceText">https://www.printables.com/model</div> <div class="IntroduceText">https://www.printables.com/model</div>

15
src/libslic3r/GCode/CoolingBuffer.cpp
View File

@@ -39,6 +39,9 @@ void CoolingBuffer::reset(const Vec3d &position)
m_current_pos[2] = float(position.z()); m_current_pos[2] = float(position.z());
m_current_pos[4] = float(m_config.travel_speed.value); m_current_pos[4] = float(m_config.travel_speed.value);
m_fan_speed = -1; m_fan_speed = -1;
//Y12
m_fan_speed = -1;
m_fan_speed = -1;
} }
struct CoolingLine struct CoolingLine
@@ -807,16 +810,24 @@ std::string CoolingBuffer::apply_layer_cooldown(
} }
//B15 //B39 //B15 //B39
if (int(layer_id) == disable_rapid_cooling_fan_first_layers) { if (int(layer_id) == disable_rapid_cooling_fan_first_layers) {
int auxiliary_fan_speed_new = 255 * enable_auxiliary_fan / 100;
if (auxiliary_fan_speed_new != m_auxiliary_fan_speed) {
std::ostringstream fan_gcode; std::ostringstream fan_gcode;
fan_gcode << "M106 P2 S" << 255.0 * enable_auxiliary_fan / 100.0 << "\n"; m_auxiliary_fan_speed = auxiliary_fan_speed_new;
fan_gcode << "M106 P2 S" << auxiliary_fan_speed_new << "\n";
new_gcode += fan_gcode.str(); new_gcode += fan_gcode.str();
} }
}
//B25 //B25
if (int(layer_id) == disable_fan_first_layers) { if (int(layer_id) == disable_fan_first_layers) {
int volume_fan_speed_new = 255 * enable_volume_fan / 100;
if (volume_fan_speed_new != m_volume_fan_speed) {
std::ostringstream fan_gcode; std::ostringstream fan_gcode;
fan_gcode << "M106 P3 S" << 255.0 * enable_volume_fan / 100.0 << "\n"; m_volume_fan_speed = volume_fan_speed_new;
fan_gcode << "M106 P3 S" << volume_fan_speed_new << "\n";
new_gcode += fan_gcode.str(); new_gcode += fan_gcode.str();
} }
}
if (fan_speed_new != m_fan_speed) { if (fan_speed_new != m_fan_speed) {
m_fan_speed = fan_speed_new; m_fan_speed = fan_speed_new;

3
src/libslic3r/GCode/CoolingBuffer.hpp
View File

@@ -45,6 +45,9 @@ private:
std::vector<float> m_current_pos; std::vector<float> m_current_pos;
// Current known fan speed or -1 if not known yet. // Current known fan speed or -1 if not known yet.
int m_fan_speed; int m_fan_speed;
//Y12
int m_auxiliary_fan_speed;
int m_volume_fan_speed;
// Cached from GCodeWriter. // Cached from GCodeWriter.
// Printing extruder IDs, zero based. // Printing extruder IDs, zero based.
std::vector<unsigned int> m_extruder_ids; std::vector<unsigned int> m_extruder_ids;