makerbot · rparkins999 · Mar 22, 2015 · Mar 22, 2015 · Mar 22, 2015 · Mar 22, 2015
diff --git a/build.xml b/build.xml
@@ -1,4 +1,6 @@
 <project name="ReplicatorG" basedir="." default="help">
+	<!-- This really should be synchronised with the version in Base.java. -->
+	<property name="replicatorg.version" value="0041beta" />
 
 	<!-- Project name -->
 
@@ -26,7 +28,7 @@
 	<property name="resources.dir" value="resources" />
 	<property name="shared.dir" value="${build.dir}/shared" />
 	<property name="lib.dir" value="${shared.dir}/lib" />
-	<property name="ant.build.javac.target" value="1.5" />
+	<property name="ant.build.javac.target" value="1.6" />
 	<property name="test.src.dir" value="test/src" />
 	<property name="release.name" value="${project}-${replicatorg.version}" />
 
@@ -62,7 +64,7 @@
 
 	<target name="compile">
 		<mkdir dir="${classes.dir}" />
-		<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" debug="true" debuglevel="lines,vars,source" source="1.5" includeAntRuntime="false">
+		<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" debug="true" debuglevel="lines,vars,source" source="1.6" includeAntRuntime="false">
 			<!-- Uncomment to aid in Java debugging
 			<compilerarg value="-Xlint:deprecation" />
 			<compilerarg value="-Xlint:unchecked" />
@@ -72,7 +74,7 @@
 
 	<target name="compile-tests">
 		<mkdir dir="${classes.dir}" />
-		<javac srcdir="${test.src.dir}" destdir="${classes.dir}" classpathref="test.cp" debug="true" debuglevel="lines,vars,source" source="1.5">
+		<javac srcdir="${test.src.dir}" destdir="${classes.dir}" classpathref="test.cp" debug="true" debuglevel="lines,vars,source" source="1.6">
 			<!-- Uncomment to aid in Java debugging
 			<compilerarg value="-Xlint:deprecation" />
 			<compilerarg value="-Xlint:unchecked" />

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,5 @@
+0041beta ReplicatorG
+* Lots of Richard's changes
 0040 ReplicatorG
 * Replicator 2 profile now more robust
 * support for selecting between s3g, x3g file formats (future bots)

diff --git a/dist-linux.sh b/dist-linux.sh
@@ -5,4 +5,7 @@ REVISION=`head -n 1 changelog.txt | cut -f 1 -d " "`
 rm -rf dist
 ant clean
 ant -Dreplicatorg.version=$REVISION dist-linux
-#ant -Dreplicatorg.version=$REVISION dist-linux64
+echo '#!/bin/sh' >replicatorg
+echo cd ./dist/linux/replicatorg-$REVISION >>replicatorg
+echo ./replicatorg \& >>replicatorg
+chmod a+x replicatorg
diff --git a/docs/installation-linux b/docs/installation-linux
diff --git a/machines/cupcake/start+ABP+Sailfish.gcode b/machines/cupcake/start+ABP+Sailfish.gcode
@@ -23,4 +23,5 @@ G1 X-30 Y30 Z6 F3300.0 (move to initial position)
 G1 Z0 F3300.0 (Go back down)
 M101 (start extruder, fwd)
 G1 X0 Y0 Z0 F2400.0 (move to origin)
