Merge branch 'HEAD' of git@github.com:makerbot/ReplicatorG.git

machines/replicator.xml

@@ -4,8 +4,8 @@
 		<name>The Replicator Dual</name>
 		<geometry type="cartesian">
 			<!-- different pulleys on X and Y axii -->
-			<axis id="x" length="227" maxfeedrate="12450" homingfeedrate="2500" stepspermm="94.139704" endstops="max"/>  <!-- Pulley dia: 10.82mm / 1/8 step = 1/(10.82 * pi / 1600) -->
-			<axis id="y" length="148" maxfeedrate="12450" homingfeedrate="2500" stepspermm="94.139704" endstops="max"/>  <!-- Pulley dia: 10.82mm / 1/8 step = 1/(10.82 * pi / 1600) -->
+			<axis id="x" length="227" maxfeedrate="18000" homingfeedrate="2500" stepspermm="94.139704" endstops="max"/>  <!-- Pulley dia: 10.82mm / 1/8 step = 1/(10.82 * pi / 1600) -->
+			<axis id="y" length="148" maxfeedrate="18000" homingfeedrate="2500" stepspermm="94.139704" endstops="max"/>  <!-- Pulley dia: 10.82mm / 1/8 step = 1/(10.82 * pi / 1600) -->
 			<axis id="z" length="150" maxfeedrate="1170" homingfeedrate="1100" stepspermm="400" endstops="min"/> <!-- Actual length is 157mm, we reserve ~5mm for safety. TR-8x8 Z axis = 1/(8/1600) -->
 			<axis id="a" length="100000" maxfeedrate="1600" stepspermm="96.275201870333662468889989185642" endstops="none"/> <!-- stepspermm is incoming filament length, see comment at bottom for explanation -->
 			<axis id="b" length="100000" maxfeedrate="1600" stepspermm="96.275201870333662468889989185642" endstops="none"/> <!-- stepspermm is incoming filament length, see comment at bottom for explanation -->

machines/replicator/onboard/TheReplicatorPlateLevelingStartupDual.gcode

