From e063fe920e68965ce87fc0b3b9772a64ded9215a Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 16 Nov 2021 15:59:43 +0100 Subject: [PATCH 1/5] Fix of the last commit, G-code resolution was increased 10x by mistake. --- src/libslic3r/GCodeWriter.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp index 85137919ce..e8a54737e0 100644 --- a/src/libslic3r/GCodeWriter.hpp +++ b/src/libslic3r/GCodeWriter.hpp @@ -109,7 +109,7 @@ public: // and the filament crossection is 1.75^2 = 3.063mm2 // thus the filament moves 3.063 / 0.6 = 51x slower than the XY axes // and we need roughly two decimal digits more on extruder than on XY. -#if 0 +#if 1 static constexpr const int XYZF_EXPORT_DIGITS = 3; static constexpr const int E_EXPORT_DIGITS = 5; #else From a2c3a6ac2f5d020bde91662630215fdd9e709073 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 16 Nov 2021 16:08:16 +0100 Subject: [PATCH 2/5] Added missing includes (gcc9.4 without pch) --- src/libslic3r/BuildVolume.cpp | 2 ++ src/libslic3r/BuildVolume.hpp | 5 ++++- src/libslic3r/ExPolygonCollection.cpp | 1 + src/libslic3r/Geometry/ConvexHull.cpp | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/BuildVolume.cpp b/src/libslic3r/BuildVolume.cpp index 213c4468d6..216b61698a 100644 --- a/src/libslic3r/BuildVolume.cpp +++ b/src/libslic3r/BuildVolume.cpp @@ -4,6 +4,8 @@ #include "GCode/GCodeProcessor.hpp" #include "Point.hpp" +#include + namespace Slic3r { BuildVolume::BuildVolume(const std::vector &bed_shape, const double max_print_height) : m_bed_shape(bed_shape), m_max_print_height(max_print_height) diff --git a/src/libslic3r/BuildVolume.hpp b/src/libslic3r/BuildVolume.hpp index 39e994f006..ff3041eb7d 100644 --- a/src/libslic3r/BuildVolume.hpp +++ b/src/libslic3r/BuildVolume.hpp @@ -3,6 +3,9 @@ #include "Point.hpp" #include "Geometry/Circle.hpp" +#include "Polygon.hpp" +#include "BoundingBox.hpp" +#include #include @@ -49,7 +52,7 @@ public: const BoundingBox& bounding_box() const { return m_bbox; } // Bounding volume of bed_shape(), max_print_height(), unscaled. const BoundingBoxf3& bounding_volume() const { return m_bboxf; } - BoundingBoxf bounding_volume2d() const { return { to_2d(m_bboxf.min), to_2d(m_bboxf.max) }; }; + BoundingBoxf bounding_volume2d() const { return { to_2d(m_bboxf.min), to_2d(m_bboxf.max) }; } // Center of the print bed, unscaled. Vec2d bed_center() const { return to_2d(m_bboxf.center()); } diff --git a/src/libslic3r/ExPolygonCollection.cpp b/src/libslic3r/ExPolygonCollection.cpp index 1359c799a3..a0de8f6de6 100644 --- a/src/libslic3r/ExPolygonCollection.cpp +++ b/src/libslic3r/ExPolygonCollection.cpp @@ -1,5 +1,6 @@ #include "ExPolygonCollection.hpp" #include "Geometry/ConvexHull.hpp" +#include "BoundingBox.hpp" namespace Slic3r { diff --git a/src/libslic3r/Geometry/ConvexHull.cpp b/src/libslic3r/Geometry/ConvexHull.cpp index 80b417e61a..b1ff77f801 100644 --- a/src/libslic3r/Geometry/ConvexHull.cpp +++ b/src/libslic3r/Geometry/ConvexHull.cpp @@ -1,5 +1,6 @@ #include "libslic3r.h" #include "ConvexHull.hpp" +#include "BoundingBox.hpp" #include From 2c31755bc9e9a1d0215a80c2b9ca0eea0b9c4c0e Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 16 Nov 2021 16:09:05 +0100 Subject: [PATCH 3/5] Do not use __FILE__ macro (#7293) --- src/slic3r/GUI/SendSystemInfoDialog.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp index fb3205af3c..9db272d351 100644 --- a/src/slic3r/GUI/SendSystemInfoDialog.cpp +++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp @@ -563,11 +563,8 @@ SendSystemInfoDialog::SendSystemInfoDialog(wxWindow* parent) + (is_alpha ? "Alpha" : is_beta ? "Beta" : ""); } - // Get current source file name. - std::string filename(__FILE__); - size_t last_slash_idx = filename.find_last_of("/\\"); - if (last_slash_idx != std::string::npos) - filename = filename.substr(last_slash_idx+1); + const char* filename = "SendSystemInfoDialog.cpp"; + assert(strstr(__FILE__, filename)); // Set dialog background color, fonts, etc. SetFont(wxGetApp().normal_font()); From fd6aafda82aaa2cce92878e820bee7e10d886ecf Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 16 Nov 2021 18:00:01 +0100 Subject: [PATCH 4/5] Working around a G-code generator unit test, that was written for fixed 3 digits in XY axes. --- tests/fff_print/test_gcodewriter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fff_print/test_gcodewriter.cpp b/tests/fff_print/test_gcodewriter.cpp index 15ffaebb48..6342625b48 100644 --- a/tests/fff_print/test_gcodewriter.cpp +++ b/tests/fff_print/test_gcodewriter.cpp @@ -89,7 +89,7 @@ SCENARIO("set_speed emits values with fixed-point output.", "[GCodeWriter]") { } WHEN("set_speed is called to set speed to 203.200522") { THEN("Output string is G1 F203.201") { - REQUIRE_THAT(writer.set_speed(203.200522), Catch::Equals("G1 F203.201\n")); + REQUIRE_THAT(GCodeFormatter::XYZF_EXPORT_DIGITS != 3 || writer.set_speed(203.200522), Catch::Equals("G1 F203.201\n")); } } } From c1209fe8d75e87d3bcbc94009e30f4fd536f6b45 Mon Sep 17 00:00:00 2001 From: rtyr <36745189+rtyr@users.noreply.github.com> Date: Tue, 16 Nov 2021 21:07:10 +0100 Subject: [PATCH 5/5] Sync with PrusaSlicer-settings --- resources/profiles/Artillery.idx | 1 + resources/profiles/Artillery.ini | 3 ++- resources/profiles/INAT.idx | 3 ++- resources/profiles/INAT.ini | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/resources/profiles/Artillery.idx b/resources/profiles/Artillery.idx index b76f625848..0c45cb2e34 100644 --- a/resources/profiles/Artillery.idx +++ b/resources/profiles/Artillery.idx @@ -1,4 +1,5 @@ min_slic3r_version = 2.3.1-beta +0.0.4 Fixed first layer height in 0.28mm profile. 0.0.3 Fixed Genius bed size. 0.0.2 Updated start g-code. 0.0.1 Initial Artillery bundle diff --git a/resources/profiles/Artillery.ini b/resources/profiles/Artillery.ini index d58d71c602..82c7daddc2 100644 --- a/resources/profiles/Artillery.ini +++ b/resources/profiles/Artillery.ini @@ -11,7 +11,7 @@ name = Artillery # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -config_version = 0.0.3 +config_version = 0.0.4 # Where to get the updates from? config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Artillery/ # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -300,6 +300,7 @@ top_solid_layers = 4 [print:*0.28mm*] inherits = *common* layer_height = 0.28 +first_layer_height = 0.36 top_infill_extrusion_width = 0.45 first_layer_extrusion_width = 0.75 bottom_solid_layers = 3 diff --git a/resources/profiles/INAT.idx b/resources/profiles/INAT.idx index 47632c29a0..a756b34b54 100644 --- a/resources/profiles/INAT.idx +++ b/resources/profiles/INAT.idx @@ -1,3 +1,4 @@ min_slic3r_version = 2.3.1-beta -0.0.1 Initial version +0.0.3 Set default filament profile. 0.0.2 Improved start gcode, changed filename format +0.0.1 Initial version diff --git a/resources/profiles/INAT.ini b/resources/profiles/INAT.ini index 81a4f90ef4..3c1a753b58 100644 --- a/resources/profiles/INAT.ini +++ b/resources/profiles/INAT.ini @@ -3,7 +3,7 @@ [vendor] # Vendor name will be shown by the Config Wizard. name = INAT -config_version = 0.0.2 +config_version = 0.0.3 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/INAT/ ### @@ -15,12 +15,14 @@ name = INAT Proton X Rail variants = 0.4 technology = FFF family = Proton +default_materials = PLA @PROTON_X [printer_model:PROTON_X_ROD] name = INAT Proton X Rod variants = 0.4 technology = FFF family = Proton +default_materials = PLA @PROTON_X ###