Permalink
Browse files

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

Bump dependencies
  • Loading branch information...
2 parents 02dd8ec + 67cb193 commit e508ca4761bc64c6137bb055dc442a5c0de1dddb @skalnik skalnik committed Mar 27, 2013
Showing with 26 additions and 17 deletions.
  1. +2 −2 .gitmodules
  2. +1 −0 Makefile
  3. +21 −13 config/grue-default.config
  4. +1 −1 vendor/Miracle-Grue
  5. +1 −1 vendor/s3g
View
@@ -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
@@ -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
@@ -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
Submodule Miracle-Grue updated 1290 files
Submodule s3g updated 73 files
+1 −1 .gitmodules
+10 −1 debian/changelog
+39 −28 doc/EepromAccess.md
+1 −1 doc/s3gProtocol.md
+58 −0 examples/convert_gcode_to_s3g_legacy.py
+5 −2 examples/decode_s3g.py
+29 −15 makerbot_driver/EEPROM/EepromAnalyzer.py
+0 −0 makerbot_driver/EEPROM/EepromMap_5.1_0x00.hh
+0 −0 makerbot_driver/EEPROM/EepromMap_5.2_0x00.hh
+0 −0 makerbot_driver/EEPROM/EepromMap_5.5_0x00.hh
+10 −4 makerbot_driver/EEPROM/EepromMap_6.0_0x00.hh
+10 −4 makerbot_driver/EEPROM/EepromMap_6.1_0x00.hh
+21 −15 makerbot_driver/EEPROM/EepromMap_6.2_0x00.hh
+231 −134 makerbot_driver/EEPROM/EepromMap_7.0_0x01.hh
+15 −5 makerbot_driver/EEPROM/EepromReader.py
+16 −7 makerbot_driver/EEPROM/EepromRepairer.py
+18 −9 makerbot_driver/EEPROM/EepromVerifier.py
+15 −5 makerbot_driver/EEPROM/EepromWriter.py
+3 −1 makerbot_driver/EEPROM/constants.py
+0 −0 makerbot_driver/EEPROM/eeprom_map_5.1_0x00.json
+0 −0 makerbot_driver/EEPROM/eeprom_map_5.2_0x00.json
+0 −0 makerbot_driver/EEPROM/eeprom_map_5.5_0x00.json
+11 −1 makerbot_driver/EEPROM/eeprom_map_6.0_0x00.json
+11 −1 makerbot_driver/EEPROM/eeprom_map_6.1_0x00.json
+12 −84 makerbot_driver/EEPROM/eeprom_map_6.2_0x00.json
+150 −158 makerbot_driver/EEPROM/eeprom_map_7.0_0x01.json
+21 −8 makerbot_driver/EEPROM/errors.py
+4 −4 makerbot_driver/Factory.py
+22 −8 makerbot_driver/FileReader/FileReader.py
+1 −1 makerbot_driver/FileReader/constants.py
+2 −2 makerbot_driver/Firmware/Uploader.py
+1 −1 makerbot_driver/Gcode/Parser.py
+3 −17 makerbot_driver/Gcode/Utils.py
+2 −2 makerbot_driver/GcodeProcessors/AbpProcessor.py
+1 −1 makerbot_driver/GcodeProcessors/AnchorProcessor.py
+5 −5 makerbot_driver/GcodeProcessors/CoordinateRemovalProcessor.py
+78 −0 makerbot_driver/GcodeProcessors/FanProcessor.py
+3 −3 makerbot_driver/GcodeProcessors/RemoveProgressProcessor.py
+4 −4 makerbot_driver/GcodeProcessors/RpmProcessor.py
+2 −2 makerbot_driver/GcodeProcessors/SingletonTProcessor.py
+2 −4 makerbot_driver/GcodeProcessors/SkeinforgeProcessors.py
+13 −4 makerbot_driver/GcodeProcessors/TemperatureProcessor.py
+1 −1 makerbot_driver/GcodeProcessors/ToolSwapProcessor.py
+2 −1 makerbot_driver/GcodeProcessors/__init__.py
+7 −2 makerbot_driver/MachineFactory.py
+2 −2 makerbot_driver/Writer/StreamWriter.py
+1 −1 makerbot_driver/constants.py
+1 −0 makerbot_driver/profile.py
+2 −2 makerbot_driver/profiles/Replicator2.json
+6 −6 makerbot_driver/profiles/Replicator2X.json
+1 −1 makerbot_driver/s3g.py
+1 −1 setup.py
+2 −5 tests/pi_test_AbpProcessor.py
+5 −10 tests/pi_test_CoordinateRemovalProcessor.py
+2 −2 tests/pi_test_EepromAnalyzer.py
+12 −0 tests/pi_test_EepromReader.py
+13 −0 tests/pi_test_EepromRepairer.py
+18 −1 tests/pi_test_EepromVerifier.py
+12 −0 tests/pi_test_EepromWriter.py
+4 −2 tests/pi_test_Factory.py
+280 −0 tests/pi_test_FanProcessor.py
+10 −15 tests/pi_test_GcodeUtils.py
+9 −5 tests/pi_test_MachineFactory.py
+3 −6 tests/pi_test_RemoveProgressProcessor.py
+4 −8 tests/pi_test_RpmProcessor.py
+1 −1 tests/pi_test_S3g.py
+1 −21 tests/pi_test_SingletonTProcessor.py
+3 −5 tests/pi_test_SkeinforgeProcessor.py
+28 −9 tests/pi_test_TemperatureProcessor.py
+1 −1 tests/pi_test_ToolSwapProcessor.py
+4 −4 tests/pi_test_Uploader.py
+6 −3 tests/test_BundleProcessor.py
+5 −0 tests/test_GcodeFileReading.py

0 comments on commit e508ca4

Please sign in to comment.