@@ -0,0 +1,49 @@
+(**** This is a build-platform calibration script for a Dual-Head MakerBot Replicator ****)
+(**** Do not run this code on any other kind of machine! ****)
+G21 (set units to mm)
+G90 (set positioning to absolute)
+M71 (Find the 4 knobs on the botton of the   platform and tightenfour or five turns.)
+M71 (I'm going to move   the extruder to     various positions   for adjustment.    )
+M71 (In each position,   we will need to     adjust 2 knobs at   the same time.      )
+M71 (Nozzles are at the  right height when   you can just slide asheet of paper     )
+M71 (between the nozzle  and the platform.   Grab a sheet of     paper to assist us.)
+M70 ( Please wait)
+(**** begin homing ****)
+G162 X Y F2500 (home XY axes maximum)
+G161 Z F1100 (home Z axis minimum)
+G92 Z-5 (set Z to -5)
+G1 Z0.0 (move Z to "0")
+G161 Z F100 (home Z axis minimum)
+G92 X152 Y75 Z0 
+(M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
+(**** end homing ****)
+
+M70 ( Please wait)
+G1 Z5 F3300.0
+G1 X16.5 Y-74 (Move to front of platform)
+G0 Z0
+M71 (Adjust the front twoknobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G1 Z5 F3300.0
+G1 X16.5 Y72 (Move to back of platform)
+G0 Z0
+M71 (Adjust the back two knobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G1 Z5 F3300.0
+G1 Y0 X106.5
+G0 Z0
+M71 (Adjust the right twoknobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G1 Z5 F3300.0
+G1 X-73.5
+G0 Z0
+M71 (Adjust the left two knobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G1 Z5 F3300.0
+G1 Y0 X16.5
+G0 Z0
+M71 (Check that paper    just slides between nozzle and platform )

machines/replicator/onboard/TheReplicatorPlateLevelingStartupSingle.gcode

@@ -0,0 +1,49 @@
+(**** This is a build-platform calibration script for a Dual-Head MakerBot Replicator ****)
+(**** Do not run this code on any other kind of machine! ****)
+G21 (set units to mm)
+G90 (set positioning to absolute)
+M71 (Find the 4 knobs on the botton of the   platform and tightenfour or five turns.)
+M71 (I'm going to move   the extruder to     various positions   for adjustment.    )
+M71 (In each position,   we will need to     adjust 2 knobs at   the same time.      )
+M71 (Nozzles are at the  right height when   you can just slide asheet of paper     )
+M71 (between the nozzle  and the platform.   Grab a sheet of     paper to assist us.)
+M70 ( Please wait)
+(**** begin homing ****)
+G162 X Y F2500 (home XY axes maximum)
+G161 Z F1100 (home Z axis minimum)
+G92 Z-5 (set Z to -5)
+G1 Z0.0 (move Z to "0")
+G161 Z F100 (home Z axis minimum)
+G92 X152 Y75 Z0
+(M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
+(**** end homing ****)
+
+M70 ( Please wait)
+G1 Z5 F3300.0
+G1 X0 Y-74 (Move to front of platform)
+G0 Z0
+M71 (Adjust the front twoknobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G1 Z5 F3300.0
+G1 X0 Y72 (Move to back of platform)
+G0 Z0
+M71 (Adjust the back two knobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G0 Z5 F3300.0
+G1 Y0 X100
+G0 Z0
+M71 (Adjust the right twoknobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G0 Z5 F3300.0
+G1 X-100
+G0 Z0
+M71 (Adjust the left two knobs until paper   just slides between nozzle and platform )
+
+M70 ( Please wait)
+G0 Z5 F3300.0
+G1 Y0 X0
+G0 Z0
+M71 (Check that paper    just slides between nozzle and platform )

src/replicatorg/app/ui/onboard/MachineOnboardParameters.java

@@ -85,9 +85,7 @@ public class MachineOnboardParameters extends JPanel {
         private JFormattedTextField yToolheadOffsetField = new JFormattedTextField(threePlaces);
         private JFormattedTextField zToolheadOffsetField = new JFormattedTextField(threePlaces);
 
-        private JCheckBox accelerationBox = new JCheckBox();
-        private JFormattedTextField accelerationRate = new JFormattedTextField(threePlaces);
-
+        private JCheckBox accelerationBox = new JCheckBox();   
 
 
 	/** Prompts the user to fire a bot  reset after the changes have been sent to the board.
@@ -168,7 +166,6 @@ private void commit() {
 
         byte status = accelerationBox.isSelected() ? (byte)1: (byte)0;
         target.setAccelerationStatus(status);
-        target.setAccelerationRate(((Number)accelerationRate.getValue()).intValue());
 
         requestResetFromUser();
 	}
@@ -253,7 +250,6 @@ private void loadParameters() {
 
                 if(target.hasAcceleration()){
                     accelerationBox.setSelected(this.target.getAccelerationStatus());
-                    accelerationRate.setValue(this.target.getAccelerationRate());
                 }
 	}
 
@@ -374,11 +370,8 @@ public MachineOnboardParameters(OnboardParameters target, Driver driver, JFrame
 
 		}
                 if(target.hasAcceleration()){
-                    accelerationRate.setColumns(6);
                     add(new JLabel("Acceleration On"));	
                     add(accelerationBox,"span 2, wrap");
-                    add(new JLabel("Acceleration Rate (mm/s)"));
-                    add(accelerationRate, "wrap");
                 }
 
 

src/replicatorg/drivers/gen3/MightyBoard.java

@@ -267,7 +267,7 @@ public MightyBoard() {
 		// firmware version we want this driver to support.
 		minimumVersion = new Version(5,2);
 		preferredVersion = new Version(5,2);
-                minimumAccelerationVersion = new Version(9,3);
+                minimumAccelerationVersion = new Version(5,3);
 
 	}