supermerill · legend069 · Dec 19, 2023 · Jan 24, 2024 · Jan 29, 2024 · Feb 7, 2024
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Pressure Advance Calibration</title>
+  <style>
+    body {
+      font-family: Arial, sans-serif;
+      line-height: 1.6;
+    }
+    h1, h2 {
+      color: #333;
+      text-align: center;
+    }
+    ul {
+      list-style-type: disc;
+      margin-left: 20px;
+    }
+    p, li {
+      margin: 10px 0;
+    }
+    .warning {
+      color: red;
+      font-weight: bold;
+    }
+    .info {
+      font-style: italic;
+    }
+    .right-align {
+      text-align: right;
+    }
+  </style>
+</head>
+<body>
+
+<table width="100%">
+<tbody>
+<tr>
+<td style="text-align: center;">
+<h1>Pressure Advance Calibration</h1>
+</td>
+</tr>
+<tr>
+<td style="text-align: right;">
+<strong>
+    <table><tr><td>Requirements:</td>
+        <td style="text-align: left;">Perfect Bed Leveling and Layer Squish</td></tr>
+    </table>
+</strong>
+</tr>
+</tbody>
+</table>
+
+<p><span style="color: red; font-weight: bold;">This test is still in development. The beta version should work well, but your current print settings need to be saved before clicking "Generate" since they are used to create the model.</span></p>
+
+<p>Note: This test will automatically pull all your currently saved configuration parameters and generate a model for you to print. For optimal results, depending if you're chasing speed/quality or a mix of both, it is recommended to keep similar speeds for most extrusion roles, (although this is not mandatory).</p>
+
+<h2>How to Tune Your Printer for Pressure/Linear Advance</h2>
+<p>To get started:</p>
+<ul>
+<li>Select the number of tests to create, the <b>max</b> is <b>10</b>.</li>
+<li>Each row represents the config parameters for the selected extrusion role (e.g., first row = ExternalPerimeter, second row = FirstLayer).</li>
+<li>Select the start/end and increment values, <b>you can manually edit these values if you want larger or smaller values.</b></li>
+<li>Since each model will have its own config, one test model might print faster or slower than others. This is expected and normal.</li>
+<li>This is the first calibration tool that supports <b>Arachne!</b> so leave it enabled if you use Arachne. </li>
+<li>Helpful tip: If you are running multiple tests on a single plate, take a screenshot of the main configuration page (or leave it open and drag the window out of the way) to match the row number to the ID label on the bottom right of the loaded model. (counting starts at '0' ☺)<br>
+You can also inspect each 'base model' and view the object modifiers for each 90° bend model, the 'region_gcode' will have a comment for the extrusion role.<br></li>
+</ul>
+
+<li>if you use PA/LA commands in your <b>feature_gcode</b> it will be auto commented</li>
+
+<p>Currently unsupported roles:</p>
+<ul>
+<li>BridgeInfill, InternalBridgeInfill, ThinWall, GapFill, Ironing</li>
+</ul>
+<p>What is the "Verify" option?<br>
+The "Verify" option is an experimental feature. It aims to create a 90° model for each extrusion role, applying specific settings related to that extrusion role. <br>
+You need to <b>manually</b> add the pressure advance values into the "per region g-code" box.<br>
+However, it currently doesn't work perfectly. Occasionally the models get 'gap fill' and that will produce inaccurate results. Select the "verify" option to identify which extrusion roles need Pressure Advance tuning.</p>
+
+<h2>Known Bugs</h2>
+<ul>
+<li>Setting the first layer's PA value for multiple tests only applies the last row's value to (before_layer_gcode).</li>
+<li>The first layer may receive gap fill on the 90° bend models; it is recommended to disable gap fill in the object modifiers if this occurs.</li>
+<li>Occasionally some numbers might get scaled wrong so they won't show up on the G-code preview, this has primarily been for number '1'. If this happens, adjust main config 'thin_perimeters' to '-1'.</li>
+<li>Other minor bugs may be present.</li>
+</ul>
+
+<h2>Advice</h2>
+<p>Before calibrating Pressure/Linear Advance, it is recommended to tune everything else first!<br>
+<p>You may need to disable or adjust your part cooling config for this test, including the features that slow down layer times. Note: Large variances in ER speeds can reduce print quality and dimensional accuracy.</p>
+<p>It's recommended to set 'first_layer_min_speed' and 'first_layer_speed' to the same values, since the variance in speeds will mess with the first layer's pressure advance adjustments.</p>
+
+<h2>Notes</h2>
+<p><strong>TODO: add pictures</p>
+
+<table width="100%">
+<tbody>
+<tr>
+<td style="text-align: right;">
+<p>This testing method originated from <a href="https://ellis3dp.com/Print-Tuning-Guide/">ellis3dp.com/Print-Tuning-Guide</a>. You can find the original generator <a href="https://ellis3dp.com/Pressure_Linear_Advance_Tool/">here</a>.</p>
+</td>
+</tr>
+</tbody>
+</table>
+
+</body>
+</html>
@@ -12,6 +12,7 @@ src/slic3r/GUI/CalibrationCubeDialog.cpp
 src/slic3r/GUI/CalibrationFlowDialog.cpp
 src/slic3r/GUI/CalibrationOverBridgeDialog.cpp
 src/slic3r/GUI/CalibrationRetractionDialog.cpp
