Permalink
Browse files

Merge branch 'master' of github.com:makerbot/ReplicatorG

  • Loading branch information...
2 parents 6b7ace0 + a82f0b2 commit 22c39a886c9faad5f5bf83f92c6374268e718321 @FarMcKon FarMcKon committed Mar 5, 2012
View
64 machines/thingomatic/start+ABP+Stepstruder.gcode
@@ -1,26 +1,38 @@
-(**** beginning of start.gcode ****)
-(This file is for a MakerBot Thing-O-Matic)
-(**** begin initialization commands ****)
-G21 (set units to mm)
-G90 (set positioning to absolute)
-M108 R1.98 (set extruder speed)
-M103 (Make sure extruder is off)
-M104 S225 T0 (set extruder temperature)
-M109 S125 T0 (set heated-build-platform temperature)
-(**** end initialization commands ****)
-(**** begin homing ****)
-G162 Z F500 (home Z axis maximum)
-G92 Z10 (set Z to 10)
-G1 Z0 (move Z down 0)
-G162 Z F100 (home Z axis maximum)
-G161 X Y F2500 (home XY axes minimum)
-M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
-(**** end homing ****)
-(**** begin pre-wipe commands ****)
-G1 X52 Y-57.0 Z10 F3300.0 (move to waiting position)
-M6 T0 (wait for toolhead parts, nozzle, HBP, etc., to reach temperature)
-M101 (Extruder on, forward)
-G04 P5000 (Wait t/1000 seconds)
-M103 (Extruder off)
-(**** end pre-wipe commands ****)
-(**** end of start.gcode ****)
+(**** beginning of start.gcode ****)
+(This file is for a MakerBot Thing-O-Matic)
+(**** begin initialization commands ****)
+G21 (set units to mm)
+G90 (set positioning to absolute)
+M108 R5.0 (set extruder speed)
+M103 (Make sure extruder is off)
+M104 S225 T0 (set extruder temperature)
+M109 S100 T0 (set heated-build-platform temperature)
+(**** end initialization commands ****)
+(**** begin homing ****)
+G162 Z F1000 (home Z axis maximum)
+G92 Z10 (set Z to 0)
+G1 Z0 (move z down 10)
+G162 Z F150 (home Z axis maximum)
+G161 X Y F2500 (home XY axes minimum)
+M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
+(**** end homing ****)
+(**** begin pre-wipe commands ****)
+( Some people have had problems with the nozzle hitting )
+( bolts or wipers during this pre-extrusion warmup. )
+( If this happens to you, you can change the values for )
+( the X and Y positions in the following code. )
+( The goal is to have the toolhead wipe its initial )
+( extrusion near the edge of the platform, [anchor it] )
+( so as not to have it interfere with the print. )
+( This file can be found in: )
+( replicatorg/skein_engines/skeinforge-##/skeinforge_application/ )
+( prefs/<profile name [e.g. Thingomatic-ABP-Mk7]>/alterations )
+G1 X25 Y-60 Z10 F3300.0 (move to waiting position)
+M6 T0 (wait for toolhead parts, nozzle, HBP, etc., to reach temperature)
+G0 X25 Y-57 (Position Nozzle)
+G0 Z0.6 (Position Height)
+M108 R4.0 (Set Extruder Speed)
+M101 (Start Extruder)
+G4 P1500 (Create Anchor)
+(**** end pre-wipe commands ****)
+(**** end of start.gcode ****)
View
82 machines/thingomatic/start+HBP+Stepstruder.gcode
@@ -1,44 +1,38 @@
-(**** beginning of start.gcode ****)
-(This file is for a MakerBot Thing-O-Matic)
-(**** begin initialization commands ****)
-G21 (set units to mm)
-G90 (set positioning to absolute)
-M108 R5.0 (set extruder speed)
-M103 (Make sure extruder is off)
-M104 S225 T0 (set extruder temperature)
-M109 S110 T0 (set heated-build-platform temperature)
-(**** end initialization commands ****)
-(**** begin homing ****)
-G162 Z F500 (home Z axis maximum)
-G92 Z10 (set Z to 10)
-G1 Z0 (move Z down 0)
-G162 Z F100 (home Z axis maximum)
-G161 X Y F2500 (home XY axes minimum)
-M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
-(**** end homing ****)
-(**** begin pre-wipe commands ****)
-G1 X52 Y-57.0 Z10 F3300.0 (move to waiting position)
-M6 T0 (wait for toolhead parts, nozzle, HBP, etc., to reach temperature)
-G04 P60000 (Wait t/1000 seconds)
-(**** Start Acceleration ****)
-(Note: nozzles smaller than 0.5mm might require adjustments to this acceleration routine)
-M108 R1.0
-G04 P15000
-M101
-M108 R2.0
-G04 P10000
-M101
-M108 R3.0
-G04 P5000
-M101
-M108 R4.0
-G04 P5000
-M101
-M108 R5.0
-G04 P2500
-(**** End Acceleration ****)
-M101 (Extruder on, forward)
-G04 P5000 (Wait t/1000 seconds)
-M103 (Extruder off)
-(**** end pre-wipe commands ****)
-(**** end of start.gcode ****)
+(**** beginning of start.gcode ****)
+(This file is for a MakerBot Thing-O-Matic)
+(**** begin initialization commands ****)
+G21 (set units to mm)
+G90 (set positioning to absolute)
+M108 R5.0 (set extruder speed)
+M103 (Make sure extruder is off)
+M104 S225 T0 (set extruder temperature)
+M109 S100 T0 (set heated-build-platform temperature)
+(**** end initialization commands ****)
+(**** begin homing ****)
+G162 Z F1000 (home Z axis maximum)
+G92 Z10 (set Z to 0)
+G1 Z0 (move z down 10)
+G162 Z F150 (home Z axis maximum)
+G161 X Y F2500 (home XY axes minimum)
+M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
+(**** end homing ****)
+(**** begin pre-wipe commands ****)
+( Some people have had problems with the nozzle hitting )
+( bolts or wipers during this pre-extrusion warmup. )
+( If this happens to you, you can change the values for )
+( the X and Y positions in the following code. )
+( The goal is to have the toolhead wipe its initial )
+( extrusion near the edge of the platform, [anchor it] )
+( so as not to have it interfere with the print. )
+( This file can be found in: )
+( replicatorg/skein_engines/skeinforge-##/skeinforge_application/ )
+( prefs/<profile name [e.g. Thingomatic-ABP-Mk7]>/alterations )
+G1 X25 Y-60 Z10 F3300.0 (move to waiting position)
+M6 T0 (wait for toolhead parts, nozzle, HBP, etc., to reach temperature)
+G0 X25 Y-57 (Position Nozzle)
+G0 Z0.6 (Position Height)
+M108 R4.0 (Set Extruder Speed)
+M101 (Start Extruder)
+G4 P1500 (Create Anchor)
+(**** end pre-wipe commands ****)
+(**** end of start.gcode ****)
View
4 src/replicatorg/app/ui/onboard/MachineOnboardParameters.java
@@ -362,7 +362,7 @@ public void actionPerformed(ActionEvent e) {
// loadParameters();
}
});
- resetToFactoryButton.setToolTipText("Reest the onboard settings to the factory defaults");
+ resetToFactoryButton.setToolTipText("Reset the onboard settings to the factory defaults");
add(resetToFactoryButton, "split 1");
@@ -373,7 +373,7 @@ public void actionPerformed(ActionEvent e) {
// loadParameters();
}
});
- resetToBlankButton.setToolTipText("Reest the onboard settings to the *completely blank*");
+ resetToBlankButton.setToolTipText("Reset the onboard settings to the *completely blank*");
add(resetToBlankButton);
commitButton.addActionListener(new ActionListener() {

0 comments on commit 22c39a8

Please sign in to comment.