juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-15 09:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into SoftFever

Browse Source 
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
This commit is contained in:
SoftFever
2022-12-16 13:59:30 +08:00
parent c06190b79c 390f68a98b
commit bf8a9fee1f
689 changed files with 46784 additions and 10006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libslic3r/GCodeWriter.cpp
View File

@@ -125,13 +125,12 @@ std::string GCodeWriter::set_temperature(unsigned int temperature, bool wait, in
}
// BBS
std::string GCodeWriter::set_bed_temperature(std::vector<int> temps_per_bed, int default_temp, bool wait)
std::string GCodeWriter::set_bed_temperature(int temperature, bool wait)
{
if (temps_per_bed == m_last_bed_temperature && (! wait || m_last_bed_temperature_reached))
if (temperature == m_last_bed_temperature && (! wait || m_last_bed_temperature_reached))
return std::string();
bool target_temp_changed = (temps_per_bed != m_last_bed_temperature);
m_last_bed_temperature = temps_per_bed;
m_last_bed_temperature = temperature;
m_last_bed_temperature_reached = wait;
std::string code, comment;
@@ -146,7 +145,7 @@ std::string GCodeWriter::set_bed_temperature(std::vector<int> temps_per_bed, int
comment = "set bed temperature";
}
gcode << code << " S" << default_temp << " ; " << comment << "\n";
gcode << code << " S" << temperature << " ; " << comment << "\n";
return gcode.str();
}