+src/slic3r/GUI/CalibrationPressureAdvDialog.cpp
 src/slic3r/GUI/CalibrationTempDialog.cpp
 src/slic3r/GUI/ConfigManipulation.cpp
 src/slic3r/GUI/ConfigSnapshotDialog.cpp

@@ -43,7 +43,7 @@ group:Fan speed - default
 		setting:id$0:label_width$12:label$Interface:support_material_interface_fan_speed
 	line:Bridges fan speed
 		setting:id$0:label_width$12:label$Bridges:bridge_fan_speed
-		setting:id$0:label_width$12:label$Internal bridges:bridge_internal_fan_speed
+		setting:id$0:label_width$12:label$Internal bridges:internal_bridge_fan_speed
 	line:Overhangs Perimeter fan speed
 		setting:id$0:label_width$12:label$Overhangs:overhangs_fan_speed
 	line:Gap fill fan speed

@@ -334,7 +334,7 @@ group:label_width$8:sidetext_width$7:Speed for print moves
 		setting:width$4:brim_speed
 	line:Bridge speed
 		setting:width$4:bridge_speed
-		setting:width$4:bridge_speed_internal
+		setting:width$4:internal_bridge_speed
 		setting:width$4:overhangs_speed
 	line:Gap fill speed
 		setting:width$4:label$Maximum speed:gap_fill_speed
@@ -384,7 +384,7 @@ group:label_width$9:sidetext_width$8:Acceleration control (advanced)
 		setting:width$4:brim_acceleration
 	line:Bridge acceleration
 		setting:width$4:bridge_acceleration
-		setting:width$4:bridge_internal_acceleration
+		setting:width$4:internal_bridge_acceleration
 		setting:width$4:overhangs_acceleration
 	line:Other extrusions acceleration
 		setting:width$4:gap_fill_acceleration
@@ -507,6 +507,7 @@ group:Output file
 	setting:full_width:output_filename_format
 group:Other
     gcode_substitutions
+	setting:per_objects_gcode
 group:Post-processing script
 	setting:full_width:height$5:post_process
 	post_process_explanation

@@ -48,7 +48,7 @@ group:Fan speed - default
 		setting:id$0:label_width$12:label$Interface:support_material_interface_fan_speed
 	line:Bridges fan speed
 		setting:id$0:label_width$12:label$Bridges:bridge_fan_speed
-		setting:id$0:label_width$12:label$Internal bridges:bridge_internal_fan_speed
+		setting:id$0:label_width$12:label$Internal bridges:internal_bridge_fan_speed
 	line:Overhangs Perimeter fan speed
 		setting:id$0:label_width$12:label$Overhangs:overhangs_fan_speed
 	line:Gap fill fan speed

@@ -322,7 +322,7 @@ group:label_width$8:sidetext_width$7:Speed for print moves
 		setting:width$4:brim_speed
 	line:Bridge speed
 		setting:width$4:bridge_speed
-		setting:width$4:bridge_speed_internal
+		setting:width$4:internal_bridge_speed
 		setting:width$4:overhangs_speed
 	line:Gap fill speed
 		setting:width$4:label$maximum speed:gap_fill_speed
@@ -366,7 +366,7 @@ group:label_width$9:sidetext_width$8:Acceleration control (advanced)
 		setting:width$4:brim_acceleration
 	line:Bridge acceleration
 		setting:width$4:bridge_acceleration
-		setting:width$4:bridge_internal_acceleration
+		setting:width$4:internal_bridge_acceleration
 		setting:width$4:overhangs_acceleration
 	line:Other extrusions acceleration
 		setting:width$4:gap_fill_acceleration
@@ -489,6 +489,7 @@ group:Output file
 	setting:full_width:output_filename_format
 group:Other
     gcode_substitutions
