GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-13 07:49:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fs_import_svg_SPE-1984

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-10-27 08:55:56 +02:00
commit e63fd407ff
7 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/shapes/3DBenchy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
resources/shapes/3DBenchy.stl Normal file
View File

Binary file not shown.

BIN
resources/shapes/sign_base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
resources/shapes/sign_base.stl Normal file
View File

Binary file not shown.

BIN
resources/shapes/sign_base_rounded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
resources/shapes/sign_base_rounded.stl Normal file
View File

Binary file not shown.

7
src/libslic3r/GCode/LabelObjects.cpp
View File

@ -147,11 +147,12 @@ std::string LabelObjects::start_object(const PrintInstance& print_instance, Incl
out += std::string("; printing object ") + label.name + "\n";
else if (m_label_objects_style == LabelObjectsStyle::Firmware) {
if (m_flavor == GCodeFlavor::gcfMarlinFirmware || m_flavor == GCodeFlavor::gcfMarlinLegacy || m_flavor == GCodeFlavor::gcfRepRapFirmware) {
out += std::string("M486 S") + std::to_string(label.unique_id) + "\n";
out += std::string("M486 S") + std::to_string(label.unique_id);
if (include_name == IncludeName::Yes) {
out += std::string("M486 A");
out += (m_flavor == GCodeFlavor::gcfRepRapFirmware ? (std::string("\"") + label.name + "\"") : label.name) + "\n";
out += (m_flavor == GCodeFlavor::gcfRepRapFirmware ? " A" : "\nM486 A");
out += (m_flavor == GCodeFlavor::gcfRepRapFirmware ? (std::string("\"") + label.name + "\"") : label.name);
}
out += "\n";
} else if (m_flavor == gcfKlipper)
out += "EXCLUDE_OBJECT_START NAME=" + label.name + "\n";
else {