Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 9 commits
  • 5 files changed
  • 1 commit comment
  • 2 contributors
View
2  .gitmodules
@@ -1,6 +1,6 @@
[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/makerbot/Miracle-Grue.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
7 bin/print_gcode.py
@@ -34,9 +34,14 @@
port = options.port
factory = makerbot_driver.MachineFactory()
obj = factory.build_from_port(port)
+profile = obj.profile()
-assembler = makerbot_driver.GcodeAssembler(getattr(obj, 'profile'))
+assembler = makerbot_driver.GcodeAssembler(profile)
start, end, variables = assembler.assemble_recipe()
+start_position = profile.values['print_start_sequence']['start_position']
+variables['START_X'] = start_position['start_x']
+variables['START_Y'] = start_position['start_y']
+variables['START_Z'] = start_position['start_z']
start_gcode = assembler.assemble_start_sequence(start)
end_gcode = assembler.assemble_end_sequence(end)
View
35 config/grue-default.config
@@ -1,15 +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
- "layerWidthMinimum" : 0.1, // I have no clue, but Miracle Grue wants a value
- "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,
@@ -42,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,
@@ -58,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/s3g
@@ -1 +1 @@
-Subproject commit 71fa4941ce728ceb3a46bf318392c8556a322288
+Subproject commit ed91210ce544d7f742e9d1dcb5f7cfefda077845

Showing you all comments on commits in this comparison.

@skalnik
Owner

:heart:

Something went wrong with that request. Please try again.