Skip to content
This repository
Browse code

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

  • Loading branch information...
commit edf460ad916cb8db87fb19fa5e0f2f0ea7abae9c 2 parents 3effcc6 + cef50e3
Aljosa Kemperle authored May 10, 2012
4  machines/replicator.xml
@@ -4,8 +4,8 @@
4 4
 		<name>The Replicator Dual</name>
5 5
 		<geometry type="cartesian">
6 6
 			<!-- different pulleys on X and Y axii -->
7  
-			<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) -->
8  
-			<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) -->
  7
+			<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) -->
  8
+			<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) -->
9 9
 			<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) -->
10 10
 			<axis id="a" length="100000" maxfeedrate="1600" stepspermm="96.275201870333662468889989185642" endstops="none"/> <!-- stepspermm is incoming filament length, see comment at bottom for explanation -->
11 11
 			<axis id="b" length="100000" maxfeedrate="1600" stepspermm="96.275201870333662468889989185642" endstops="none"/> <!-- stepspermm is incoming filament length, see comment at bottom for explanation -->
49  machines/replicator/onboard/TheReplicatorPlateLevelingStartupDual.gcode
... ...
@@ -0,0 +1,49 @@
  1
+(**** This is a build-platform calibration script for a Dual-Head MakerBot Replicator ****)
  2
+(**** Do not run this code on any other kind of machine! ****)
  3
+G21 (set units to mm)
  4
+G90 (set positioning to absolute)
  5
+M71 (Find the 4 knobs on the botton of the   platform and tightenfour or five turns.)
  6
