[reprap-commits] SF.net SVN: reprap:[4062] trunk/software/host/src/org/reprap

[<adr...@us...>]

Revision: 4062
          http://reprap.svn.sourceforge.net/reprap/?rev=4062&view=rev
Author:   adrian-bowyer
Date:     2011-03-22 14:39:23 +0000 (Tue, 22 Mar 2011)

Log Message:
-----------
Getting extruder lift working properly.  W.I.P....

Modified Paths:
--------------
    trunk/software/host/src/org/reprap/geometry/LayerProducer.java
    trunk/software/host/src/org/reprap/machines/GCodeRepRap.java

Modified: trunk/software/host/src/org/reprap/geometry/LayerProducer.java
===================================================================
--- trunk/software/host/src/org/reprap/geometry/LayerProducer.java	2011-03-21 15:00:11 UTC (rev 4061)
+++ trunk/software/host/src/org/reprap/geometry/LayerProducer.java	2011-03-22 14:39:23 UTC (rev 4062)
@@ -556,7 +556,7 @@
 		
 		// If getMinLiftedZ() is negative, never lift the head
 		
-		Boolean lift = att.getExtruder().getMinLiftedZ() >= 0;
+		Boolean lift = att.getExtruder().getMinLiftedZ() >= 0 || att.getExtruder().getLift() > 0;
 		
 		if(acc)
 			p.setSpeeds(att.getExtruder().getSlowXYFeedrate(), p.isClosed()?outlineFeedrate:infillFeedrate, 

Modified: trunk/software/host/src/org/reprap/machines/GCodeRepRap.java
===================================================================
--- trunk/software/host/src/org/reprap/machines/GCodeRepRap.java	2011-03-21 15:00:11 UTC (rev 4061)
+++ trunk/software/host/src/org/reprap/machines/GCodeRepRap.java	2011-03-22 14:39:23 UTC (rev 4062)
@@ -222,7 +222,7 @@
 
 		double zFeedrate = round(getMaxFeedrateZ(), 1);
 		
-		double liftIncrement = extruders[extruder].getExtrusionHeight()/2;
+		double liftIncrement = extruders[extruder].getLift();  //extruders[extruder].getExtrusionHeight()/2;
 		double liftedZ = round(currentZ + liftIncrement, 4);
 
 		//go up first?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.