-(**** end of start.txt ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/cupcake/start+ABP.gcode b/machines/cupcake/start+ABP.gcode
@@ -21,4 +21,5 @@ G1 X-30 Y30 Z6 F3300.0 (move to initial position)
 G1 Z0 F3300.0 (Go back down)
 M101 (start extruder, fwd)
 G1 X0 Y0 Z0 F2400.0 (move to origin)
-(**** end of start.txt ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/cupcake/start+Frostruder.gcode b/machines/cupcake/start+Frostruder.gcode
@@ -14,4 +14,5 @@ G92 X0 Y0 Z0 (You are now at 0,0,0)
 
 
 G0 Z0    (Go back to zero.)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/cupcake/start+HBP+Sailfish.gcode b/machines/cupcake/start+HBP+Sailfish.gcode
@@ -18,4 +18,5 @@ G04 P5000 (Wait 5 seconds)
 M103 (Extruder off)
 M01 (The heated build platform is heating up. Wait until after the lights have turned off for the first time, clear the test extrusion, and click yes.)
 G0 Z0    (Go back to zero.)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/cupcake/start+HBP.gcode b/machines/cupcake/start+HBP.gcode
@@ -16,4 +16,5 @@ G04 P5000 (Wait 5 seconds)
 M103 (Extruder off)
 M01 (The heated build platform is heating up. Wait until after the lights have turned off for the first time, clear the test extrusion, and click yes.)
 G0 Z0    (Go back to zero.)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/cupcake/start.gcode b/machines/cupcake/start.gcode
@@ -3,7 +3,7 @@ G21 (set units to mm)
 G90 (set positioning to absolute)
 G10 P1 X16.5 Y0 Z-0.3 (Designate T0 Offset)
 G10 P2 X-16.5 Y0 Z-0.3 (Designate T1 Offset)
-G55 (Recall offset cooridinate system for T1)
+G55 (Recall offset coordinate system for T1)
 M104 S225 T0 (set extruder temperature)
 M109 S110 T0 (set HBP temperature)
 (**** begin homing ****)
@@ -16,4 +16,5 @@ M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
 (**** end homing ****)
 M6 T0
 M108 R3.0 T0
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/replicator/Dual_Head_start.gcode b/machines/replicator/Dual_Head_start.gcode
@@ -23,4 +23,5 @@ G0 Z0.6      (Position Height)
 M108 R5.0    (Set Extruder Speed)
 M101         (Start Extruder)
 G4 P2000     (Create Anchor)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/replicator/Single_Head_start.gcode b/machines/replicator/Single_Head_start.gcode
@@ -23,4 +23,5 @@ G0 Z0.6      (Position Height)
 M108 R5.0    (Set Extruder Speed)
 M101         (Start Extruder)
 G4 P2000     (Create Anchor)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/replicator2/Dual_Head_start.gcode b/machines/replicator2/Dual_Head_start.gcode
@@ -23,4 +23,5 @@ G0 Z0.6      (Position Height)
 M108 R5.0    (Set Extruder Speed)
 M101         (Start Extruder)
 G4 P2000     (Create Anchor)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/replicator2/Single_Head_start.gcode b/machines/replicator2/Single_Head_start.gcode
@@ -18,8 +18,10 @@ M6 T0 (wait for toolhead, and HBP to reach temperature)
 G130 X127 Y127 Z40 A127 B127 (Set Stepper motor Vref to defaults)
 M108 R3.0 T0
 G0 X-141 Y-74 (Position Nozzle)
-G0 Z0.6      (Position Height)
+G0 Z0.6      (Position Height)(**** end of start.gcode ****)
+
 M108 R5.0    (Set Extruder Speed)
 M101         (Start Extruder)
 G4 P2000     (Create Anchor)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/thingomatic/start+ABP+Stepstruder.gcode b/machines/thingomatic/start+ABP+Stepstruder.gcode
@@ -1,38 +1,39 @@
-(**** 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 ****)
+(**** 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 ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/thingomatic/start+ABP.gcode b/machines/thingomatic/start+ABP.gcode
@@ -24,5 +24,5 @@ M101 (Extruder on, forward)
 G04 P5000 (Wait t/1000 seconds)
 M103 (Extruder off)
 (**** end pre-wipe commands ****)
-(**** end of start.txt ****)
-
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/thingomatic/start+Frostruder.gcode b/machines/thingomatic/start+Frostruder.gcode
@@ -14,4 +14,5 @@ G92 X0 Y0 Z0 (You are now at 0,0,0)
 
 
 G0 Z0    (Go back to zero.)
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/thingomatic/start+HBP+Stepstruder OLD.gcode b/machines/thingomatic/start+HBP+Stepstruder OLD.gcode
@@ -15,4 +15,5 @@ M132 X Y Z (Recall stored home offsets for XYZ)
 (**** end homing ****)
 M6 T0
 M108 R3.0 T0
-(**** end of start.gcode ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/thingomatic/start+HBP+Stepstruder+Sailfish.gcode b/machines/thingomatic/start+HBP+Stepstruder+Sailfish.gcode
@@ -1,40 +1,41 @@
-(**** beginning of start.gcode ****)
-(This file is for a MakerBot Thing-O-Matic)
-(**** begin initialization commands ****)
-M103 (disable RPM)
-M73 P0 (enable build progress)
-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 ****)
+(**** beginning of start.gcode ****)
+(This file is for a MakerBot Thing-O-Matic)
+(**** begin initialization commands ****)
+M103 (disable RPM)
+M73 P0 (enable build progress)
+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 ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)
diff --git a/machines/thingomatic/start+HBP+Stepstruder.gcode b/machines/thingomatic/start+HBP+Stepstruder.gcode
@@ -1,38 +1,39 @@
-(**** 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 ****)
+(**** 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 ****)
+(Don't remove the </layer> in the next line - it's needed for dual extrusion.)
+(</layer> **** end of start.gcode ****)