+M71 (I'm going to move   the extruder to     various positions   for adjustment.    )
  7
+M71 (In each position,   we will need to     adjust 2 knobs at   the same time.      )
  8
+M71 (Nozzles are at the  right height when   you can just slide asheet of paper     )
  9
+M71 (between the nozzle  and the platform.   Grab a sheet of     paper to assist us.)
  10
+M70 ( Please wait)
  11
+(**** begin homing ****)
  12
+G162 X Y F2500 (home XY axes maximum)
  13
+G161 Z F1100 (home Z axis minimum)
  14
+G92 Z-5 (set Z to -5)
  15
+G1 Z0.0 (move Z to "0")
  16
+G161 Z F100 (home Z axis minimum)
  17
+G92 X152 Y75 Z0 
  18
+(M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
  19
+(**** end homing ****)
  20
+
  21
+M70 ( Please wait)
  22
+G1 Z5 F3300.0
  23
+G1 X16.5 Y-74 (Move to front of platform)
  24
+G0 Z0
  25
+M71 (Adjust the front twoknobs until paper   just slides between nozzle and platform )
  26
+
  27
+M70 ( Please wait)
  28
+G1 Z5 F3300.0
  29
+G1 X16.5 Y72 (Move to back of platform)
  30
+G0 Z0
  31
+M71 (Adjust the back two knobs until paper   just slides between nozzle and platform )
  32
+
  33
+M70 ( Please wait)
  34
+G1 Z5 F3300.0
  35
+G1 Y0 X106.5
  36
+G0 Z0
  37
+M71 (Adjust the right twoknobs until paper   just slides between nozzle and platform )
  38
+
  39
+M70 ( Please wait)
  40
+G1 Z5 F3300.0
  41
+G1 X-73.5
  42
+G0 Z0
  43
+M71 (Adjust the left two knobs until paper   just slides between nozzle and platform )
  44
+
  45
+M70 ( Please wait)
  46
+G1 Z5 F3300.0
  47
+G1 Y0 X16.5
  48
+G0 Z0
  49
+M71 (Check that paper    just slides between nozzle and platform )
49  machines/replicator/onboard/TheReplicatorPlateLevelingStartupSingle.gcode
... ...
@@ -0,0 +1,49 @@
  1
+(**** This is a build-platform calibration script for a Dual-Head MakerBot Replicator ****)
  2
+(**** Do not run this code on any other kind of machine! ****)
  3
+G21 (set units to mm)
  4
+G90 (set positioning to absolute)
  5
+M71 (Find the 4 knobs on the botton of the   platform and tightenfour or five turns.)
  6
+M71 (I'm going to move   the extruder to     various positions   for adjustment.    )
  7
+M71 (In each position,   we will need to     adjust 2 knobs at   the same time.      )
  8
+M71 (Nozzles are at the  right height when   you can just slide asheet of paper     )
  9
+M71 (between the nozzle  and the platform.   Grab a sheet of     paper to assist us.)
  10
+M70 ( Please wait)
  11
+(**** begin homing ****)
  12
+G162 X Y F2500 (home XY axes maximum)
  13
+G161 Z F1100 (home Z axis minimum)
  14
+G92 Z-5 (set Z to -5)
  15
+G1 Z0.0 (move Z to "0")
  16
+G161 Z F100 (home Z axis minimum)
  17
+G92 X152 Y75 Z0
  18
+(M132 X Y Z A B (Recall stored home offsets for XYZAB axis)
  19
+(**** end homing ****)
  20
+
  21
+M70 ( Please wait)
  22
+G1 Z5 F3300.0
  23
+G1 X0 Y-74 (Move to front of platform)
  24
+G0 Z0
  25
+M71 (Adjust the front twoknobs until paper   just slides between nozzle and platform )
  26
+
  27
+M70 ( Please wait)
  28
+G1 Z5 F3300.0
  29
+G1 X0 Y72 (Move to back of platform)
  30
+G0 Z0
  31
+M71 (Adjust the back two knobs until paper   just slides between nozzle and platform )
  32
+
  33
+M70 ( Please wait)
  34
+G0 Z5 F3300.0
  35
+G1 Y0 X100
  36
+G0 Z0
  37
+M71 (Adjust the right twoknobs until paper   just slides between nozzle and platform )
  38
+
  39
+M70 ( Please wait)
  40
+G0 Z5 F3300.0
  41
+G1 X-100
  42
+G0 Z0
  43
+M71 (Adjust the left two knobs until paper   just slides between nozzle and platform )
  44
+
  45
+M70 ( Please wait)
  46
+G0 Z5 F3300.0
  47
+G1 Y0 X0
  48
+G0 Z0
  49
+M71 (Check that paper    just slides between nozzle and platform )
9  src/replicatorg/app/ui/onboard/MachineOnboardParameters.java
@@ -85,9 +85,7 @@
85 85
         private JFormattedTextField yToolheadOffsetField = new JFormattedTextField(threePlaces);
86 86
         private JFormattedTextField zToolheadOffsetField = new JFormattedTextField(threePlaces);
87 87
         
88  
-        private JCheckBox accelerationBox = new JCheckBox();
89  
-        private JFormattedTextField accelerationRate = new JFormattedTextField(threePlaces);
90  
-        
  88
+        private JCheckBox accelerationBox = new JCheckBox();   
91 89
 
92 90
 	
93 91
 	/** Prompts the user to fire a bot  reset after the changes have been sent to the board.
@@ -168,7 +166,6 @@ private void commit() {
168 166
         
169 167
         byte status = accelerationBox.isSelected() ? (byte)1: (byte)0;
170 168
         target.setAccelerationStatus(status);
171  
-        target.setAccelerationRate(((Number)accelerationRate.getValue()).intValue());
172 169
 
173 170
         requestResetFromUser();
174 171
 	}
@@ -253,7 +250,6 @@ private void loadParameters() {
253 250
                 
254 251
                 if(target.hasAcceleration()){
255 252
                     accelerationBox.setSelected(this.target.getAccelerationStatus());
256  
-                    accelerationRate.setValue(this.target.getAccelerationRate());
257 253
                 }
258 254
 	}
259 255
 
@@ -374,11 +370,8 @@ public MachineOnboardParameters(OnboardParameters target, Driver driver, JFrame
374 370
                    
375 371
 		}
376 372
                 if(target.hasAcceleration()){
377  
-                    accelerationRate.setColumns(6);
378 373
                     add(new JLabel("Acceleration On"));	
379 374
                     add(accelerationBox,"span 2, wrap");
380  
-                    add(new JLabel("Acceleration Rate (mm/s)"));
381  
-                    add(accelerationRate, "wrap");
382 375
                 }
383 376
 
384 377
 		
2  src/replicatorg/drivers/gen3/MightyBoard.java
@@ -267,7 +267,7 @@ public MightyBoard() {
267 267
 		// firmware version we want this driver to support.
268 268
 		minimumVersion = new Version(5,2);
269 269
 		preferredVersion = new Version(5,2);
270  
-                minimumAccelerationVersion = new Version(9,3);
  270
+                minimumAccelerationVersion = new Version(5,3);
271 271
 
272 272
 	}
273 273
 	

0 notes on commit edf460a

Please sign in to comment.
Something went wrong with that request. Please try again.