+	setting:per_objects_gcode
 group:Post-processing script
 	setting:full_width:height$5:post_process
 	post_process_explanation

@@ -238,7 +238,8 @@ BuildVolume::ObjectState object_state_templ(const indexed_triangle_set &its, con
                             const stl_vertex p2 = trafo * its.vertices[tri(iedge)];
                             assert(sign(p1) == s[iprev]);
                             assert(sign(p2) == s[iedge]);
-                            assert(p1.z() * p2.z() < 0);
+                            assert(p1.z() * p2.z() <= 0);
+                            assert(std::abs(p2.z() - p1.z()) > EPSILON);
                             // Edge crosses the z plane. Calculate intersection point with the plane.
                             const float t = (world_min_z - p1.z()) / (p2.z() - p1.z());
                             (is_inside(Vec3f(p1.x() + (p2.x() - p1.x()) * t, p1.y() + (p2.y() - p1.y()) * t, world_min_z)) ? inside : outside) = true;

@@ -57,6 +57,7 @@ struct SurfaceFillParams : FillParams
         RETURN_COMPARE_NON_EQUAL(can_angle_cross);
         RETURN_COMPARE_NON_EQUAL(density);
         RETURN_COMPARE_NON_EQUAL(monotonic);
+        RETURN_COMPARE_NON_EQUAL(max_sparse_infill_spacing);
         RETURN_COMPARE_NON_EQUAL_TYPED(unsigned, connection);
         RETURN_COMPARE_NON_EQUAL_TYPED(unsigned, dont_adjust);
 
@@ -70,16 +71,22 @@ struct SurfaceFillParams : FillParams
         assert(this->config != nullptr);
         assert(rhs.config != nullptr);
         if (config != nullptr && rhs.config != nullptr) {
+            RETURN_COMPARE_NON_EQUAL(config->infill_acceleration);
             RETURN_COMPARE_NON_EQUAL(config->infill_speed);
+            RETURN_COMPARE_NON_EQUAL(config->solid_infill_acceleration);
             RETURN_COMPARE_NON_EQUAL(config->solid_infill_speed);
+            RETURN_COMPARE_NON_EQUAL(config->top_solid_infill_acceleration);
             RETURN_COMPARE_NON_EQUAL(config->top_solid_infill_speed);
-            RETURN_COMPARE_NON_EQUAL(config->ironing_speed);
+            RETURN_COMPARE_NON_EQUAL(config->default_acceleration);
             RETURN_COMPARE_NON_EQUAL(config->default_speed);
+            RETURN_COMPARE_NON_EQUAL(config->bridge_acceleration);
             RETURN_COMPARE_NON_EQUAL(config->bridge_speed);
-            RETURN_COMPARE_NON_EQUAL(config->bridge_speed_internal);
+            RETURN_COMPARE_NON_EQUAL(config->internal_bridge_acceleration);
+            RETURN_COMPARE_NON_EQUAL(config->internal_bridge_speed);
+            RETURN_COMPARE_NON_EQUAL(config->gap_fill_acceleration);
             RETURN_COMPARE_NON_EQUAL(config->gap_fill_speed);
             RETURN_COMPARE_NON_EQUAL(config->print_extrusion_multiplier);
-            RETURN_COMPARE_NON_EQUAL(max_sparse_infill_spacing);
+            RETURN_COMPARE_NON_EQUAL(config->region_gcode.value);
         }
         if (config == nullptr || rhs.config == nullptr || max_sparse_infill_spacing == 0)
             RETURN_COMPARE_NON_EQUAL(flow.width());
@@ -92,14 +99,23 @@ struct SurfaceFillParams : FillParams
         if ((config != nullptr) != (rhs.config != nullptr))
             return false;
         if(config != nullptr && (
-            config->infill_speed != rhs.config->infill_speed
+            config->infill_acceleration != rhs.config->infill_acceleration
+            || config->infill_speed != rhs.config->infill_speed
+            || config->solid_infill_acceleration != rhs.config->solid_infill_acceleration
             || config->solid_infill_speed != rhs.config->solid_infill_speed
+            || config->top_solid_infill_acceleration != rhs.config->top_solid_infill_acceleration
             || config->top_solid_infill_speed != rhs.config->top_solid_infill_speed
-            || config->ironing_speed != rhs.config->ironing_speed
+            || config->default_acceleration != rhs.config->default_acceleration
             || config->default_speed != rhs.config->default_speed
+            || config->bridge_acceleration != rhs.config->bridge_acceleration
             || config->bridge_speed != rhs.config->bridge_speed
-            || config->bridge_speed_internal != rhs.config->bridge_speed_internal
-            || config->gap_fill_speed != rhs.config->gap_fill_speed))
+            || config->internal_bridge_acceleration != rhs.config->internal_bridge_acceleration
+            || config->internal_bridge_speed != rhs.config->internal_bridge_speed
+            || config->gap_fill_acceleration != rhs.config->gap_fill_acceleration
+            || config->gap_fill_speed != rhs.config->gap_fill_speed
+            || config->print_extrusion_multiplier != rhs.config->print_extrusion_multiplier
+            || config->region_gcode != rhs.config->region_gcode
+            ))
             return false;
         // then check params
         return  this->extruder              == rhs.extruder         &&
