Merge branch 'master' of github.com:Ultimaker/CuraEngine

CNC GCode needs P instead of S parameters.
Merge pull request #153 from presslab-us/fixskintravel
2015-01-16 12:17:31 +01:00 · 2015-01-16 12:17:22 +01:00 · 2015-01-14 14:32:03 +01:00 · 2015-01-09 14:20:52 -08:00 · 2015-01-09 10:06:39 -08:00 · 2015-01-04 14:19:50 -08:00
@@ -540,7 +540,7 @@ private:
            gcodeLayer.setAlwaysRetract(true);
            gcodeLayer.addPolygonsByOptimizer(storage.oozeShield[layerNr], &skirtConfig);
            sendPolygonsToGui("oozeshield", layerNr, layer->printZ, storage.oozeShield[layerNr]);
-            gcodeLayer.setAlwaysRetract(!config.enableCombing);
+            gcodeLayer.setAlwaysRetract(config.enableCombing == COMBING_OFF);
        }

        if (config.simpleMode)
@@ -595,10 +595,14 @@ private:
        {
            SliceLayerPart* part = &layer->parts[partOrderOptimizer.polyOrder[partCounter]];

-            if (config.enableCombing)
-                gcodeLayer.setCombBoundary(&part->combBoundery);
-            else
+            if (config.enableCombing == COMBING_OFF)
+            {
                gcodeLayer.setAlwaysRetract(true);
+            }else
+            {
+                gcodeLayer.setCombBoundary(&part->combBoundery);
+                gcodeLayer.setAlwaysRetract(false);
+            }

            Polygons infillPolygons;
            int fillAngle = 45;
@@ -669,6 +673,11 @@ private:
                    bridge = bridgeAngle(outline, &storage.volumes[volumeIdx].layers[layerNr-1]);
                generateLineInfill(outline, skinPolygons, extrusionWidth, extrusionWidth, config.infillOverlap, (bridge > -1) ? bridge : fillAngle);
            }
+            if (config.enableCombing == COMBING_NOSKIN)
+            {
+                gcodeLayer.setCombBoundary(nullptr);
+                gcodeLayer.setAlwaysRetract(true);
+            }
            gcodeLayer.addPolygonsByOptimizer(skinPolygons, &skinConfig);


@@ -372,6 +372,8 @@ void GCodeExport::writeFanCommand(int speed)
    {
        if (flavor == GCODE_FLAVOR_MAKERBOT)
            fprintf(f, "M126 T0 ; value = %d\n", speed * 255 / 100);
+        else if (flavor == GCODE_FLAVOR_MACH3)
+            fprintf(f, "M106 P%d\n", speed * 255 / 100);
        else
            fprintf(f, "M106 S%d\n", speed * 255 / 100);
    }
@@ -379,6 +381,8 @@ void GCodeExport::writeFanCommand(int speed)
    {
        if (flavor == GCODE_FLAVOR_MAKERBOT)
            fprintf(f, "M127 T0\n");
+        else if (flavor == GCODE_FLAVOR_MACH3)
+            fprintf(f, "M106 P%d\n", 0);
        else
            fprintf(f, "M107\n");
    }
@@ -61,7 +61,7 @@ ConfigSettings::ConfigSettings()
    SETTING(minimalExtrusionBeforeRetraction, 100);
    SETTING(retractionZHop, 0);

-    SETTING(enableCombing, 1);
+    SETTING(enableCombing, COMBING_ALL);
    SETTING(enableOozeShield, 0);
    SETTING(wipeTowerSize, 0);
    SETTING(multiVolumeOverlap, 0);
@@ -101,6 +101,16 @@ enum Infill_Pattern
    INFILL_CONCENTRIC = 3,
 };

+/**
+ * Where to use the combing feature
+ */
+enum Combing_Feature
+{
+    COMBING_OFF = 0,
+    COMBING_ALL = 1,
+    COMBING_NOSKIN = 2,
+};
+
 class _ConfigSettingIndex
 {
 public:
Autor	SHA1	Mensagem	Data
daid	5a6ebd4156	Merge branch 'master' of github.com:Ultimaker/CuraEngine	2015-01-16 12:17:31 +01:00
daid	0fdec5246b	CNC GCode needs P instead of S parameters.	2015-01-16 12:17:22 +01:00
daid	bbed68e588	Merge pull request #153 from presslab-us/fixskintravel Use retract on skins	2015-01-14 14:32:03 +01:00
Ryan Press	49d5a81d02	Add option to disable combing on skin surfaces The existing enableCombing options 0, 1 work as before. A new option 2 disables combing on the skin surfaces. This forces a retract to reduce the unsightly scarring on flat surfaces.	2015-01-09 14:20:52 -08:00
Ryan Press	3e980a84fd	slab-us presslab-us authored 5 days ago evert "Use retract on skins" This reverts commit `af14f82a7f`. Because this option should be configurable, change the implementation.	2015-01-09 10:06:39 -08:00
Ryan Press	af14f82a7f	Use retract on skins Using combing on skins causes unsightly scarring on flat surfaces. By forcing a retract between travel moves we can lift the head above the surface to avoid this.	2015-01-04 14:19:50 -08:00