Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #83 from make-me/bump-miracle-grue

Bump dependencies
  • Loading branch information...
commit e508ca4761bc64c6137bb055dc442a5c0de1dddb 2 parents 02dd8ec + 67cb193
@skalnik skalnik authored
View
4 .gitmodules
@@ -1,9 +1,9 @@
[submodule "vendor/s3g"]
path = vendor/s3g
- url = https://github.com/skalnik/s3g.git
+ url = https://github.com/makerbot/s3g.git
[submodule "vendor/Miracle-Grue"]
path = vendor/Miracle-Grue
- url = https://github.com/skalnik/Miracle-Grue.git
+ url = https://github.com/makerbot/Miracle-Grue.git
[submodule "vendor/stltwalker"]
path = vendor/stltwalker
url = https://github.com/sshirokov/stltwalker.git
View
1  Makefile
@@ -39,6 +39,7 @@ endif
## Plumbing
init:
@echo "=> Loading submodules"
+ git submodule sync
git submodule update --init --recursive
@echo "=> Building deps"
$(MAKE) -C vendor
View
34 config/grue-default.config
@@ -1,14 +1,24 @@
{
- "infillDensity" : 0.05, // unit: ratio to solid
- "numberOfShells" : 2, //Number of shells to print
- "insetDistanceMultiplier" : 1.05, // unit: layerW // how far apart are insets from each other
- "roofLayerCount" : 5, // nb of extra solid layers for roofs
- "floorLayerCount" : 5, // nb of extra solid layers for floor
- "layerWidthRatio" : 1.67, //Width over height ratio
- "preCoarseness" : 0.1, //coarseness before all processing
- "coarseness" : 0.05, // moves shorter than this are combined
- "directionWeight" : 0.5,
- "gridSpacingMultiplier" : 0.85,
+ "infillDensity" : 0.05, // 5% solid
+ "numberOfShells" : 2, // Number of shells to print
+ "insetDistanceMultiplier" : 1.05, // layerW// how far apart are insets from each other
+ "infillShellSpacingMultiplier" : 0.70, // ratio of the layer width distance between innermost shell and infill
+ "roofLayerCount" : 5, // # of solid layers for roof
+ "floorLayerCount" : 5, // # of solid layers for floor
+ "layerWidthRatio" : 1.67, // width over height ratio
+ "layerWidthMinimum" : 0.4, // layers cannot be narrower than this
+ "layerWidthMaximum" : 0.85, //layers cannot be wider than this
+ "preCoarseness" : 0.1, //coarseness before all processing
+ "coarseness" : 0.05, // moves shorter than this are combined
+ "directionWeight" : 0.5,
+ "gridSpacingMultiplier" : 0.99,
+
+ "doExternalSpurs" : true,
+ "doInternalSpurs" : false,
+ "minSpurWidth" : 0.12, // 0.3 * default layer width
+ "maxSpurWidth" : 0.4, // default layer width plus 0.2
+ "minSpurLength": 0.4,
+ "spurOverlap" : 0.001, // how far to extend spur segments to make them intersect
"doOutlines" : false,
"doInfills" : true,
@@ -41,9 +51,6 @@
"startY" : -74.0,
"startZ" : 0.2,
- "startGcode" : "default://start_replicator_dual.gcode", // gcode to insert at beginning of output
- "endGcode" : "default://end_replicator_dual.gcode", // gcode to insert at end of output
-
"doPrintProgress" : true, // display % complete on bot
"doFanCommand" : true,
@@ -57,6 +64,7 @@
"infillsExtrusionProfile" : "infill", //extrusion profile for infill
"outlinesExtrusionProfile" : "outlines", //extrusion profile for outlines
"feedDiameter" : 1.82, //diameter in mm of feedstock
+ "feedstockMultiplier" : 0.77, //print goodness number
"nozzleDiameter": 0.4,
"retractDistance" : 1, // mm
"retractRate" : 20, // mm/sec
2  vendor/Miracle-Grue
@@ -1 +1 @@
-Subproject commit 200e85ea0370cd9395dd49fe40554a7b00e367e6
+Subproject commit e9d11d7eb8d82269f00b810ae876d2880d6ee5d2
2  vendor/s3g
@@ -1 +1 @@
-Subproject commit 71fa4941ce728ceb3a46bf318392c8556a322288
+Subproject commit 465eb90b0a89c937de1943279eb921a6e15b83d9
Please sign in to comment.
Something went wrong with that request. Please try again.