@@ -765,6 +781,7 @@ void Layer::make_ironing()
         double         line_spacing;
         // Height of the extrusion, to calculate the extrusion flow from.
         double         height;
+        double         acceleration;
         double         speed;
         double         angle;
         IroningType    type;
@@ -786,6 +803,10 @@ void Layer::make_ironing()
                 return true;
             if (this->height > rhs.height)
                 return false;
+            if (this->acceleration < rhs.acceleration)
+                return true;
+            if (this->acceleration > rhs.acceleration)
+                return false;
             if (this->speed < rhs.speed)
                 return true;
             if (this->speed > rhs.speed)
@@ -797,11 +818,12 @@ void Layer::make_ironing()
             return false;
         }
 
-        bool operator==(const IroningParams &rhs) const {
+        bool operator==(const IroningParams &rhs) const
+        {
             return this->extruder == rhs.extruder && this->just_infill == rhs.just_infill &&
-                   this->line_spacing == rhs.line_spacing && this->height == rhs.height && this->speed == rhs.speed &&
-                this->angle == rhs.angle &&
-                this->type == rhs.type;
+                   this->line_spacing == rhs.line_spacing && this->height == rhs.height &&
+                   this->acceleration == rhs.acceleration && this->speed == rhs.speed &&
+                   this->angle == rhs.angle && this->type == rhs.type;
         }
 
         LayerRegion *layerm        = nullptr;
@@ -847,11 +869,16 @@ void Layer::make_ironing()
                 ironing_params.type              = config.ironing_type;
                 ironing_params.just_infill     = false;
                 ironing_params.line_spacing = config.ironing_spacing;
-                ironing_params.height         = default_layer_height * 0.01 * config.ironing_flowrate;
-                ironing_params.speed         = config.ironing_speed;
-                ironing_params.angle         = config.ironing_angle <0 ?
-                    compute_fill_angle(config, layerm->layer()->id()) :
-                    float(Geometry::deg2rad(config.ironing_angle.value));
+                ironing_params.height       = default_layer_height * 0.01 * config.ironing_flowrate;
+                ironing_params.acceleration = config.ironing_acceleration;
+                ironing_params.speed        = config.ironing_speed;
+                if (config.ironing_angle.value >= 0) {
+                    ironing_params.angle = float(Geometry::deg2rad(config.ironing_angle.value));
+                } else {
+                    ironing_params.angle = compute_fill_angle(config, layerm->layer()->id());
+                    if (config.ironing_angle.value < -1)
+                        ironing_params.angle += float(Geometry::deg2rad(-config.ironing_angle.value));
+                }
                 ironing_params.layerm         = layerm;
                 by_extruder.emplace_back(ironing_params);
             }

@@ -524,7 +524,7 @@ float Flow::rounded_rectangle_extrusion_spacing(float width, float height, float
 #else
     if (width == height && width == 0)
         return 0.f;
-    float out = width - height * float(1. - 0.25 * PI) * m_spacing_ratio;
+    float out = width - height * float(1. - 0.25 * PI) * m_spacing_ratio;//this calculates the real spacing for widths. i need this one.
     if (out <= 0.f)
         throw FlowErrorNegativeSpacing();
     return out;

@@ -96,7 +96,7 @@ void init()
     //key_translation_map["bridge_angle"]                             = "bridge_angle";
     key_translation_map["bridge_density"]                           = "bridge_overlap_min";
     key_translation_map["bridge_no_support"]                        = "dont_support_bridges";
-    key_translation_map["internal_bridge_speed"]                    = "bridge_speed_internal";
+    //key_translation_map["internal_bridge_speed"]                    = "internal_bridge_speed";
     //key_translation_map["brim_ears"]                                = "brim_ears";
     //key_translation_map["brim_ears_detection_length"]               = "brim_ears_detection_length";
     //key_translation_map["brim_ears_max_angle"]                      = "brim_ears_max_angle";